From dd17b66c8b0f6ce39203130fad2553e2100a061c Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Mon, 6 Apr 2020 17:12:41 -0500
Subject: openexr-2.4.1-2.parabola1: updating version

---
 libre/openexr/PKGBUILD | 63 ++++++++++++++++++--------------------------------
 1 file changed, 23 insertions(+), 40 deletions(-)

(limited to 'libre/openexr/PKGBUILD')

diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD
index 6f3434377..3831c2d48 100644
--- a/libre/openexr/PKGBUILD
+++ b/libre/openexr/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=openexr
-pkgver=2.4.0
-pkgrel=7
+pkgver=2.4.1
+pkgrel=2
 pkgrel+=.parabola1
 pkgdesc="An high dynamic-range image file format library"
 pkgdesc+=", without embedded nonfree fonts in the documentation"
@@ -15,25 +15,25 @@ license=('BSD3')
 depends=('zlib')
 makedepends=('cmake' 'fltk' 'python' 'boost' 'freeglut' 'python-numpy' 'chrpath')
 makedepends+=('unoconv' 'libepoxy')
-optdepends=('fltk: for exrdisplay' 'boost-libs: python support' 'python: python support')
+optdepends=('fltk: for exrdisplay' 'boost-libs: python support' 'python: python support') 
 conflicts=('ilmbase')
 replaces=('ilmbase')
-source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.gz")
-sha256sums=('94624fc929b5f34acbbccf8bd111ed9b5c6c4ef7112ac71862eb837f00442582')
-mksource=($pkgname-$pkgver.tar.gz::"https://github.com/openexr/openexr/archive/v$pkgver.tar.gz"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt"
-          "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR_Viewers/doc/OpenEXRViewers.odt")
-mksha256sums=('4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1'
-              '208147fafb904114e7afa5f632d583be741db765fd341e6ad21b8455a2175436'
-              '38c46075f7efe02e231d32753966ffa463f2a3c4673dd8ea71dd47560c403db0'
-              '854942160870b4c442dc249e10d8f540aa554bd793ce40576bda430f90b7f995'
-              'a4fdf678244f6c37e5ae126a9385a2e154b824b67e1746ed10bc17907c6b45ba'
-              'fab77bb2afb3d580387249807300fa26c70eaf46ca23a0036165bafee607dc4e'
-              '27467ce4cad8a84cb63b2da2d58454834eac8830c2516cbe8846f32324517a92')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/openexr/openexr/archive/v$pkgver.tar.gz"
+        openexr-pc-prefix.patch::"https://github.com/AcademySoftwareFoundation/openexr/commit/0b26a9de.patch"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt"
+        "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR_Viewers/doc/OpenEXRViewers.odt")
+sha256sums=('3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1'
+            'f20d7588badb679828816e0ada201705b7d1cc5a4d82df3d586707a792b10950'
+            '6fc748b44fc4c52680db233143b53a199988f51682b206c623b05238a6fdbcbe'
+            '38c46075f7efe02e231d32753966ffa463f2a3c4673dd8ea71dd47560c403db0'
+            '854942160870b4c442dc249e10d8f540aa554bd793ce40576bda430f90b7f995'
+            'a4fdf678244f6c37e5ae126a9385a2e154b824b67e1746ed10bc17907c6b45ba'
+            'fab77bb2afb3d580387249807300fa26c70eaf46ca23a0036165bafee607dc4e'
+            '27467ce4cad8a84cb63b2da2d58454834eac8830c2516cbe8846f32324517a92')
 noextract=(InterpretingDeepPixels.docx
            MultiViewOpenEXR.odt
            OpenEXRFileLayout.odt
@@ -41,8 +41,9 @@ noextract=(InterpretingDeepPixels.docx
            TechnicalIntroduction.odt
            OpenEXRViewers.odt)
 
-mksource() {
+prepare() {
   cd $pkgname-$pkgver
+  patch -p1 -i ../openexr-pc-prefix.patch # Fix prefix in pc file
 
   # remove documentation with embedded nonfree fonts
   rm -v OpenEXR/doc/{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf
@@ -60,22 +61,9 @@ mksource() {
   unoconv -v -f pdf OpenEXRViewers.odt
   popd
 
-  rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word}
-}
-
-prepare() {
-  cd $pkgname-$pkgver
-
   # remove TheoryDeepPixels.pdf reference
   sed -i '\|TheoryDeepPixels[.]pdf|d
          ' "OpenEXR/doc/CMakeLists.txt"
-
-# Take DESTDIR into account when creating symlinks
-  sed -e 's|chdir ${CMAKE_INSTALL_FULL_LIBDIR}|chdir \\$ENV\\{DESTDIR\\}${CMAKE_INSTALL_FULL_LIBDIR}|' \
-    -i OpenEXR/config/LibraryDefine.cmake -i IlmBase/config/LibraryDefine.cmake
-
-# Fix linking python modules to boost_python
-  sed -e 's|${libname} ${extraDeps}|${libname} ${extraDeps} Boost::${PYILMBASE_BOOST_PY3_COMPONENT}|' -i PyIlmBase/config/ModuleDefine.cmake
 }
 
 build() {
@@ -93,12 +81,7 @@ package() {
   install -D -m644 "$srcdir"/$pkgname-$pkgver/LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 "$srcdir/$pkgname-$pkgver/OpenEXR/doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR"
 
-# Fix pc include path
-  sed -e 's|=include|=${prefix}/include|g' -e 's|=lib|=${prefix}/lib|g' \
-    -i "$pkgdir"/usr/lib/pkgconfig/OpenEXR.pc -i "$pkgdir"/usr/lib/pkgconfig/IlmBase.pc
-
-# Install python modules
+# Install missing python module
   _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
-  install -Dm755 python3*/*.so -t "$pkgdir"/$_pythonpath 
-  chrpath -d "$pkgdir"/$_pythonpath/*.so # Remove insecure RPATH
+  install -Dm755 python3*/imathnumpy.so -t "$pkgdir"/$_pythonpath 
 }
-- 
cgit v1.2.3