pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/pfstools pfstools: updated to 2.1.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/01d25b76de6d
branches: trunk
changeset: 406180:01d25b76de6d
user: adam <adam%pkgsrc.org@localhost>
date: Sun Dec 15 21:32:52 2019 +0000
description:
pfstools: updated to 2.1.0
2.1.0:
This release adds support for .yuv video files encoded as PQ2020 or HLG2020 (used by the reference implementation of h265). pfsview was updated to link with Qt5 instead of Qt4. Several compilation
issues on Ubuntu have been resolved.
diffstat:
graphics/pfstools/Makefile | 22 ++++++++++------------
graphics/pfstools/PLIST | 24 ++++++++++++++----------
graphics/pfstools/distinfo | 10 +++++-----
graphics/pfstools/options.mk | 37 ++++++++++++++++++-------------------
4 files changed, 47 insertions(+), 46 deletions(-)
diffs (223 lines):
diff -r bfe5892c5f18 -r 01d25b76de6d graphics/pfstools/Makefile
--- a/graphics/pfstools/Makefile Sun Dec 15 21:32:05 2019 +0000
+++ b/graphics/pfstools/Makefile Sun Dec 15 21:32:52 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2019/10/28 09:42:28 kamil Exp $
+# $NetBSD: Makefile,v 1.55 2019/12/15 21:32:52 adam Exp $
-DISTNAME= pfstools-2.0.5
-PKGREVISION= 14
+DISTNAME= pfstools-2.1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/}
EXTRACT_SUFX= .tgz
@@ -11,25 +10,24 @@
COMMENT= Tools for manipulating HDR images and video frames
LICENSE= gnu-lgpl-v2.1
+DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
+
USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= bash perl pkg-config
+PKGCONFIG_OVERRIDE+= src/pfs/pfs.pc.in
CMAKE_ARGS+= -DBASH_EXECUTABLE=${TOOLS_BASH}
CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
-CMAKE_ARGS+= -DWITH_MATLAB=NO
-CMAKE_ARGS+= -DWITH_OpenCV=NO
-CMAKE_ARGS+= -DWITH_QT=NO
-
-PKGCONFIG_OVERRIDE+= src/pfs/pfs.pc.in
-
-DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
+CMAKE_ARGS+= -DWITH_MATLAB=OFF
+CMAKE_ARGS+= -DWITH_OpenCV=OFF
+CXXFLAGS+= -std=c++14 # OpenEXR
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Fixing paths in CMake modules.
SUBST_FILES.paths= cmake/Find*.cmake
-SUBST_SED.paths= -e 's,/usr/local,${LOCALBASE},g'
+SUBST_SED.paths= -e 's,/usr/local,${PREFIX},g'
SUBST_CLASSES+= perl
SUBST_STAGE.perl= pre-configure
@@ -43,6 +41,6 @@
.include "../../graphics/netpbm/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftw/buildlink3.mk"
+.include "../../math/fftwf/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bfe5892c5f18 -r 01d25b76de6d graphics/pfstools/PLIST
--- a/graphics/pfstools/PLIST Sun Dec 15 21:32:05 2019 +0000
+++ b/graphics/pfstools/PLIST Sun Dec 15 21:32:52 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/02/12 21:50:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/15 21:32:52 adam Exp $
bin/dcraw2hdrgen
bin/jpeg2hdrgen
bin/pfsabsolute
@@ -22,6 +22,7 @@
bin/pfsinppm
bin/pfsinrgbe
bin/pfsintiff
+bin/pfsinyuv
${PLIST.octave}bin/pfsoctavelum
${PLIST.octave}bin/pfsoctavergb
bin/pfsout
@@ -32,6 +33,7 @@
bin/pfsoutppm
bin/pfsoutrgbe
bin/pfsouttiff
+bin/pfsoutyuv
bin/pfspad
bin/pfspanoramic
bin/pfsplotresponse
@@ -43,7 +45,7 @@
bin/pfstmo_drago03
bin/pfstmo_durand02
bin/pfstmo_fattal02
-${PLIST.fftw}bin/pfstmo_ferradans11
+bin/pfstmo_ferradans11
bin/pfstmo_mai11
bin/pfstmo_mantiuk06
bin/pfstmo_mantiuk08
@@ -56,13 +58,6 @@
include/pfs/pfs.h
lib/libpfs.a
lib/pkgconfig/pfs.pc
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsclose.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsget.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsopen.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsput.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsread.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfstransform_colorspace.oct
-${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfswrite.oct
man/man1/dcraw2hdrgen.1
man/man1/jpeg2hdrgen.1
man/man1/pfsabsolute.1
@@ -86,6 +81,7 @@
man/man1/pfsinppm.1
man/man1/pfsinrgbe.1
man/man1/pfsintiff.1
+man/man1/pfsinyuv.1
${PLIST.octave}man/man1/pfsoctavelum.1
${PLIST.octave}man/man1/pfsoctavergb.1
man/man1/pfsout.1
@@ -96,6 +92,7 @@
man/man1/pfsoutppm.1
man/man1/pfsoutrgbe.1
man/man1/pfsouttiff.1
+man/man1/pfsoutyuv.1
man/man1/pfspad.1
man/man1/pfspanoramic.1
man/man1/pfsplotresponse.1
@@ -107,7 +104,7 @@
man/man1/pfstmo_drago03.1
man/man1/pfstmo_durand02.1
man/man1/pfstmo_fattal02.1
-${PLIST.fftw}man/man1/pfstmo_ferradans11.1
+man/man1/pfstmo_ferradans11.1
man/man1/pfstmo_mai11.1
man/man1/pfstmo_mantiuk06.1
man/man1/pfstmo_mantiuk08.1
@@ -149,3 +146,10 @@
${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfsview.m
${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfsview_list.m
${PLIST.octave}${OCT_LOCALVERFCNFILEDIR}/pfstools/pfsview_rgb.m
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsclose.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsget.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsopen.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsput.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfsread.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfstransform_colorspace.oct
+${PLIST.octave}${OCT_LOCALVEROCTFILEDIR}/pfstools/pfswrite.oct
diff -r bfe5892c5f18 -r 01d25b76de6d graphics/pfstools/distinfo
--- a/graphics/pfstools/distinfo Sun Dec 15 21:32:05 2019 +0000
+++ b/graphics/pfstools/distinfo Sun Dec 15 21:32:52 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2017/02/12 21:50:17 adam Exp $
+$NetBSD: distinfo,v 1.5 2019/12/15 21:32:52 adam Exp $
-SHA1 (pfstools-2.0.5.tgz) = 69e01a1079f7a0d764022d59f1463c775c2ad8f5
-RMD160 (pfstools-2.0.5.tgz) = 01679b504f7e8697cc7225878173e52e6c691865
-SHA512 (pfstools-2.0.5.tgz) = 6aec71369f31b25443f11a6d715c43f82ac028cbe2472d1515c6a6fde7afaa32f8fd5856d8330481481e6c84d89b72077edf4d90012ff8e547f7f13b0fc110a4
-Size (pfstools-2.0.5.tgz) = 582119 bytes
+SHA1 (pfstools-2.1.0.tgz) = 7190c55b3c0af2cbabf6d326895bab8b9b8b8dbe
+RMD160 (pfstools-2.1.0.tgz) = 701b96e9f566fae061bdd3b46d5fc846537d4a65
+SHA512 (pfstools-2.1.0.tgz) = 2117d638a807ec803fec0e8a2d1478f2771cc39fb349b582ab2727762379dc52c9b2a50c276d123c2c7456cdc7518ae60bdaa6d2e3ff179f9f43df63f2b57012
+Size (pfstools-2.1.0.tgz) = 596136 bytes
SHA1 (patch-CMakeLists.txt) = 344903c4b26414f75c415a0c00dd520e2d3641dc
SHA1 (patch-src_octave_pfscrop) = 5291c0ffecb0cf04004c7460d0639618595a9b1a
diff -r bfe5892c5f18 -r 01d25b76de6d graphics/pfstools/options.mk
--- a/graphics/pfstools/options.mk Sun Dec 15 21:32:05 2019 +0000
+++ b/graphics/pfstools/options.mk Sun Dec 15 21:32:52 2019 +0000
@@ -1,28 +1,19 @@
-# $NetBSD: options.mk,v 1.7 2019/10/28 09:42:28 kamil Exp $
+# $NetBSD: options.mk,v 1.8 2019/12/15 21:32:52 adam Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools
-PKG_SUPPORTED_OPTIONS= fftw imagemagick octave opengl
-
+PKG_OPTIONS_VAR= PKG_OPTIONS.pfstools
+PKG_SUPPORTED_OPTIONS= imagemagick octave opengl qt
PKG_SUGGESTED_OPTIONS.Darwin+= opengl
-PLIST_VARS+= fftw im octave gl
+PLIST_VARS+= im octave gl qt
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mfftw)
-.include "../../math/fftwf/buildlink3.mk"
-PLIST.fftw= yes
-CMAKE_ARGS+= -DWITH_FFTW=YES
-.else
-CMAKE_ARGS+= -DWITH_FFTW=NO
-.endif
-
.if !empty(PKG_OPTIONS:Mimagemagick)
.include "../../graphics/ImageMagick6/buildlink3.mk"
PLIST.im= yes
-CMAKE_ARGS+= -DWITH_ImageMagick=YES
+CMAKE_ARGS+= -DWITH_ImageMagick=ON
.else
-CMAKE_ARGS+= -DWITH_ImageMagick=NO
+CMAKE_ARGS+= -DWITH_ImageMagick=OFF
.endif
.if !empty(PKG_OPTIONS:Moctave)
@@ -33,9 +24,17 @@
PLIST.octave= yes
PLIST_SUBST+= OCT_LOCALVEROCTFILEDIR=${OCT_LOCALVEROCTFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
PLIST_SUBST+= OCT_LOCALVERFCNFILEDIR=${OCT_LOCALVERFCNFILEDIR:S/${BUILDLINK_PREFIX.octave}\///}
-CMAKE_ARGS+= -DWITH_Octave=YES
+CMAKE_ARGS+= -DWITH_Octave=ON
.else
-CMAKE_ARGS+= -DWITH_Octave=NO
+CMAKE_ARGS+= -DWITH_Octave=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+PLIST.qt= yes
+CMAKE_ARGS+= -DWITH_QT=ON
+.else
+CMAKE_ARGS+= -DWITH_QT=OFF
.endif
.if !empty(PKG_OPTIONS:Mopengl)
@@ -45,7 +44,7 @@
# XXX nasty hack
CXXFLAGS.NetBSD+= -lpthread
PLIST.gl= yes
-CMAKE_ARGS+= -DWITH_pfsglview=YES
+CMAKE_ARGS+= -DWITH_pfsglview=ON
.else
-CMAKE_ARGS+= -DWITH_pfsglview=NO
+CMAKE_ARGS+= -DWITH_pfsglview=OFF
.endif
Home |
Main Index |
Thread Index |
Old Index