openexr: updated to version 2.4.1 and added a patch for FS#1788

4 files changed, 44 insertions, 61 deletions

diff --git a/openexr/.footprint b/openexr/.footprint
index a619700c1..722ca64de 100644
--- a/openexr/.footprint
+++ b/openexr/.footprint
@@ -127,7 +127,6 @@ drwxr-xr-x	root/root	usr/include/OpenEXR/
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfLineOrderAttribute.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfLut.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfMatrixAttribute.h
--rw-r--r--	root/root	usr/include/OpenEXR/ImfMisc.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfMultiPartInputFile.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfMultiPartOutputFile.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfMultiView.h
@@ -168,48 +167,6 @@ drwxr-xr-x	root/root	usr/include/OpenEXR/
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfWav.h
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfXdr.h
 -rw-r--r--	root/root	usr/include/OpenEXR/OpenEXRConfig.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyIex.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyIexExport.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyIexTypeTranslator.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImath.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathAutovectorize.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathBasicTypes.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathBox.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathBoxArrayImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathColor.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathColor3ArrayImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathColor4Array2DImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathColor4ArrayImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathDecorators.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathEuler.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathExport.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFixedArray.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFixedArray2D.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFixedMatrix.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFixedVArray.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFrustum.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathFun.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathLine.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathM44Array.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathMathExc.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathMatrix.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathOperators.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathPlane.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathQuat.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathRandom.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathShear.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathStringArray.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathStringArrayRegister.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathStringTable.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathTask.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathUtil.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec2Impl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec3ArrayImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec3Impl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec4ArrayImpl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVec4Impl.h
--rw-r--r--	root/root	usr/include/OpenEXR/PyImathVecOperators.h
 -rw-r--r--	root/root	usr/include/OpenEXR/half.h
 -rw-r--r--	root/root	usr/include/OpenEXR/halfExport.h
 -rw-r--r--	root/root	usr/include/OpenEXR/halfFunction.h
@@ -227,36 +184,31 @@ drwxr-xr-x	root/root	usr/lib/cmake/OpenEXR/
 lrwxrwxrwx	root/root	usr/lib/libHalf-2_4.so -> libHalf-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libHalf-2_4.so.24 -> libHalf-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libHalf-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libHalf.so -> libHalf-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libIex-2_4.so -> libIex-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libIex-2_4.so.24 -> libIex-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libIex-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libIex.so -> libIex-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libIexMath-2_4.so -> libIexMath-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libIexMath-2_4.so.24 -> libIexMath-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libIexMath-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libIexMath.so -> libIexMath-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libIlmImf-2_4.so -> libIlmImf-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libIlmImf-2_4.so.24 -> libIlmImf-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmImf-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImf.so -> libIlmImf-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil-2_4.so -> libIlmImfUtil-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil-2_4.so.24 -> libIlmImfUtil-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmImfUtil-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil.so -> libIlmImfUtil-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libIlmThread-2_4.so -> libIlmThread-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libIlmThread-2_4.so.24 -> libIlmThread-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmThread-2_4.so.24.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmThread.so -> libIlmThread-2_4.so
 lrwxrwxrwx	root/root	usr/lib/libImath-2_4.so -> libImath-2_4.so.24
 lrwxrwxrwx	root/root	usr/lib/libImath-2_4.so.24 -> libImath-2_4.so.24.0.0
 -rwxr-xr-x	root/root	usr/lib/libImath-2_4.so.24.0.0
