From 8721d0817875bf1c99249427bc41360f75fee460 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 10:37:15 +0400 Subject: [PATCH 01/27] ilmbase: update to 2.5.3. --- common/shlibs | 10 ++++----- srcpkgs/ilmbase/patches/musl-_fpstate.patch | 21 ------------------- .../ilmbase/patches/pkgconfig-prefix.patch | 15 ------------- srcpkgs/ilmbase/template | 7 +++---- 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/ilmbase/patches/musl-_fpstate.patch delete mode 100644 srcpkgs/ilmbase/patches/pkgconfig-prefix.patch diff --git a/common/shlibs b/common/shlibs index 66aeee82bd1..6e2e51a9b98 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1726,11 +1726,11 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1 libtcmalloc_debug.so.4 gperftools-2.1.90_1 libprofiler.so.0 gperftools-2.1.90_1 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1 -libHalf-2_4.so.24 ilmbase-2.4.0_1 -libIex-2_4.so.24 ilmbase-2.4.0_1 -libIexMath-2_4.so.24 ilmbase-2.4.0_1 -libImath-2_4.so.24 ilmbase-2.4.0_1 -libIlmThread-2_4.so.24 ilmbase-2.4.0_1 +libHalf-2_5.so.25 ilmbase-2.5.3_1 +libIex-2_5.so.25 ilmbase-2.5.3_1 +libIexMath-2_5.so.25 ilmbase-2.5.3_1 +libImath-2_5.so.25 ilmbase-2.5.3_1 +libIlmThread-2_5.so.25 ilmbase-2.5.3_1 libIlmImf-2_4.so.24 libopenexr-2.4.0_1 libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1 diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch deleted file mode 100644 index f7e6b371ed5..00000000000 --- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- IlmBase/IexMath/IexMathFpu.cpp.orig 2019-12-01 15:42:08.143387128 +0100 -+++ IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 -@@ -281,10 +281,18 @@ - inline void - restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) - { -+#if defined(__GLIBC__) || defined(__i386__) - setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); -+#else -+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal); -+#endif - - _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs); -+#if defined(__GLIBC__) || defined(__i386__) - setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); -+#else -+ setMxcsr (kfp->mxcsr, clearExceptions); -+#endif - } - - #endif diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch deleted file mode 100644 index 4d514f926e5..00000000000 --- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- IlmBase/IlmBase.pc.in.orig 2019-09-18 03:02:06.000000000 +0200 -+++ IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100 -@@ -4,9 +4,9 @@ - ## - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix}/@exec_prefix@ -+libdir=${prefix}/@libdir@ -+includedir=${prefix}/@includedir@ - libsuffix=@LIB_SUFFIX_DASH@ - Name: IlmBase - Description: Base math and exception libraries diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template index 1dd24b5335f..43be1ac7b70 100644 --- a/srcpkgs/ilmbase/template +++ b/srcpkgs/ilmbase/template @@ -1,8 +1,7 @@ # Template file for 'ilmbase' pkgname=ilmbase -reverts="2.5.2_1" -version=2.4.2 -revision=2 +version=2.5.3 +revision=1 wrksrc="openexr-${version}" build_wrksrc=IlmBase build_style=cmake @@ -12,7 +11,7 @@ maintainer="skmpz " license="BSD-3-Clause" homepage="https://www.openexr.com/" distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9 +checksum=6a6525e6e3907715c6a55887716d7e42d09b54d2457323fcee35a0376960bebf pre_configure() { if [ "$CROSS_BUILD" ]; then From 2080e496c7c3e94adfc1d7dd9ce5cbcf80a266f2 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 10:51:29 +0400 Subject: [PATCH 02/27] openexr: update to 2.5.3. --- common/shlibs | 4 ++-- srcpkgs/openexr/patches/musl-_fpstate.patch | 21 ------------------- .../openexr/patches/pkgconfig-prefix.patch | 15 ------------- srcpkgs/openexr/template | 8 +++---- 4 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/openexr/patches/musl-_fpstate.patch delete mode 100644 srcpkgs/openexr/patches/pkgconfig-prefix.patch diff --git a/common/shlibs b/common/shlibs index 6e2e51a9b98..cf31c2237b7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1731,8 +1731,8 @@ libIex-2_5.so.25 ilmbase-2.5.3_1 libIexMath-2_5.so.25 ilmbase-2.5.3_1 libImath-2_5.so.25 ilmbase-2.5.3_1 libIlmThread-2_5.so.25 ilmbase-2.5.3_1 -libIlmImf-2_4.so.24 libopenexr-2.4.0_1 -libIlmImfUtil-2_4.so.24 libopenexr-2.4.0_1 +libIlmImf-2_5.so.25 libopenexr-2.5.3_1 +libIlmImfUtil-2_5.so.25 libopenexr-2.5.3_1 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1 libGraphicsMagick++.so.12 libgraphicsmagick-1.3.22_1 libGraphicsMagickWand.so.2 libgraphicsmagick-1.3.19_1 diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch deleted file mode 100644 index f7e6b371ed5..00000000000 --- a/srcpkgs/openexr/patches/musl-_fpstate.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- IlmBase/IexMath/IexMathFpu.cpp.orig 2019-12-01 15:42:08.143387128 +0100 -+++ IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 -@@ -281,10 +281,18 @@ - inline void - restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) - { -+#if defined(__GLIBC__) || defined(__i386__) - setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); -+#else -+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal); -+#endif - - _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs); -+#if defined(__GLIBC__) || defined(__i386__) - setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); -+#else -+ setMxcsr (kfp->mxcsr, clearExceptions); -+#endif - } - - #endif diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch deleted file mode 100644 index 2142208dbc7..00000000000 --- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200 -+++ OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100 -@@ -6,8 +6,8 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ --OpenEXR_includedir=@includedir@/OpenEXR -+exec_prefix=${prefix}/@exec_prefix@ -+libdir=${prefix}/@libdir@ -+includedir=${prefix}/@includedir@ -+OpenEXR_includedir=${prefix}/@includedir@/OpenEXR - libsuffix=@LIB_SUFFIX_DASH@ - - Name: OpenEXR diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template index 3f1b59753c1..bccfe9a1b5e 100644 --- a/srcpkgs/openexr/template +++ b/srcpkgs/openexr/template @@ -1,17 +1,17 @@ # Template file for 'openexr' pkgname=openexr -version=2.4.1 -revision=2 +version=2.5.3 +revision=1 build_style=cmake build_helper="qemu" hostmakedepends="pkg-config" makedepends="ilmbase-devel zlib-devel" short_desc="High dynamic-range (HDR) image file format" -maintainer="Orphaned " +maintainer="skmpz " license="BSD-3-Clause" homepage="https://www.openexr.com/" distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1 +checksum=6a6525e6e3907715c6a55887716d7e42d09b54d2457323fcee35a0376960bebf pre_configure() { if [ "$CROSS_BUILD" ]; then From d7a82d8759f7b2c4f157a86c7af7d899c0aa63f6 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:27 +0400 Subject: [PATCH 03/27] PrusaSlicer: revbump for ilmbase --- srcpkgs/PrusaSlicer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index aa195fe6ac8..c168a277d67 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer version=2.2.0 -revision=4 +revision=5 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu" From 5cf0fa68d4df098cb2513370c66a264d6ffd61af Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:36 +0400 Subject: [PATCH 04/27] alembic: revbump for ilmbase --- srcpkgs/alembic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template index 71fc79c0da4..0841409e0d9 100644 --- a/srcpkgs/alembic/template +++ b/srcpkgs/alembic/template @@ -1,7 +1,7 @@ # Template file for 'alembic' pkgname=alembic version=1.7.13 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="zlib-devel ilmbase-devel" From acf4c892651093d0c6fa09fb6d1afba78e809e84 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:41 +0400 Subject: [PATCH 05/27] blender: revbump for ilmbase --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index b724ef01318..01b3677ff4f 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.90.1 -revision=1 +revision=2 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" From 5917e3eb3b2569687ac6297886bdd8153c689336 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:44 +0400 Subject: [PATCH 06/27] calligra: revbump for ilmbase --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index abed8c2f348..f0875954c89 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=2 +revision=3 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From da20de3e710c59e82ec8c1765990bbc910d2836f Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:47 +0400 Subject: [PATCH 07/27] darktable: revbump for ilmbase --- srcpkgs/darktable/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 20734edd8fc..f20f1413ee7 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable version=3.2.1 -revision=1 +revision=2 # upstream only supports these archs: archs="x86_64* aarch64* ppc64le*" build_style=cmake From 94a94ee8164ad3333536b4b4b0ce73dd66bbf1a8 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:50 +0400 Subject: [PATCH 08/27] gimp: revbump for ilmbase --- srcpkgs/gimp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index aadcb7de985..43e044f1826 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,7 @@ # Template file for 'gimp' pkgname=gimp version=2.10.20 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes" From 7b1d7b2f24b1764c2ffb188db9f65820f233dff0 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:54 +0400 Subject: [PATCH 09/27] gmic: revbump for ilmbase --- srcpkgs/gmic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 6d6f4ec13ba..530abe449d7 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,7 +1,7 @@ # Template file for 'gmic' pkgname=gmic version=2.8.0 -revision=1 +revision=2 build_wrksrc="src" build_style=gnu-makefile build_helper=qmake From ee996016a44ea172b0f4c114094ac0890bd6d452 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:15:57 +0400 Subject: [PATCH 10/27] hugin: revbump for ilmbase --- srcpkgs/hugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 1c93467bc09..14c4385cdd9 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2019.2.0 -revision=3 +revision=4 wrksrc="${pkgname}-${version}" build_style=cmake pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" From 2c952e200cba93832049f8bc96ea1a68e9c27c76 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:05 +0400 Subject: [PATCH 11/27] kimageformats: revbump for ilmbase --- srcpkgs/kimageformats/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 1c96c114393..88a796d5472 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,7 +1,7 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.75.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools" From 097dd2b102519721faefdd20ba5158b5b01d7ec4 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:11 +0400 Subject: [PATCH 12/27] krita: revbump for ilmbase --- srcpkgs/krita/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 64e74dcf935..a3ffcdb31fa 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=4.4.0 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 From 56670ae3b7c52b1dac99984633cbd2fe96903f43 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:15 +0400 Subject: [PATCH 13/27] luxmark: revbump for ilmbase --- srcpkgs/luxmark/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 68a7a7ab86c..6df4f94bd6f 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -1,7 +1,7 @@ # Template file for 'luxmark' pkgname=luxmark version=3.1 -revision=9 +revision=10 build_style=cmake makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel From 5be5486ef8063a1826ef22b8ecfb05bd97498256 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:18 +0400 Subject: [PATCH 14/27] luxrays: revbump for ilmbase --- srcpkgs/luxrays/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 4ed0916d282..4c54e823747 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=18 +revision=19 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-devel" From 72996c201b5d32c620ab99bb9052a448b2182842 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:29 +0400 Subject: [PATCH 15/27] openimageio: revbump for ilmbase --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index bcab0e90b7d..e25652d2ff7 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=1.8.17 -revision=3 +revision=4 wrksrc="oiio-Release-${version}" build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 From 639e97e208ca1a755824ccb7ddac891b9b4885fc Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:36 +0400 Subject: [PATCH 16/27] openvdb: revbump for ilmbase --- srcpkgs/openvdb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index 72fde5bc637..732937b4cb3 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -1,7 +1,7 @@ # Template file for 'openvdb' pkgname=openvdb version=7.0.0 -revision=1 +revision=2 build_style=cmake configure_args="-DOPENVDB_BUILD_VDB_VIEW=1" hostmakedepends="pkg-config" From 211f4248a12036dd85e9aa4272d75553aa00dcef Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:40 +0400 Subject: [PATCH 17/27] osg: revbump for ilmbase --- srcpkgs/osg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index a35ce21a172..889d5f620ff 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=12 +revision=13 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake build_helper="qemu" From a46796ccd38dec44a8c9a6f37d5d8cd6ff4d50f2 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:16:56 +0400 Subject: [PATCH 18/27] synfig: revbump for ilmbase --- srcpkgs/synfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index a4a11942dc9..10f9570d880 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig version=1.2.2 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" From 44b90971076c4c4c348e819beb9cc558c0e10a7f Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:17:02 +0400 Subject: [PATCH 19/27] synfigstudio: revbump for ilmbase --- srcpkgs/synfigstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index a4d76569dbf..597f8dc6852 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -1,7 +1,7 @@ # Template file for 'synfigstudio' pkgname=synfigstudio version=1.2.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-update-mimedb" hostmakedepends="pkg-config intltool gettext" From 46cdbe91cbff8f0237cae35f80c40049ed83f47f Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:17:05 +0400 Subject: [PATCH 20/27] vips: revbump for ilmbase --- srcpkgs/vips/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template index dd65451ad85..73e1178ca7e 100644 --- a/srcpkgs/vips/template +++ b/srcpkgs/vips/template @@ -1,7 +1,7 @@ # Template file for 'vips' pkgname=vips version=8.10.2 -revision=1 +revision=2 build_style=gnu-configure build_helper=gir configure_args="--enable-introspection=$(vopt_if gir yes no)" From 33fa6aa1aee28dee3f6c29da27f79d963c61bbd7 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:17:23 +0400 Subject: [PATCH 21/27] kio-extras: revbump for openexr --- srcpkgs/kio-extras/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template index 89135f1eb52..1663eab4685 100644 --- a/srcpkgs/kio-extras/template +++ b/srcpkgs/kio-extras/template @@ -1,7 +1,7 @@ # Template file for 'kio-extras' pkgname=kio-extras version=20.08.1 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp" hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools From 150559712a079a9c293b4a7239283b38180dd726 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:47:24 +0400 Subject: [PATCH 22/27] opencv: revbump for openexr --- srcpkgs/opencv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 13f484f92c4..47edf50fa7c 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=3.4.10 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON From d634db81ef6d95220cef1859d0d19ec080d85625 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 11:47:26 +0400 Subject: [PATCH 23/27] opencv4: revbump for openexr --- srcpkgs/opencv4/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 5f029bff809..7df0d93ce71 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -1,7 +1,7 @@ # Template file for 'opencv4' pkgname=opencv4 version=4.3.0 -revision=4 +revision=5 wrksrc=opencv-${version} build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON From e7fbde11e89ed94357e8b71e0273b4c7e517361a Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 23:07:09 +0400 Subject: [PATCH 24/27] gmic: fix libraries names --- srcpkgs/gmic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 530abe449d7..46480ad232e 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -19,8 +19,8 @@ disable_parallel_build="yes" post_patch() { vsed -i -e "s,-I[\$](USR),-I$XBPS_CROSS_BASE/usr,g" Makefile - # Fix library names for openexr-2.4.0 - vsed -i Makefile -e "s;-lIlmImf -lHalf;-lIlmImf-2_4 -lHalf-2_4;" + # Fix library names for openexr-2.5.x + vsed -i Makefile -e "s;-lIlmImf -lHalf;-lIlmImf-2_5 -lHalf-2_5;" # Not supported on ppc but we already compile for baselines case "$XBPS_TARGET_MACHINE" in ppc*) vsed -i Makefile -e 's;-mtune=generic;;' ;; From 66b4e41015a87ae421b565e0256c4eb2383722d6 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Oct 2020 23:43:30 +0400 Subject: [PATCH 25/27] hugin: update patch --- ...nd-openexr-2_4.patch => find-openexr-2_5.patch} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename srcpkgs/hugin/patches/{find-openexr-2_4.patch => find-openexr-2_5.patch} (70%) diff --git a/srcpkgs/hugin/patches/find-openexr-2_4.patch b/srcpkgs/hugin/patches/find-openexr-2_5.patch similarity index 70% rename from srcpkgs/hugin/patches/find-openexr-2_4.patch rename to srcpkgs/hugin/patches/find-openexr-2_5.patch index de61c1830c3..1ed00e73206 100644 --- a/srcpkgs/hugin/patches/find-openexr-2_4.patch +++ b/srcpkgs/hugin/patches/find-openexr-2_5.patch @@ -1,11 +1,11 @@ ---- CMakeModules/FindOpenEXR.cmake 2018-07-23 19:34:46.000000000 +0200 -+++ CMakeModules/FindOpenEXR.cmake 2019-12-02 16:00:26.781901111 +0100 +--- CMakeModules/FindOpenEXR.cmake 2019-12-07 12:35:27.000000000 +0400 ++++ CMakeModules/FindOpenEXR.cmake 2020-10-24 23:11:27.562092322 +0400 @@ -35,7 +35,7 @@ include(FindLibraryWithDebug) find_library_with_debug(OPENEXR_HALF_LIBRARY WIN32_DEBUG_POSTFIX d - NAMES Half-2_3 Half -+ NAMES Half-2_4 Half-2_3 Half ++ NAMES Half-2_5 Half-2_4 Half-2_3 Half PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} @@ -14,7 +14,7 @@ find_library_with_debug(OPENEXR_IEX_LIBRARY WIN32_DEBUG_POSTFIX d - NAMES Iex-2_3 Iex-2_2 Iex -+ NAMES Iex-2_4 Iex-2_3 Iex-2_2 Iex ++ NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} @@ -23,7 +23,7 @@ find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY WIN32_DEBUG_POSTFIX d - NAMES IlmThread-2_3 IlmThread-2_2 IlmThread -+ NAMES IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread ++ NAMES IlmThread-2_5 IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} @@ -32,7 +32,7 @@ find_library_with_debug(OPENEXR_IMATH_LIBRARY WIN32_DEBUG_POSTFIX d - NAMES Imath-2_3 Imath-2_2 Imath -+ NAMES Imath-2_4 Imath-2_3 Imath-2_2 Imath ++ NAMES Imath-2_5 Imath-2_4 Imath-2_3 Imath-2_2 Imath PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} @@ -41,7 +41,7 @@ find_library_with_debug(OPENEXR_ILMIMF_LIBRARY WIN32_DEBUG_POSTFIX d - NAMES IlmImf-2_3 IlmImf-2_2 IlmImf -+ NAMES IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf ++ NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} From 68daa1b03c1128de9fef780b4574610415adf4e3 Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 26 Oct 2020 23:09:20 +0400 Subject: [PATCH 26/27] luxmark: remove package (replace with meta) --- srcpkgs/luxmark/INSTALL.msg | 1 + srcpkgs/luxmark/patches/openexr-2_4.patch | 11 ----------- srcpkgs/luxmark/template | 23 +++-------------------- srcpkgs/luxmark/update | 2 -- 4 files changed, 4 insertions(+), 33 deletions(-) create mode 100644 srcpkgs/luxmark/INSTALL.msg delete mode 100644 srcpkgs/luxmark/patches/openexr-2_4.patch delete mode 100644 srcpkgs/luxmark/update diff --git a/srcpkgs/luxmark/INSTALL.msg b/srcpkgs/luxmark/INSTALL.msg new file mode 100644 index 00000000000..e21c7b8cb2f --- /dev/null +++ b/srcpkgs/luxmark/INSTALL.msg @@ -0,0 +1 @@ +luxmark is no longer provided by Void Linux diff --git a/srcpkgs/luxmark/patches/openexr-2_4.patch b/srcpkgs/luxmark/patches/openexr-2_4.patch deleted file mode 100644 index 5dd88f3093e..00000000000 --- a/srcpkgs/luxmark/patches/openexr-2_4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/Packages/FindOpenEXR.cmake 2015-09-01 12:07:29.000000000 +0200 -+++ cmake/Packages/FindOpenEXR.cmake 2019-12-06 18:58:06.185329837 +0100 -@@ -68,7 +68,7 @@ - ENDFOREACH(i) - ENDIF(OPENEXR_INCLUDE_DIRS) - --SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread) -+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4) - SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs) - SET(OpenEXR_LIB_SUFFIXES_REL) - SET(OpenEXR_LIB_SUFFIXES_DBG) diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 6df4f94bd6f..4cc485b12ef 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -2,25 +2,8 @@ pkgname=luxmark version=3.1 revision=10 -build_style=cmake -makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel - libopenexr-devel MesaLib-devel ocl-icd-devel opencl2-headers boost-devel - python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp" -short_desc="OpenCL benchmark based on LuxCore" +build_style=meta +short_desc="OpenCL benchmark based on LuxCore (removed package)" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.luxrender.net/wiki/LuxMark" -distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz" -checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6 - -configure_args=" -DCMAKE_SKIP_RPATH=ON" - -post_extract() { - mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc -} - -do_install() { - vbin build/bin/luxmark - vmkdir usr/share/luxmark - vcopy scenes usr/share/luxmark -} diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update deleted file mode 100644 index 24c7a3b659e..00000000000 --- a/srcpkgs/luxmark/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags" -pattern='luxmark_v\K([\d.]+)(?=")' From c521a124faab23b263e4b102d7921bd765d2d5db Mon Sep 17 00:00:00 2001 From: skmpz Date: Mon, 26 Oct 2020 23:13:48 +0400 Subject: [PATCH 27/27] luxrays: remove package (replace with meta) [ci skip] --- srcpkgs/luxrays/INSTALL.msg | 1 + srcpkgs/luxrays/luxrays-devel.INSTALL.msg | 1 + srcpkgs/luxrays/patches/boost.patch | 11 ------- srcpkgs/luxrays/patches/openexr-2_4.patch | 11 ------- srcpkgs/luxrays/template | 38 ++--------------------- srcpkgs/luxrays/update | 2 -- 6 files changed, 5 insertions(+), 59 deletions(-) create mode 100644 srcpkgs/luxrays/INSTALL.msg create mode 100644 srcpkgs/luxrays/luxrays-devel.INSTALL.msg delete mode 100644 srcpkgs/luxrays/patches/boost.patch delete mode 100644 srcpkgs/luxrays/patches/openexr-2_4.patch delete mode 100644 srcpkgs/luxrays/update diff --git a/srcpkgs/luxrays/INSTALL.msg b/srcpkgs/luxrays/INSTALL.msg new file mode 100644 index 00000000000..f1a5dfc59cf --- /dev/null +++ b/srcpkgs/luxrays/INSTALL.msg @@ -0,0 +1 @@ +luxrays is no longer provided by Void Linux diff --git a/srcpkgs/luxrays/luxrays-devel.INSTALL.msg b/srcpkgs/luxrays/luxrays-devel.INSTALL.msg new file mode 100644 index 00000000000..eca33998a07 --- /dev/null +++ b/srcpkgs/luxrays/luxrays-devel.INSTALL.msg @@ -0,0 +1 @@ +luxrays-devel is no longer provided by Void Linux diff --git a/srcpkgs/luxrays/patches/boost.patch b/srcpkgs/luxrays/patches/boost.patch deleted file mode 100644 index dbbf94d3cd0..00000000000 --- a/srcpkgs/luxrays/patches/boost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/Dependencies.cmake 2015-08-29 23:34:01.000000000 +0200 -+++ - 2018-10-05 21:42:24.139024667 +0200 -@@ -58,7 +58,7 @@ - - set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0") - --set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python) -+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python27) - find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS}) - if (NOT Boost_FOUND) - # Try again with the other type of libs diff --git a/srcpkgs/luxrays/patches/openexr-2_4.patch b/srcpkgs/luxrays/patches/openexr-2_4.patch deleted file mode 100644 index dc59111a0f6..00000000000 --- a/srcpkgs/luxrays/patches/openexr-2_4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/Packages/FindOpenEXR.cmake -+++ cmake/Packages/FindOpenEXR.cmake -@@ -68,7 +68,7 @@ - ENDFOREACH(i) - ENDIF(OPENEXR_INCLUDE_DIRS) - --SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread) -+SET(OpenEXR_LIBRARY_MODULES Iex-2_4 IlmImf-2_4 Half-2_4 Imath-2_4 IlmThread-2_4) - SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs) - SET(OpenEXR_LIB_SUFFIXES_REL) - SET(OpenEXR_LIB_SUFFIXES_DBG) diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 4c54e823747..ee7c55ae4d7 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -2,44 +2,12 @@ pkgname=luxrays version=3.1 revision=19 -build_style=cmake -configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" -hostmakedepends="flex bison boost-devel" -makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel - boost-devel glew-devel opencl2-headers opencl-clhpp libopenexr-devel - python-devel libfreeglut-devel embree-devel" -short_desc="LuxMark renderer engine" +build_style=meta +short_desc="LuxMark renderer engine (removed package)" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="Apache-2.0" homepage="http://www.luxrender.net/wiki/LuxRays" -distfiles="https://sources.voidlinux.org/${pkgname}-${version}/luxmark_v${version}.tar.gz" -checksum=f5b67220b72ec261ad51526d5c4550e2f95130565f3aa02a92d40f56593d8064 - -post_extract() { - mv $XBPS_BUILDDIR/luxrender-luxrays* $wrksrc -} - -do_install() { - for B in build/bin/*; do - vbin $B - done - - for L in build/lib/*; do - vinstall $L 644 usr/lib - done - - vmkdir usr/include - vcopy include/* usr/include - - vmkdir usr/lib/python2.7 - mv ${DESTDIR}/usr/lib/pyluxcore.so ${DESTDIR}/usr/lib/python2.7 -} luxrays-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - } } diff --git a/srcpkgs/luxrays/update b/srcpkgs/luxrays/update deleted file mode 100644 index a32280ed6be..00000000000 --- a/srcpkgs/luxrays/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://bitbucket.org/api/1.0/repositories/luxrender/luxrays/tags" -pattern='luxmark_v\K([\d.]+)(?=")'