diff options
| -rw-r--r-- | libre/blender/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/openexr/PKGBUILD | 41 | ||||
| -rw-r--r-- | libre/openexr/install-odt-docs-not-pdf.patch | 69 |
3 files changed, 88 insertions, 25 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 4553c93c4..356e66270 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -111,6 +111,9 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/build" + local _openexr_ver=$(pacman -S --print-format='%v' openexr) + depends+=("openexr>=${_openexr_ver}" "openexr<$((${_openexr_ver%%.*} + 1))") + DESTDIR="${pkgdir}" ninja install install -Dm755 ../release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl" python -m compileall "${pkgdir}/usr/share/blender" diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index ac5bf7377..9fecd883c 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -3,10 +3,14 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: grizzlyuser <grizzlyuser@protonmail.com> +# parabola changes and rationale +# * removed documentation with embedded non-free fonts + + pkgname=openexr -pkgver=2.4.1 -pkgrel=2 -pkgrel+=.parabola2 +pkgver=2.5.1 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc="An high dynamic-range image file format library" pkgdesc+=", without embedded nonfree fonts in the documentation" url="https://www.openexr.com/" @@ -15,34 +19,22 @@ arch+=('i686' 'armv7h') license=('BSD3') depends=('zlib') makedepends=('cmake' 'fltk' 'python' 'boost' 'freeglut' 'python-numpy' 'chrpath') -makedepends+=('unoconv' 'libepoxy' 'ttf-croscore' 'ttf-caladea' 'ttf-carlito' 'gsfonts' 'ttf-bitstream-vera') optdepends=('fltk: for exrdisplay' 'boost-libs: python support' 'python: python support') +optdepends+=('libreoffice-still: for reading documentation') conflicts=('ilmbase') replaces=('ilmbase') -source=($pkgname-$pkgver.tar.gz::"https://github.com/AcademySoftwareFoundation/openexr/archive/v$pkgver.tar.gz" - openexr-pc-prefix.patch::"https://github.com/AcademySoftwareFoundation/openexr/commit/0b26a9de.patch") -sha256sums=('3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1' - 'f20d7588badb679828816e0ada201705b7d1cc5a4d82df3d586707a792b10950') +options=(!debug) +source=($pkgname-$pkgver.tar.gz::"https://github.com/openexr/openexr/archive/v$pkgver.tar.gz" + install-odt-docs-not-pdf.patch) +sha256sums=('11f806bf256453e39fc33bd1cf1fa576a54f144cedcdd3e6935a177e5a89d02e' + 'fd0cc640265605b6a25db3dd901641be3adebfa2b748e6b559cffcba1e5ceb94') 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 - rm -v OpenEXR_Viewers/doc/OpenEXRViewers.pdf - - # convert source documentation to pdf format and clean source code - pushd OpenEXR/doc - unoconv -v -f pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} - popd - pushd OpenEXR_Viewers/doc - unoconv -v -f pdf OpenEXRViewers.odt - popd - # remove TheoryDeepPixels.pdf reference - sed -i '\|TheoryDeepPixels[.]pdf|d - ' "OpenEXR/doc/CMakeLists.txt" + # remove documentation with embedded non-free fonts + find . -name *.pdf -exec rm -v '{}' \; + patch -p1 < "$srcdir"/install-odt-docs-not-pdf.patch } build() { @@ -58,7 +50,6 @@ package() { cd build make DESTDIR="${pkgdir}" install 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" # Install missing python module _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"` diff --git a/libre/openexr/install-odt-docs-not-pdf.patch b/libre/openexr/install-odt-docs-not-pdf.patch new file mode 100644 index 000000000..d5719ac8e --- /dev/null +++ b/libre/openexr/install-odt-docs-not-pdf.patch @@ -0,0 +1,69 @@ +diff --git a/OpenEXR/doc/CMakeLists.txt b/OpenEXR/doc/CMakeLists.txt +index 58a543f..1c5339c 100644 +--- a/OpenEXR/doc/CMakeLists.txt ++++ b/OpenEXR/doc/CMakeLists.txt +@@ -3,12 +3,11 @@ + + install( + FILES +- TechnicalIntroduction.pdf +- ReadingAndWritingImageFiles.pdf +- OpenEXRFileLayout.pdf +- MultiViewOpenEXR.pdf +- InterpretingDeepPixels.pdf +- TheoryDeepPixels.pdf ++ TechnicalIntroduction.odt ++ ReadingAndWritingImageFiles.odt ++ OpenEXRFileLayout.odt ++ MultiViewOpenEXR.odt ++ InterpretingDeepPixels.docx + DESTINATION + ${CMAKE_INSTALL_DOCDIR} + ) +diff --git a/OpenEXR/doc/Makefile.am b/OpenEXR/doc/Makefile.am +index cca1ce7..cdb325a 100644 +--- a/OpenEXR/doc/Makefile.am ++++ b/OpenEXR/doc/Makefile.am +@@ -4,11 +4,10 @@ + ## + + EXTRA_DIST = \ +- ReadingAndWritingImageFiles.pdf \ +- TechnicalIntroduction.pdf \ +- OpenEXRFileLayout.pdf \ +- MultiViewOpenEXR.pdf \ +- InterpretingDeepPixels.pdf \ +- TheoryDeepPixels.pdf ++ ReadingAndWritingImageFiles.odt \ ++ TechnicalIntroduction.odt \ ++ OpenEXRFileLayout.odt \ ++ MultiViewOpenEXR.odt \ ++ InterpretingDeepPixels.docx + + doc_DATA = $(EXTRA_DIST) +diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt +index 5efa353..0f45f80 100644 +--- a/OpenEXR_Viewers/CMakeLists.txt ++++ b/OpenEXR_Viewers/CMakeLists.txt +@@ -65,7 +65,7 @@ endif() + + # Documentation + INSTALL ( FILES +- doc/OpenEXRViewers.pdf ++ doc/OpenEXRViewers.odt + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${OPENEXR_VERSION} + ) +diff --git a/OpenEXR_Viewers/doc/Makefile.am b/OpenEXR_Viewers/doc/Makefile.am +index 2df8ae8..c7645d3 100644 +--- a/OpenEXR_Viewers/doc/Makefile.am ++++ b/OpenEXR_Viewers/doc/Makefile.am +@@ -3,7 +3,7 @@ + ## Copyright Contributors to the OpenEXR Project. + ## + +-EXTRA_DIST = OpenEXRViewers.odt OpenEXRViewers.pdf ++EXTRA_DIST = OpenEXRViewers.odt + + docdir=$(datadir)/doc/OpenEXR_Viewers-@OPENEXR_VIEWERS_VERSION@ + doc_DATA = $(EXTRA_DIST) |