-lrwxrwxrwx	root/root	usr/lib/libPyIex_Python2_7-2_4.so -> libPyIex_Python2_7-2_4.so.24
-lrwxrwxrwx	root/root	usr/lib/libPyIex_Python2_7-2_4.so.24 -> libPyIex_Python2_7-2_4.so.24.0.2
--rwxr-xr-x	root/root	usr/lib/libPyIex_Python2_7-2_4.so.24.0.2
-lrwxrwxrwx	root/root	usr/lib/libPyIex_Python3_7-2_4.so -> libPyIex_Python3_7-2_4.so.24
-lrwxrwxrwx	root/root	usr/lib/libPyIex_Python3_7-2_4.so.24 -> libPyIex_Python3_7-2_4.so.24.0.2
--rwxr-xr-x	root/root	usr/lib/libPyIex_Python3_7-2_4.so.24.0.2
-lrwxrwxrwx	root/root	usr/lib/libPyImath_Python2_7-2_4.so -> libPyImath_Python2_7-2_4.so.24
-lrwxrwxrwx	root/root	usr/lib/libPyImath_Python2_7-2_4.so.24 -> libPyImath_Python2_7-2_4.so.24.0.2
--rwxr-xr-x	root/root	usr/lib/libPyImath_Python2_7-2_4.so.24.0.2
-lrwxrwxrwx	root/root	usr/lib/libPyImath_Python3_7-2_4.so -> libPyImath_Python3_7-2_4.so.24
-lrwxrwxrwx	root/root	usr/lib/libPyImath_Python3_7-2_4.so.24 -> libPyImath_Python3_7-2_4.so.24.0.2
--rwxr-xr-x	root/root	usr/lib/libPyImath_Python3_7-2_4.so.24.0.2
+lrwxrwxrwx	root/root	usr/lib/libImath.so -> libImath-2_4.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/IlmBase.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/OpenEXR.pc
diff --git a/openexr/.signature b/openexr/.signature
index c54802bd2..4610cf4f2 100644
--- a/openexr/.signature
+++ b/openexr/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33/DeIbvZnC/tAasgRo1WzcVoea0PEDbP6zjfXfBl9naTY1QU3Dqu3b7xhOfrEEkxuP84mGtQ+cCSX1xx5QDXAg=
-SHA256 (Pkgfile) = 464a95b6db343cb63760e1c0d989896b7d6cd00688ca6d63e9b59834518bd233
-SHA256 (.footprint) = 5bf76203a7314d57c7acf011f2b1145131316bd008652df12c721054a62747e0
-SHA256 (openexr-2.4.0.tar.gz) = 4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1
+RWSagIOpLGJF300540TIg984FwJ/X3ND8K1yHIgz4qhqd7lkhNl5hDWZllaJRwBf2mrPbpMPcjQ5bO3HV3wYFm9KNl8KY8EkfAc=
+SHA256 (Pkgfile) = 63763c6e20cecf4f6ecc7333a7a6037d73966cd34b222bce36c1448730cb25fe
+SHA256 (.footprint) = ce5ea04a423716f9cea424493d12f7ca10a40bf995a66bb1bfb361b1f03af24a
+SHA256 (openexr-2.4.1.tar.gz) = 3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
+SHA256 (openexr-pkg-config.patch) = 9cd36c1c95b026fe02a8fcdebaf7c073bb08d008261f217618f85728edcf8fdc
diff --git a/openexr/Pkgfile b/openexr/Pkgfile
index 6bbb763d1..b5efc545e 100644
--- a/openexr/Pkgfile
+++ b/openexr/Pkgfile
@@ -4,11 +4,13 @@
 # Depends on: cmake
 
 name=openexr
-version=2.4.0
+version=2.4.1
 release=1
-source=(https://github.com/AcademySoftwareFoundation/openexr/archive/v$version/$name-$version.tar.gz)
+source=(https://github.com/AcademySoftwareFoundation/openexr/archive/v$version/$name-$version.tar.gz \
+	openexr-pkg-config.patch)
 
 build() {
+    patch -d $name-$version -p1 -i $SRC/$name-pkg-config.patch
     mkdir build && cd build
     cmake ../$name-$version \
         -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/openexr/openexr-pkg-config.patch b/openexr/openexr-pkg-config.patch
new file mode 100644
index 000000000..2dab562e8
--- /dev/null
+++ b/openexr/openexr-pkg-config.patch
@@ -0,0 +1,28 @@
+diff -urN openexr-2.4.1.orig/IlmBase/config/CMakeLists.txt openexr-2.4.1/IlmBase/config/CMakeLists.txt
+--- openexr-2.4.1.orig/IlmBase/config/CMakeLists.txt	2020-02-10 23:01:19.000000000 +0000
++++ openexr-2.4.1/IlmBase/config/CMakeLists.txt	2020-03-08 15:56:36.483454378 +0000
+@@ -72,8 +72,8 @@
+   function(ilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+     set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+diff -urN openexr-2.4.1.orig/OpenEXR/config/CMakeLists.txt openexr-2.4.1/OpenEXR/config/CMakeLists.txt
+--- openexr-2.4.1.orig/OpenEXR/config/CMakeLists.txt	2020-02-10 23:01:19.000000000 +0000
++++ openexr-2.4.1/OpenEXR/config/CMakeLists.txt	2020-03-08 15:56:47.120615245 +0000
+@@ -73,8 +73,8 @@
+   function(openexr_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+     set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions