aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2018-09-22 10:15:22 +0000
committerMatthias Andree <mandree@FreeBSD.org>2018-09-22 10:15:22 +0000
commitd1cfeab07edadd10dd4f099e9dd0c9103b3596be (patch)
tree3378240ab0ba279cc8a007880049ac1be723082d
parentaf8a39ccb6a2b032b3db242b42f46734d62da830 (diff)
downloadports-d1cfeab07edadd10dd4f099e9dd0c9103b3596be.tar.gz
ports-d1cfeab07edadd10dd4f099e9dd0c9103b3596be.zip
Update ilmbase and openexr to 2.3.0, rename OpenEXR to openexr.
Release notes: <https://github.com/openexr/openexr/releases/tag/v2.3.0> Adjust LIB_DEPENDS of all ports that require ilmbase or openexr to chase the new lower-case spelling of the name, and to omit the version from the library name to ease future maintenance. Bump PORTREVISION of all ports that depend on ilmbase or openexr directly, so that they all get rebuilt on upgrades. Add patches to graphics/ampasCTL to keep it alive, with (a) ilmbase now that its Iex::BaseExc class is no longer derived from std::string, details were given upstream through https://github.com/ampas/CTL/issues/71 and (b) to unwind semicolon/;-lists in cmake that stem from openexr/ ilmbase pkg-config variables. (Note ampasCTL is unmaintained as FreeBSD port, and upstream, and I cannot run-time test it.) Poudriere build tests on 11.2-RELEASE-p1 amd64 of ALL ports depending directly or indirectly on ilmbase and/or openexr have passed without regressions. Thus invoking due diligence, I believe I have done the equivalent of an -exp run, and do not require approval for the dependency chases to third-party ports.
Notes
Notes: svn path=/head/; revision=480374
-rw-r--r--MOVED1
-rw-r--r--UPDATING19
-rw-r--r--devel/kio-extras/Makefile3
-rw-r--r--devel/synfig/Makefile4
-rw-r--r--editors/calligra/Makefile6
-rw-r--r--games/pink-pony/Makefile2
-rw-r--r--graphics/ImageMagick/Makefile6
-rw-r--r--graphics/ImageMagick7/Makefile6
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in22
-rw-r--r--graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp47
-rw-r--r--graphics/OpenEXR/files/patch-IlmImf__Makefile.in15
-rw-r--r--graphics/alembic/Makefile3
-rw-r--r--graphics/ampasCTL/Makefile10
-rw-r--r--graphics/ampasCTL/files/patch-cmake_modules_FindIlmBase.cmake14
-rw-r--r--graphics/ampasCTL/files/patch-cmake_modules_FindOpenEXR.cmake14
-rw-r--r--graphics/ampasCTL/files/patch-lib_IlmCtlSimd_CtlSimdInst.cpp11
-rw-r--r--graphics/appleseed/Makefile4
-rw-r--r--graphics/aqsis/Makefile4
-rw-r--r--graphics/blender/Makefile4
-rw-r--r--graphics/cimg/Makefile3
-rw-r--r--graphics/cinepaint/Makefile4
-rw-r--r--graphics/darktable/Makefile6
-rw-r--r--graphics/devil/Makefile4
-rw-r--r--graphics/enblend/Makefile6
-rw-r--r--graphics/exact-image/Makefile4
-rw-r--r--graphics/exrtools/Makefile6
-rw-r--r--graphics/fyre/Makefile4
-rw-r--r--graphics/gegl/Makefile4
-rw-r--r--graphics/gegl3/Makefile5
-rw-r--r--graphics/gimp-gmic-plugin/Makefile4
-rw-r--r--graphics/gmic/Makefile5
-rw-r--r--graphics/gstreamer1-plugins-openexr/Makefile2
-rw-r--r--graphics/hdr_tools/Makefile4
-rw-r--r--graphics/hugin/Makefile4
-rw-r--r--graphics/ilmbase/Makefile36
-rw-r--r--graphics/ilmbase/distinfo6
-rw-r--r--graphics/ilmbase/files/patch-CMakeLists.txt9
-rw-r--r--graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt19
-rw-r--r--graphics/ilmbase/files/patch-git_8eed701259
-rw-r--r--graphics/kf5-kimageformats/Makefile3
-rw-r--r--graphics/krita/Makefile4
-rw-r--r--graphics/luminance-qt5/Makefile4
-rw-r--r--graphics/luminance/Makefile4
-rw-r--r--graphics/nvidia-texture-tools/Makefile4
-rw-r--r--graphics/opencv/Makefile4
-rw-r--r--graphics/openexr/Makefile (renamed from graphics/OpenEXR/Makefile)39
-rw-r--r--graphics/openexr/distinfo (renamed from graphics/OpenEXR/distinfo)6
-rw-r--r--graphics/openexr/files/patch-IlmImfTest__main.cpp (renamed from graphics/OpenEXR/files/patch-IlmImfTest__main.cpp)0
-rw-r--r--graphics/openexr/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp (renamed from graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp)0
-rw-r--r--graphics/openexr/files/patch-IlmImfUtilTest_main.cpp (renamed from graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp)0
-rw-r--r--graphics/openexr/files/patch-IlmImf__ImfSystemSpecific.cpp (renamed from graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp)0
-rw-r--r--graphics/openexr/files/patch-exrenvmap__main.cpp (renamed from graphics/OpenEXR/files/patch-exrenvmap__main.cpp)0
-rw-r--r--graphics/openexr/files/patch-exrmaketiled__main.cpp (renamed from graphics/OpenEXR/files/patch-exrmaketiled__main.cpp)0
-rw-r--r--graphics/openexr/pkg-descr (renamed from graphics/OpenEXR/pkg-descr)0
-rw-r--r--graphics/openexr/pkg-plist (renamed from graphics/OpenEXR/pkg-plist)1
-rw-r--r--graphics/openfx-io/Makefile4
-rw-r--r--graphics/openimageio/Makefile4
-rw-r--r--graphics/openshadinglanguage/Makefile4
-rw-r--r--graphics/osg-devel/Makefile4
-rw-r--r--graphics/osg/Makefile4
-rw-r--r--graphics/pfstools/Makefile6
-rw-r--r--graphics/pixie/Makefile4
-rw-r--r--graphics/povray37/Makefile6
-rw-r--r--graphics/py-openexr/Makefile4
-rw-r--r--graphics/simpleviewer/Makefile4
-rw-r--r--graphics/synfigstudio/Makefile4
-rw-r--r--graphics/vigra/Makefile4
-rw-r--r--graphics/vips/Makefile6
-rw-r--r--graphics/yafaray/Makefile4
-rw-r--r--multimedia/cinelerra-gg/Makefile6
-rw-r--r--multimedia/gstreamer1-plugins/Makefile.common4
-rw-r--r--science/gwyddion/Makefile3
-rw-r--r--x11/kde-runtime-kde4/Makefile6
-rw-r--r--x11/kdelibs-kde4/Makefile6
75 files changed, 230 insertions, 317 deletions
diff --git a/MOVED b/MOVED
index f186ce4a8f81..24f189b818ad 100644
--- a/MOVED
+++ b/MOVED
@@ -10528,3 +10528,4 @@ devel/hs-hashed-storage||2018-09-16|Has expired: Not being developed upstream
www/py-searx|www/searx|2018-09-16|Move to a proper directory: this is a server, not a library
net/syndication|net/kf5-syndication|2018-09-17|Has become a proper KDE framework
x11-wm/swm||2018-09-21|Has expired: upstream no longer maintained, the screen turns black after starting swm
+graphics/OpenEXR|graphics/openexr|2018-09-22|Renamed to match upstream distribution's lower-case name
diff --git a/UPDATING b/UPDATING
index 6e44f4213248..e7c55d5ee2e0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,25 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20180922:
+ AFFECTS: users of graphics/ilmbase, graphics/OpenEXR
+ AUTHOR: mandree@FreeBSD.org
+
+ The IlmBase package has been updated to 2.3.0.
+ The OpenEXR package has been renamed to openexr and updated to 2.3.0.
+
+ The PORTREVISION of all ports requiring either has been bumped to
+ ease the reubuilds, and where there were versions in the file names,
+ these have been removed from the *_DEPENDS lines for easier maintenance.
+
+ A full ports or package upgrade should just work.
+
+ If you are doing partial updates, be sure to rebuild and reinstall
+ all packages that require either of OpenEXR or ilmbase.
+ Normally, these can be listed by running:
+
+ # pkg info -q -r OpenEXR ilmbase | sort -u | xargs pkg info -q -o
+
20180905:
AFFECTS: users of lang/php56
AUTHOR: tz@FreeBSD.org
diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile
index ccb6a7353ff8..d8f94a9fdc97 100644
--- a/devel/kio-extras/Makefile
+++ b/devel/kio-extras/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kio-extras
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-applications # kde kde-applications-plasma
MAINTAINER= kde@FreeBSD.org
@@ -37,7 +38,7 @@ MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp
EXR_DESC= Provides support for OpenEXR formatted images in the thumbnail kioslave
EXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
-EXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+EXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
EXIV_DESC= Provides support for automatic rotation of JPEGs in the thumbnail kioslave
EXIV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Exiv2
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 56359afccb2e..b076f54434c5 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -3,7 +3,7 @@
PORTNAME= synfig
PORTVERSION= 1.2.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel graphics multimedia
MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/source
@@ -14,7 +14,7 @@ LICENSE= GPLv2+
BUILD_DEPENDS= etl>=1.2.1:devel/etl
LIB_DEPENDS= libHalf.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libMagickWand-6.so:graphics/ImageMagick \
libavcodec.so:multimedia/ffmpeg \
libboost_program_options.so:devel/boost-libs \
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index b0b1072fe695..65ffc4a62c68 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra
DISTVERSION= 3.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -10,7 +10,7 @@ DIST_SUBDIR= KDE/${PORTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE office suite
-LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \
+LIB_DEPENDS= libImath.so:graphics/ilmbase \
libKPropertyCore3.so:x11-toolkits/kproperty \
libKReport3.so:textproc/kreport \
libboost_thread.so:devel/boost-libs \
@@ -56,7 +56,7 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= OPENEXR
OPTIONS_DEFAULT= OPENEXR
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index c294b13d4de3..f2fd9ea0eafd 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pink-pony
PORTVERSION= 1.4.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e5d665a0f2d9..43bbd1ce0fac 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ImageMagick
DISTVERSION= 6.9.9-28
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
@@ -179,8 +179,8 @@ PLIST_SUB+= MODULES='@comment '
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. else
-LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so:graphics/ilmbase
+LIB_DEPENDS+= libIlmImf.so:graphics/openexr \
+ libImath.so:graphics/ilmbase
PLIST_SUB+= OPENEXR=""
. endif
.else
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 11cf55b07e0f..394bd3adee7e 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ImageMagick
DISTVERSION= 7.0.7-16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
http://www.imagemagick.org/download/legacy/ \
@@ -171,8 +171,8 @@ PLIST_SUB+= MODULES='@comment '
. if ${_IMAGEMAGICK_THREADS} == "no"
IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
. else
-LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so:graphics/ilmbase
+LIB_DEPENDS+= libIlmImf.so:graphics/openexr \
+ libImath.so:graphics/ilmbase
PLIST_SUB+= OPENEXR=""
. endif
.else
diff --git a/graphics/Makefile b/graphics/Makefile
index 2309cee829c8..f356db2ba16f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -14,7 +14,6 @@
SUBDIR += ImageMagick7
SUBDIR += ImageMagick7-nox11
SUBDIR += O2-tools
- SUBDIR += OpenEXR
SUBDIR += R-cran-DiagrammeR
SUBDIR += R-cran-GDD
SUBDIR += R-cran-RColorBrewer
@@ -671,6 +670,7 @@
SUBDIR += opencv-core
SUBDIR += opencv-java
SUBDIR += opendx
+ SUBDIR += openexr
SUBDIR += openfx-arena
SUBDIR += openfx-io
SUBDIR += openfx-misc
diff --git a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in b/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
deleted file mode 100644
index 1a11b076bd4a..000000000000
--- a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- IlmImfUtil/Makefile.in.orig 2017-12-01 01:20:37 UTC
-+++ IlmImfUtil/Makefile.in
-@@ -375,15 +375,16 @@ libIlmImfUtil_la_SOURCES = \
- ImfImageDataWindow.h ImfImageDataWindow.cpp \
- ImfImageChannelRenaming.h
-
--libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info \
-+libIlmImfUtil_la_LDFLAGS = -L$(top_builddir)/IlmImf @ILMBASE_LDFLAGS@ -version-info \
- @LIBTOOL_VERSION@ -no-undefined $(am__append_1)
- libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- EXTRA_DIST = CMakeLists.txt
--INCLUDES = @ILMBASE_CXXFLAGS@ \
-+INCLUDES = \
- -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf \
-- -I$(top_srcdir)/config
-+ -I$(top_srcdir)/config \
-+ @ILMBASE_CXXFLAGS@
-
- all: all-am
-
diff --git a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp b/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
deleted file mode 100644
index dd3b73fe83cb..000000000000
--- a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- IlmImf/ImfFastHuf.cpp.orig 2017-11-17 23:00:24 UTC
-+++ IlmImf/ImfFastHuf.cpp
-@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
- for (int i = 0; i <= MAX_CODE_LEN; ++i)
- {
- codeCount[i] = 0;
-- base[i] = 0xffffffffffffffffL;
-+ base[i] = 0xffffffffffffffffULL;
- offset[i] = 0;
- }
-
-@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base
-
- for (int i = 0; i <= MAX_CODE_LEN; ++i)
- {
-- if (base[i] != 0xffffffffffffffffL)
-+ if (base[i] != 0xffffffffffffffffULL)
- {
- _ljBase[i] = base[i] << (64 - i);
- }
-@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base
- // Unused code length - insert dummy values
- //
-
-- _ljBase[i] = 0xffffffffffffffffL;
-+ _ljBase[i] = 0xffffffffffffffffULL;
- }
- }
-
-@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base
-
- int minIdx = TABLE_LOOKUP_BITS;
-
-- while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
-+ while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
- minIdx--;
-
- if (minIdx < 0)
-@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base
- // Set the min value such that the table is never tested.
- //
-
-- _tableMin = 0xffffffffffffffffL;
-+ _tableMin = 0xffffffffffffffffULL;
- }
- else
- {
diff --git a/graphics/OpenEXR/files/patch-IlmImf__Makefile.in b/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
deleted file mode 100644
index d2f9cca01ac1..000000000000
--- a/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- IlmImf/Makefile.in.orig 2014-08-10 04:48:23 UTC
-+++ IlmImf/Makefile.in
-@@ -458,9 +458,10 @@ noinst_HEADERS = ImfCompressor.h \
- ImfOptimizedPixelReading.h
-
- EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
--INCLUDES = @ILMBASE_CXXFLAGS@ \
-+INCLUDES = \
- -I$(top_builddir) \
-- -I$(top_srcdir)/config
-+ -I$(top_srcdir)/config \
-+ @ILMBASE_CXXFLAGS@
-
- CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
- b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 655411e77cc6..b61170436a38 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alembic
PORTVERSION= 1.7.9
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= danfe@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Open framework for storing and sharing graphic scene data
LICENSE= BSD3CLAUSE
-LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase
+LIB_DEPENDS= libImath.so:graphics/ilmbase
USES= cmake compiler:c++11-lang
USE_CXXSTD= c++11
diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index e81b37ce285b..48a3dea54d53 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ampasCTL
PORTVERSION= 1.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics devel
MAINTAINER= ports@FreeBSD.org
@@ -15,18 +15,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libImath.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libtiff.so:graphics/tiff \
libAcesContainer.so:graphics/ampasACES-container
+USES= cmake:outsource pathfix pkgconfig
+USE_LDCONFIG= yes
USE_GITHUB= yes
+
GH_ACCOUNT= ampas
GH_PROJECT= CTL
GH_TAGNAME= 57b48a2
-USES= cmake pathfix pkgconfig
-USE_LDCONFIG= yes
-
OPTIONS_DEFINE= DOCS
PORTDOCS= *
diff --git a/graphics/ampasCTL/files/patch-cmake_modules_FindIlmBase.cmake b/graphics/ampasCTL/files/patch-cmake_modules_FindIlmBase.cmake
new file mode 100644
index 000000000000..9b2ef51b68fd
--- /dev/null
+++ b/graphics/ampasCTL/files/patch-cmake_modules_FindIlmBase.cmake
@@ -0,0 +1,14 @@
+--- cmake/modules/FindIlmBase.cmake.orig 2014-06-03 01:11:24 UTC
++++ cmake/modules/FindIlmBase.cmake
+@@ -19,7 +19,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
+ endif()
+
+ if(PC_ILMBASE_FOUND)
+- set(IlmBase_CFLAGS ${PC_ILMBASE_CFLAGS_OTHER})
++ set(IlmBase_CFLAGS "")
++ foreach(iter ${PC_ILMBASE_CFLAGS_OTHER})
++ set(IlmBase_CFLAGS "${IlmBase_CFLAGS} ${iter}")
++ endforeach()
+ set(IlmBase_LIBRARY_DIRS ${PC_ILMBASE_LIBRARY_DIRS})
+ set(IlmBase_LDFLAGS ${PC_ILMBASE_LDFLAGS_OTHER})
+ if("${_IlmBase_HINT_INCLUDE}" STREQUAL "")
diff --git a/graphics/ampasCTL/files/patch-cmake_modules_FindOpenEXR.cmake b/graphics/ampasCTL/files/patch-cmake_modules_FindOpenEXR.cmake
new file mode 100644
index 000000000000..40fecb14cd43
--- /dev/null
+++ b/graphics/ampasCTL/files/patch-cmake_modules_FindOpenEXR.cmake
@@ -0,0 +1,14 @@
+--- cmake/modules/FindOpenEXR.cmake.orig 2014-06-03 01:11:24 UTC
++++ cmake/modules/FindOpenEXR.cmake
+@@ -19,7 +19,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
+ endif()
+
+ if(PC_OPENEXR_FOUND)
+- set(OpenEXR_CFLAGS ${PC_OPENEXR_CFLAGS_OTHER})
++ set(OpenEXR_CFLAGS "")
++ foreach(iter ${PC_OPENEXR_CFLAGS_OTHER})
++ set(OpenEXR_CFLAGS "${OpenEXR_CFLAGS} ${iter}")
++ endforeach()
+ set(OpenEXR_LIBRARY_DIRS ${PC_OPENEXR_LIBRARY_DIRS})
+ set(OpenEXR_LDFLAGS ${PC_OPENEXR_LDFLAGS_OTHER})
+ if("${_OpenEXR_HINT_INCLUDE}" STREQUAL "")
diff --git a/graphics/ampasCTL/files/patch-lib_IlmCtlSimd_CtlSimdInst.cpp b/graphics/ampasCTL/files/patch-lib_IlmCtlSimd_CtlSimdInst.cpp
new file mode 100644
index 000000000000..9da10926680c
--- /dev/null
+++ b/graphics/ampasCTL/files/patch-lib_IlmCtlSimd_CtlSimdInst.cpp
@@ -0,0 +1,11 @@
+--- lib/IlmCtlSimd/CtlSimdInst.cpp.orig 2014-06-03 01:11:24 UTC
++++ lib/IlmCtlSimd/CtlSimdInst.cpp
+@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas
+ REPLACE_EXC
+ (e, "\n" <<
+ xcontext.fileName() << ":" <<
+- inst->lineNumber() << ": " << e);
++ inst->lineNumber() << ": " << e.what());
+
+ throw e;
+ }
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index b80096043718..49ebc4393e88 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= appleseed
DISTVERSION= 1.7.1-beta
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MAINTAINER= danfe@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE= MIT
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libpng.so:graphics/png \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libxerces-c.so:textproc/xerces-c3 \
liboslexec.so:graphics/openshadinglanguage
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 5b147c714b8f..1e5362fc8ef7 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aqsis
PORTVERSION= 1.8.2
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
@@ -15,7 +15,7 @@ LICENSE_COMB= multi
BUILD_DEPENDS= bison:devel/bison \
xsltproc:textproc/libxslt
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libboost_filesystem.so:devel/boost-libs \
libtiff.so:graphics/tiff
RUN_DEPENDS= bash:shells/bash
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 1c83afbbee03..49967aa073cc 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blender
PORTVERSION= 2.79b
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -109,7 +109,7 @@ OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \
libyaml-cpp03.so:devel/yaml-cpp03 \
libtinyxml.so:textproc/tinyxml
OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libHalf.so:graphics/ilmbase
OPENIMAGEIO_IMPLIES= OPENEXR TIFF
OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index de31c0547b8a..0e546cd90d3a 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -4,6 +4,7 @@
PORTNAME= cimg
DISTVERSIONPREFIX= v.
DISTVERSION= 2.3.6
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= graphics devel
@@ -58,7 +59,7 @@ LIB_DEPENDS+= libcurl.so:ftp/curl \
libpng.so:graphics/png \
libtiff.so:graphics/tiff \
libHalf.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libgimp-2.0.so:graphics/gimp-app \
libfftw3.so:math/fftw3 \
libopencv_video.so:graphics/opencv \
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 894f48ac4090..8489ea3da0a4 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinepaint
DISTVERSION= 1.0-4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/CinePaint/CinePaint-${DISTVERSION}
@@ -13,7 +13,7 @@ COMMENT= Editing tool used for painting and retouching of movies
LICENSE= GPLv2 LGPL21 MIT
LICENSE_COMB= multi
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libftgl.so:graphics/ftgl \
liblcms.so:graphics/lcms \
libpng.so:graphics/png \
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index d0a404e868b9..87cfe5464c45 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darktable
PORTVERSION= 2.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
@@ -82,8 +82,8 @@ NLS_USES_OFF= gettext-runtime
NLS_CMAKE_OFF= -DUSE_NLS:BOOL=OFF
NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libIlmThread-2_2.so:graphics/ilmbase
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
+ libIlmThread.so:graphics/ilmbase
OPENEXR_CMAKE_OFF= -DUSE_OPENEXR:BOOL=OFF
OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 6e6b1d563d34..a16ddce04a5a 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -3,7 +3,7 @@
PORTNAME= devil
PORTVERSION= 1.7.8
-PORTREVISION= 22
+PORTREVISION= 23
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF/openil/DevIL/${PORTVERSION}
@@ -55,7 +55,7 @@ PNG_CONFIGURE_ENABLE= png
PNG_CONFIGURE_OFF= libpng_app=no
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_ENABLE= tiff
-EXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+EXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
EXR_CONFIGURE_ENABLE= exr
#SQUISH_BUILD_DEPENDS= ${LOCALBASE}/lib/libsquish.a:graphics/squish
#SQUISH_CONFIGURE_WITH= libsquish
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 5521d711ed21..7a30e255418b 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -3,7 +3,7 @@
PORTNAME= enblend
PORTVERSION= 4.1.4
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= graphics
MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
DISTNAME= enblend-enfuse-${PORTVERSION}
@@ -15,14 +15,14 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= help2man:misc/help2man \
- OpenEXR>=1.0:graphics/OpenEXR
+ openexr>=1.0:graphics/openexr
LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
libtiff.so:graphics/tiff \
libboost_filesystem.so:devel/boost-libs \
libvigraimpex.so:graphics/vigra \
libgsl.so:math/gsl \
libpng.so:graphics/png
-RUN_DEPENDS= OpenEXR>=1.0:graphics/OpenEXR
+RUN_DEPENDS= openexr>=1.0:graphics/openexr
BROKEN_powerpc64= fails to configure: libvigraimpex is required to compile Enblend
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 96efbbc13676..238dbb0bfc10 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exact-image
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5 python
MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ LOCAL/bf
@@ -18,7 +18,7 @@ LIB_DEPENDS= libagg.so:graphics/agg \
libpng.so:graphics/png \
libgif.so:graphics/giflib \
libjasper.so:graphics/jasper \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
liblcms.so:graphics/lcms \
libfreetype.so:print/freetype2 \
libexpat.so:textproc/expat2
diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile
index dfcb857cf0ce..d6ebb8ba0b44 100644
--- a/graphics/exrtools/Makefile
+++ b/graphics/exrtools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exrtools
PORTVERSION= 0.4
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics
MASTER_SITES= http://scanline.ca/exrtools/ \
LOCAL/ehaupt
@@ -13,9 +13,9 @@ COMMENT= Utilities for manipulating with HDR images in OpenEXR format
LICENSE= GPLv2
-LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \
+LIB_DEPENDS= libImath.so:graphics/ilmbase \
libpng.so:graphics/png \
- libIlmImf.so:graphics/OpenEXR
+ libIlmImf.so:graphics/openexr
BROKEN_armv6= fails to configure: checking for /nxb-bin/usr/bin/cc... no
BROKEN_armv7= fails to configure: checking for /nxb-bin/usr/bin/cc... no
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 9ba8d52611d3..66c4e2c44973 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fyre
PORTVERSION= 1.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://releases.navi.cx/fyre/
@@ -22,7 +22,7 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENEXR GNET DOCS
OPTIONS_DEFAULT= OPENEXR GNET
OPENEXR_CONFIGURE_ENABLE= openexr
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
GNET_DESC= Networking support via GNet
GNET_CONFIGURE_ENABLE= gnet
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 2c5e0507d290..1e64f82cd959 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gegl
PORTVERSION= 0.2.0
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= graphics
MASTER_SITES= GIMP
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=--without-lua
.endif
.if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR
+LIB_DEPENDS+= libIlmImf.so:graphics/openexr
PLIST_SUB+= OPENEXR=""
.else
CONFIGURE_ARGS+=--without-openexr
diff --git a/graphics/gegl3/Makefile b/graphics/gegl3/Makefile
index aede146b4332..4b87d3a75327 100644
--- a/graphics/gegl3/Makefile
+++ b/graphics/gegl3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gegl
PORTVERSION= 0.3.34
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GIMP
PKGNAMESUFFIX= 3
@@ -81,8 +82,8 @@ LCMS2_CONFIGURE_OFF= --without-lcms
LUA_USES= lua
LUA_CONFIGURE_WITH= lua
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so:graphics/ilmbase
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
+ libImath.so:graphics/ilmbase
OPENEXR_CONFIGURE_WITH= openexr
RAW_LIB_DEPENDS= libraw.so:graphics/libraw
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 7b61c414dbaf..7bf4d3c31688 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmic
PORTVERSION= 1.6.9
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= http://gmic.eu/files/source/
PKGNAMEPREFIX= gimp-
@@ -13,7 +13,7 @@ MAINTAINER= rm@FreeBSD.org
COMMENT= GREYC's Magic Image Converter
LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libopencv_video.so:graphics/opencv \
libMagick++-6.so:graphics/ImageMagick \
libavcodec.so:multimedia/ffmpeg \
diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index ed70f1b32cad..f310f82dcc38 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gmic
DISTVERSION= 2.3.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= https://gmic.eu/files/source/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -19,8 +20,8 @@ BROKEN_i386= error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__
BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libGraphicsMagick++.so:graphics/GraphicsMagick \
- libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so:graphics/ilmbase \
+ libIlmImf.so:graphics/openexr \
+ libImath.so:graphics/ilmbase \
libomp.so:devel/openmp \
libopencv_core.so:graphics/opencv-core \
libopencv_video.so:graphics/opencv \
diff --git a/graphics/gstreamer1-plugins-openexr/Makefile b/graphics/gstreamer1-plugins-openexr/Makefile
index 7b7a23f78f25..e1c650b89914 100644
--- a/graphics/gstreamer1-plugins-openexr/Makefile
+++ b/graphics/gstreamer1-plugins-openexr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= GStreamer OpenExr codec plugin
diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile
index 8367ab48feca..68403550ece5 100644
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hdr_tools
PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \
http://freebsd.nsu.ru/distfiles/
@@ -16,7 +16,7 @@ LICENSE= GPLv3
LIB_DEPENDS= libpopt.so:devel/popt \
libtiff.so:graphics/tiff \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libMagick++-6.so:graphics/ImageMagick
USES= compiler:features gmake pkgconfig tar:tgz
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 7638ce02487e..4d431e51cf15 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,14 +3,14 @@
PORTNAME= hugin
PORTVERSION= 2018.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= grog@FreeBSD.org
COMMENT= GUI for Panorama Tools, to stitch panoramic images
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libImath.so:graphics/ilmbase \
libboost_thread.so:devel/boost-libs \
liblcms2.so:graphics/lcms2 \
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 8142508cc31e..9952bda5a073 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -2,43 +2,53 @@
# $FreeBSD$
PORTNAME= ilmbase
-PORTVERSION= 2.2.1
+PORTVERSION= 2.3.0
CATEGORIES= graphics devel
-MASTER_SITES= SAVANNAH/openexr/
-DISTNAME= ilmbase-${PORTVERSION}
+MASTER_SITES= https://github.com/openexr/openexr/releases/download/v${PORTVERSION}/
MAINTAINER= mandree@FreeBSD.org
COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
LICENSE= BSD3CLAUSE
-USES= cmake pkgconfig
+BUILD_DEPENDS= bash:shells/bash
+
+USES= compiler:c++14-lang pkgconfig libtool
USE_LDCONFIG= yes
-PORTDOCS= AUTHORS ChangeLog README
-OPTIONS_DEFINE= DOCS
+GNU_CONFIGURE= yes
+# The configure script uses bash arrays
+CONFIGURE_SHELL= ${LOCALBASE}/bin/bash
+CONFIGURE_ARGS= --disable-static
+TEST_TARGET= check
-OPTIONS_SUB= yes
+PORTDOCS= AUTHORS ChangeLog README.md
+OPTIONS_DEFINE= DOCS LARGE_STACK
+LARGE_STACK_DESC= Enable sys-dependent large stack optimizations
+LARGE_STACK_CONFIGURE_ENABLE= large-stack
-THREAD_CONFIGURE_ENABLE= threading
+OPTIONS_SUB= yes
-MAJORVER= 2_2
-VER= 23
+MAJORVER= 2_3
+VER= 24
PLIST_SUB= MAJORVER=${MAJORVER}
PLIST_SUB+= VER=${VER}
HALF_BIN= eLut toFloat
-regression-test regression test check: build
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
+regression-test regression check:: test
+
+post-configure:
+ ${REINPLACE_CMD} -e 's/#define HAVE_UCONTEXT_H 1/#undef HAVE_UCONTEXT_H/' ${WRKSRC}/config/IlmBaseConfig.h
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
${RM} ${STAGEDIR}${PREFIX}/lib/*.la
.for l in libIex libIexMath libImath libIlmThread
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
- ${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so || :
+ @#${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so || :
+ ${LN} -s ${l}.so ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so
.endfor
.for e in ${HALF_BIN}
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index 941a8ec90527..85149b2aebfe 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512081439
-SHA256 (ilmbase-2.2.1.tar.gz) = cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e
-SIZE (ilmbase-2.2.1.tar.gz) = 573073
+TIMESTAMP = 1536500142
+SHA256 (ilmbase-2.3.0.tar.gz) = 456978d1a978a5f823c7c675f3f36b0ae14dba36638aeaa3c4b0e784f12a3862
+SIZE (ilmbase-2.3.0.tar.gz) = 595490
diff --git a/graphics/ilmbase/files/patch-CMakeLists.txt b/graphics/ilmbase/files/patch-CMakeLists.txt
deleted file mode 100644
index a46a83f2b356..000000000000
--- a/graphics/ilmbase/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- CMakeLists.txt.orig 2017-11-17 23:00:23 UTC
-+++ CMakeLists.txt
-@@ -227,5 +227,5 @@ Cflags: -pthread -I\${OpenEXR_includedir
- INSTALL ( FILES
- ${CMAKE_BINARY_DIR}/IlmBase.pc
- DESTINATION
-- lib/pkgconfig
-+ libdata/pkgconfig
- )
diff --git a/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt b/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
deleted file mode 100644
index 1f2b51d628f0..000000000000
--- a/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- IlmThread/CMakeLists.txt.orig 2017-11-17 23:00:23 UTC
-+++ IlmThread/CMakeLists.txt
-@@ -18,6 +18,7 @@ IF (WIN32)
- )
- ENDIF()
-
-+FIND_PACKAGE(Threads)
-
- IF(BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DILMTHREAD_EXPORTS)
-@@ -26,7 +27,7 @@ ENDIF()
- ADD_LIBRARY ( IlmThread ${LIB_TYPE}
- ${ILMTHREAD_LIBRARY_SOURCES}
- )
--TARGET_LINK_LIBRARIES(IlmThread Iex)
-+TARGET_LINK_LIBRARIES(IlmThread Iex ${CMAKE_THREAD_LIBS_INIT})
-
- INSTALL ( TARGETS
- IlmThread
diff --git a/graphics/ilmbase/files/patch-git_8eed7012 b/graphics/ilmbase/files/patch-git_8eed7012
deleted file mode 100644
index dbbcd85ec4a0..000000000000
--- a/graphics/ilmbase/files/patch-git_8eed7012
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001
-From: Ralph Potter <r.potter@bath.ac.uk>
-Date: Wed, 5 Nov 2014 16:16:55 +0000
-Subject: [PATCH] Resolve dependency issue building eLut.h/toFloat.h with
- CMake/Ninja.
-
----
- IlmBase/Half/CMakeLists.txt | 23 +++++++++++------------
- 1 file changed, 11 insertions(+), 12 deletions(-)
-
-diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
-index 6f9714d..958d1b0 100644
---- Half/CMakeLists.txt
-+++ Half/CMakeLists.txt
-@@ -1,23 +1,24 @@
- # yue.nicholas@gmail.com
-
- ADD_EXECUTABLE ( eLut eLut.cpp )
--
--ADD_CUSTOM_COMMAND (
-- TARGET eLut POST_BUILD
-- COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-+ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-+ COMMAND eLut ARGS > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-+ DEPENDS eLut
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--)
-+ )
- SET_SOURCE_FILES_PROPERTIES(
- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
- PROPERTIES HEADER_FILE_ONLY TRUE
- )
-
- ADD_EXECUTABLE ( toFloat toFloat.cpp )
--ADD_CUSTOM_COMMAND (
-- TARGET toFloat POST_BUILD
-- COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-+ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-+ COMMAND toFloat ARGS > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-+ DEPENDS toFloat
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--)
-+ )
- SET_SOURCE_FILES_PROPERTIES(
- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
- PROPERTIES HEADER_FILE_ONLY TRUE
-@@ -27,9 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(
- half.cpp
- PROPERTIES
- OBJECT_DEPENDS
-- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
-- OBJECT_DEPENDS
-- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
-+ "${CMAKE_CURRENT_BINARY_DIR}/eLut.h;${CMAKE_CURRENT_BINARY_DIR}/toFloat.h"
- )
-
- IF(BUILD_SHARED_LIBS)
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index e5bd4abbc5b0..c82ec4245836 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kimageformats
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -17,7 +18,7 @@ OPTIONS_DEFINE= OPENEXR
OPTIONS_DEFAULT= OPENEXR
OPTIONS_SUB= yes
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
.include <bsd.port.mk>
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 398ba8b3c4b6..1227e58486fc 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -2,7 +2,7 @@
PORTNAME= krita
DISTVERSION= 4.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -48,7 +48,7 @@ OPTIONS_SUB= yes
GMIC_DESC= Depend on the G'Mic plugin #'
GMIC_RUN_DEPENDS= gmic_krita_qt:graphics/gmic-qt
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
CONFLICTS_INSTALL= calligra-2*
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index 944628f813c2..8261a53fafef 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -3,7 +3,7 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.4.0
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
PKGNAMESUFFIX= -qt5
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3
LIB_DEPENDS= libfftw3f.so:math/fftw3-float \
libexiv2.so:graphics/exiv2 \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libtiff.so:graphics/tiff \
libgsl.so:math/gsl \
libraw_r.so:graphics/libraw \
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 87dd36473a05..dc9379419594 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -3,7 +3,7 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.3.1
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
@@ -15,7 +15,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3
LIB_DEPENDS= libfftw3f.so:math/fftw3-float \
libexiv2.so:graphics/exiv2 \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libtiff.so:graphics/tiff \
libgsl.so:math/gsl \
libraw_r.so:graphics/libraw \
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index dc14ed402126..2fc0fc263fc0 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nvidia-texture-tools
PORTVERSION= 2.0.8.1 # needed to not bump PORTEPOCH; remove on next update
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MAINTAINER= amdmi3@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/NVIDIA_Texture_Tools_LICENSE.txt
LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff \
- libIlmImf.so:graphics/OpenEXR
+ libIlmImf.so:graphics/openexr
BROKEN_powerpc= does not build
BROKEN_sparc64= does not build
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 6415b9b15335..1299ced86c9e 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opencv
PORTVERSION= 3.4.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
@@ -210,7 +210,7 @@ GDCM_DESC= Open source DICOM library
GDCM_LIB_DEPENDS= libgdcmMSFF.so:devel/gdcm
GDCM_CMAKE_BOOL= WITH_GDCM
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL= WITH_OPENEXR
PNG_LIB_DEPENDS= libpng.so:graphics/png
diff --git a/graphics/OpenEXR/Makefile b/graphics/openexr/Makefile
index ccef56995a4e..8bedc98be780 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,15 +1,13 @@
# Created by: nork@FreeBSD.org
# $FreeBSD$
-PORTNAME= OpenEXR
-PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTNAME= openexr
+PORTVERSION= 2.3.0
CATEGORIES= graphics devel
-MASTER_SITES= SAVANNAH/openexr/:dist \
+MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/:dist \
LOCAL/mandree/:test
-DISTNAME= openexr-${DISTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:dist \
- openexr-2.2.0-comp_dwa-test-images.tar.xz:test
+ ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test
MAINTAINER= mandree@FreeBSD.org
COMMENT= High dynamic-range (HDR) image file format
@@ -17,11 +15,11 @@ COMMENT= High dynamic-range (HDR) image file format
LICENSE= BSD3CLAUSE
# exact version required to avoid hard-to-debug issues
-LIB_DEPENDS= libImath-2_2.so.23:graphics/ilmbase
+LIB_DEPENDS= libImath-2_3.so.24:graphics/ilmbase
WRKSRC= ${WRKDIR}/${DISTNAME}
-USES= compiler:features gmake libtool pathfix pkgconfig
+USES= compiler:c++14-lang gmake libtool pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-ilmbasetest --enable-imfexamples
USE_LDCONFIG= yes
@@ -35,14 +33,13 @@ PORTDOCS= *
PORTEXAMPLES= *
DOCSRCDIR1= ${WRKSRC}
-DOC_FILES1= AUTHORS ChangeLog NEWS README
+DOC_FILES1= AUTHORS ChangeLog NEWS README.md
DOCSRCDIR2= ${WRKSRC}/doc
-DOCSDIR2= ${DOCSDIR}/doc
DOC_FILES2= *.pdf
OPTIONS_DEFINE= DOCS EXAMPLES LARGE_STACK
-LARGE_STACK_DESC= Enable sys-dependant large stack optimizations
+LARGE_STACK_DESC= Enable sys-dependent large stack optimizations
OPTIONS_SUB= yes
@@ -54,8 +51,8 @@ LARGE_STACK_CONFIGURE_ENABLE= large-stack
USE_GCC= yes
.endif
-MAJORVER= 2_2
-VER= 23
+MAJORVER= 2_3
+VER= 24
PLIST_SUB+= MAJORVER=${MAJORVER}
PLIST_SUB+= VER=${VER}
@@ -81,13 +78,23 @@ pre-configure:
exit 1; }
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \
${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER}
+post-install-EXAMPLES-on:
+ ${MV} \
+ ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}/examples/ ${STAGEDIR}${EXAMPLESDIR}
+ @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || :
+
+post-install-EXAMPLES-off:
+ ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}/examples/
+
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
- @${MKDIR} ${STAGEDIR}${DOCSDIR2}
- ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+ ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-off:
+ @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || :
.include <bsd.port.post.mk>
diff --git a/graphics/OpenEXR/distinfo b/graphics/openexr/distinfo
index efe479cfde4f..45397e165495 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1512081871
-SHA256 (openexr-2.2.1.tar.gz) = 8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd
-SIZE (openexr-2.2.1.tar.gz) = 18176639
+TIMESTAMP = 1536500711
+SHA256 (openexr-2.3.0.tar.gz) = fd6cb3a87f8c1a233be17b94c74799e6241d50fc5efd4df75c7a4b9cf4e25ea6
+SIZE (openexr-2.3.0.tar.gz) = 18412067
SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a
SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768
diff --git a/graphics/OpenEXR/files/patch-IlmImfTest__main.cpp b/graphics/openexr/files/patch-IlmImfTest__main.cpp
index b22b303fa5d4..b22b303fa5d4 100644
--- a/graphics/OpenEXR/files/patch-IlmImfTest__main.cpp
+++ b/graphics/openexr/files/patch-IlmImfTest__main.cpp
diff --git a/graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp b/graphics/openexr/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp
index 63cd46ad9297..63cd46ad9297 100644
--- a/graphics/OpenEXR/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp
+++ b/graphics/openexr/files/patch-IlmImfTest_testOptimizedInterleavePatterns.cpp
diff --git a/graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp b/graphics/openexr/files/patch-IlmImfUtilTest_main.cpp
index 1b3147705c70..1b3147705c70 100644
--- a/graphics/OpenEXR/files/patch-IlmImfUtilTest_main.cpp
+++ b/graphics/openexr/files/patch-IlmImfUtilTest_main.cpp
diff --git a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp b/graphics/openexr/files/patch-IlmImf__ImfSystemSpecific.cpp
index 74e5054a3175..74e5054a3175 100644
--- a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
+++ b/graphics/openexr/files/patch-IlmImf__ImfSystemSpecific.cpp
diff --git a/graphics/OpenEXR/files/patch-exrenvmap__main.cpp b/graphics/openexr/files/patch-exrenvmap__main.cpp
index 77cab6dfc684..77cab6dfc684 100644
--- a/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
+++ b/graphics/openexr/files/patch-exrenvmap__main.cpp
diff --git a/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp b/graphics/openexr/files/patch-exrmaketiled__main.cpp
index 7b83c1a5a5a1..7b83c1a5a5a1 100644
--- a/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
+++ b/graphics/openexr/files/patch-exrmaketiled__main.cpp
diff --git a/graphics/OpenEXR/pkg-descr b/graphics/openexr/pkg-descr
index 15159b668a58..15159b668a58 100644
--- a/graphics/OpenEXR/pkg-descr
+++ b/graphics/openexr/pkg-descr
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/openexr/pkg-plist
index a61636a1cf0e..6e803923d848 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/openexr/pkg-plist
@@ -74,6 +74,7 @@ include/OpenEXR/ImfRgba.h
include/OpenEXR/ImfRgbaFile.h
include/OpenEXR/ImfRgbaYca.h
include/OpenEXR/ImfStandardAttributes.h
+include/OpenEXR/ImfStdIO.h
include/OpenEXR/ImfStringAttribute.h
include/OpenEXR/ImfStringVectorAttribute.h
include/OpenEXR/ImfTestFile.h
diff --git a/graphics/openfx-io/Makefile b/graphics/openfx-io/Makefile
index a08cc631e606..2c9fdea91dfd 100644
--- a/graphics/openfx-io/Makefile
+++ b/graphics/openfx-io/Makefile
@@ -2,7 +2,7 @@
PORTNAME= openfx-io
PORTVERSION= 2.3.14
-PORTREVISION= 2
+PORTREVISION= 3
DISTVERSIONPREFIX= Natron-
CATEGORIES= graphics
@@ -15,7 +15,7 @@ ONLY_FOR_ARCHS= amd64
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libOpenColorIO.so:graphics/opencolorio \
- libIlmImfUtil.so:graphics/OpenEXR \
+ libIlmImfUtil.so:graphics/openexr \
libOpenImageIO.so:graphics/openimageio \
libavformat.so:multimedia/ffmpeg \
libraw.so:graphics/libraw \
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 7865719b81e1..a9f19e5a1851 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -4,7 +4,7 @@
PORTNAME= openimageio
PORTVERSION= 1.7.17
DISTVERSIONPREFIX= Release-
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libImath.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libpng.so:graphics/png \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp \
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 8b74313cf907..4c077e8bbfe5 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -4,7 +4,7 @@
PORTNAME= openshadinglanguage
PORTVERSION= 1.8.10
DISTVERSIONPREFIX= Release-
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics devel
MAINTAINER= FreeBSD@Shaneware.biz
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= llvm-config40:devel/llvm40
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libImath.so:graphics/ilmbase \
libOpenImageIO.so:graphics/openimageio
RUN_DEPENDS= llvm-config40:devel/llvm40
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 9e68625b0fae..63199a5c5bb6 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/distfiles/
@@ -91,7 +91,7 @@ LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52"
NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools
NVTT_VARS= FORCE_REQUIRE+=NVTT
NVTT_VARS_OFF= FORCE_IGNORE+=NVTT
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 0f7d258630a4..a291b271f970 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -4,7 +4,7 @@
PORTNAME= osg
PORTVERSION= 3.4.1
DISTVERSIONPREFIX= OpenSceneGraph-
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= amdmi3@FreeBSD.org
@@ -92,7 +92,7 @@ LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52"
NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools
NVTT_VARS= FORCE_REQUIRE+=NVTT
NVTT_VARS_OFF= FORCE_IGNORE+=NVTT
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 1e01bc0ff2eb..d88d31c388f7 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pfstools
DISTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF
@@ -52,8 +52,8 @@ TIFF_CMAKE_BOOL= WITH_TIFF
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
OPENEXR_CMAKE_BOOL= WITH_OpenEXR
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libIex-2_2.so:graphics/ilmbase
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
+ libIex.so:graphics/ilmbase
IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick
IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 5dc31213fab4..e6a20ff43d84 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pixie
PORTVERSION= 2.2.6
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
DISTNAME= Pixie-src-${PORTVERSION}
@@ -14,7 +14,7 @@ COMMENT= Photorealistic renderer with Pixar's RenderMan-like interface
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libtiff.so:graphics/tiff \
libfltk_gl.so:x11-toolkits/fltk
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 16fcd7209034..4f903e6e9278 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -3,7 +3,7 @@
PORTNAME= povray
DISTVERSIONPREFIX= v
DISTVERSION= 3.7.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
PKGNAMESUFFIX= 37
@@ -79,9 +79,9 @@ CONFIGURE_ARGS+=--without-libtiff
.if ${PORT_OPTIONS:MOPENEXR}
.if ${PORT_OPTIONS:MSTATIC}
-BUILD_DEPENDS+= OpenEXR>=1.6:graphics/OpenEXR
+BUILD_DEPENDS+= openexr>=1.6:graphics/openexr
.else
-LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR
+LIB_DEPENDS+= libIlmImf.so:graphics/openexr
CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR
.endif
.else
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index 76feb41ceeba..03f50a2693e2 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openexr
PORTVERSION= 1.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics python
MASTER_SITES= http://excamera.com/files/ \
CHEESESHOP
@@ -13,7 +13,7 @@ DISTNAME= OpenEXR-${PORTVERSION}
MAINTAINER= jamesb-bsd@excamera.com
COMMENT= Python module for ILM's OpenEXR image format and library
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+LIB_DEPENDS= libIlmImf.so:graphics/openexr
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index 4c3700305db9..bc11e6490d1b 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simpleviewer
PORTVERSION= 2.92
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/andreyu/simple-viewer-gl/get/
DISTNAME= v${PORTVERSION} # version tag, thus no embedded ${PORTNAME}
@@ -14,7 +14,7 @@ COMMENT= Small and simple OpenGL image viewer with transparency support
LICENSE= GPLv2
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
+LIB_DEPENDS= libIlmImf.so:graphics/openexr \
libImlib2.so:graphics/imlib2 \
libexif.so:graphics/libexif \
libfreetype.so:print/freetype2 \
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 4a00587964ac..8c15a9eb146c 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= synfigstudio
PORTVERSION= 1.2.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics multimedia
MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source
@@ -14,7 +14,7 @@ LICENSE= GPLv2+
BUILD_DEPENDS= etl>=0.04.19_1:devel/etl
LIB_DEPENDS= libHalf.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libMagick++-6.so:graphics/ImageMagick \
libfftw3.so:math/fftw3 \
libfontconfig.so:x11-fonts/fontconfig \
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 91777045535e..b6f9cc899c7d 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vigra
DISTVERSION= 1.11.0
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= graphics
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -40,7 +40,7 @@ HDF5_CMAKE_BOOL= WITH_HDF5
HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5
OPENEXR_CMAKE_BOOL= WITH_OPENEXR
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+)
NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index b0656ba7e6a9..076d6d3a8a64 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vips
PORTVERSION= 8.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= https://github.com/${GH_ACCOUNT}/libvips/releases/download/v${PORTVERSION}/
@@ -17,7 +17,7 @@ RUN_DEPENDS= bash:shells/bash
LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
liborc-0.4.so:devel/orc \
libGraphicsMagick.so:graphics/GraphicsMagick \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
liblcms2.so:graphics/lcms2 \
libexif.so:graphics/libexif \
libpng.so:graphics/png \
@@ -30,7 +30,7 @@ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
libfreetype.so:print/freetype2 \
libgif.so:graphics/giflib \
libpoppler-glib.so:graphics/poppler-glib \
- libImath-2_2.so:graphics/ilmbase \
+ libImath.so:graphics/ilmbase \
libhdf5.so:science/hdf5 \
libexpat.so:textproc/expat2
diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile
index 06338a4395ab..334ec4e398ef 100644
--- a/graphics/yafaray/Makefile
+++ b/graphics/yafaray/Makefile
@@ -4,7 +4,7 @@
PORTNAME= yafaray
DISTVERSIONPREFIX= v
DISTVERSION= 3.0-5
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= -g3a98966
CATEGORIES= graphics
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_EASON= assembly is only for amd64 and i386, but it breaks on i386
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libfreetype.so:print/freetype2 \
libHalf.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libopencv_photo.so:graphics/opencv \
libopencv_core.so:graphics/opencv-core \
libpng16.so:graphics/png \
diff --git a/multimedia/cinelerra-gg/Makefile b/multimedia/cinelerra-gg/Makefile
index b989b74538f3..95eddd3937c4 100644
--- a/multimedia/cinelerra-gg/Makefile
+++ b/multimedia/cinelerra-gg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinelerra-gg
DISTVERSION= 5.1-20180714
DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/
@@ -28,8 +28,8 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libgif.so:graphics/giflib \
- libIex-2_2.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR \
+ libIex.so:graphics/ilmbase \
+ libIlmImf.so:graphics/openexr \
libogg.so:audio/libogg \
libopenjp2.so:graphics/openjpeg \
libopus.so:audio/opus \
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 53fabe51be9c..cf14320c2881 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -361,8 +361,8 @@ gst_opencv_PLIST_FILES= #
gst_opencv_USES= compiler:c++11-lib
# openexr
-gst_openexr_LIB_DEPENDS=libImath-2_2.so:graphics/ilmbase \
- libIlmImf.so:graphics/OpenEXR
+gst_openexr_LIB_DEPENDS=libImath.so:graphics/ilmbase \
+ libIlmImf.so:graphics/openexr
# openjpeg
gst_openjpeg_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 89c24da292b7..196b74694fc5 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gwyddion
PORTVERSION= 2.51
+PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= SF
@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libminizip.so:archivers/minizip \
libcfitsio.so:astro/cfitsio \
- libIlmImf.so:graphics/OpenEXR \
+ libIlmImf.so:graphics/openexr \
libfftw3.so:math/fftw3 \
libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
diff --git a/x11/kde-runtime-kde4/Makefile b/x11/kde-runtime-kde4/Makefile
index 77d466be7552..672590cfff2b 100644
--- a/x11/kde-runtime-kde4/Makefile
+++ b/x11/kde-runtime-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -19,7 +19,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libslp.so:net/openslp \
libssh.so:security/libssh \
libqzeitgeist.so:sysutils/qzeitgeist \
- libImath-2_2.so:graphics/ilmbase \
+ libImath.so:graphics/ilmbase \
libassuan.so:security/libassuan \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
@@ -47,7 +47,7 @@ OPTIONS_DEFINE= OPENEXR PULSEAUDIO ZEITGEIST
OPTIONS_DEFAULT= OPENEXR
OPTIONS_SUB= yes
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
PULSEAUDIO_DESC=Audio configuration via PulseAudio
diff --git a/x11/kdelibs-kde4/Makefile b/x11/kdelibs-kde4/Makefile
index f727911dc97a..8fba3927cd09 100644
--- a/x11/kdelibs-kde4/Makefile
+++ b/x11/kdelibs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -13,7 +13,7 @@ COMMENT= Base set of libraries needed by KDE programs
DEPRECATED= KDE4 is EOL upstream
EXPIRATION_DATE= 2018-12-31
-LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \
+LIB_DEPENDS= libImath.so:graphics/ilmbase \
libjasper.so:graphics/jasper \
libpcre.so:devel/pcre \
libenchant.so:textproc/enchant \
@@ -88,7 +88,7 @@ UPNP_DESC= UPnP backend for Solid (WARNING: Unstable)
UPNP_LIB_DEPENDS= libHUpnp.so:net/hupnp
UPNP_CMAKE_ON= -DHUPNP_ENABLED:BOOL=On
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
post-patch: