From 4c101ff2aa9ecc1dc8881ddd0f7797b79bfa8294 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Wed, 15 Mar 2023 16:07:37 +0000 Subject: [PATCH 01/17] imath: update to 3.1.7. --- common/shlibs | 2 +- srcpkgs/imath/template | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5cc81b9f90b2..2de46a865ba1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4227,7 +4227,7 @@ libdspy-1.so.1 d-spy-1.4.0_1 libpanel-1.so.1 libpanel-1.0.1_1 libqrtr.so.1 qrtr-ns-1.0_1 libbpf.so.1 libbpf-1.0.0_1 -libImath-3_1.so.29 imath-3.1.5_1 +libImath-3_1.so.30 imath-3.1.7_1 libIex-3_1.so.30 libopenexr-3.1.5_1 libIlmThread-3_1.so.30 libopenexr-3.1.5_1 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1 diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template index 02417c31b54f..d69f11db0890 100644 --- a/srcpkgs/imath/template +++ b/srcpkgs/imath/template @@ -2,6 +2,8 @@ pkgname=imath version=3.1.6 revision=2 +version=3.1.7 +revision=1 build_style=cmake configure_args="-DPYTHON=ON" hostmakedepends="python3-numpy" @@ -9,14 +11,20 @@ makedepends="boost-devel python3-devel python3-numpy" short_desc="C++/Python library for 2D/3D vector/matrix/math operations" maintainer="André Cerqueira " license="BSD-3-Clause" -homepage="https://www.openexr.com/" +homepage="https://imath.readthedocs.io/" changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md" -distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/${pkgname}-${version}.tar.gz" -checksum=ea5592230f5ab917bea3ceab266cf38eb4aa4a523078d46eac0f5a89c52304db +distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/imath-${version}.tar.gz" +checksum=bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=ON" +else + configure_args+=" -DBUILD_TESTING=OFF" +fi if [ "$XBPS_MACHINE" = "i686" ] then - make_check=no # Test Fails in i868 + make_check=no # Test Fails in i686 # See upstream: https://github.com/AcademySoftwareFoundation/Imath/issues/151 fi @@ -44,7 +52,6 @@ imath-python3-devel_package() { } } - imath-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 9286a03d3d74e03ebfe3b20afdaafb08e384f381 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:56:22 +0000 Subject: [PATCH 02/17] openexr: revbump for imath-3.1.7. --- srcpkgs/openexr/template | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template index 9a37d32f1254..2c2b21b043b5 100644 --- a/srcpkgs/openexr/template +++ b/srcpkgs/openexr/template @@ -1,7 +1,7 @@ # Template file for 'openexr' pkgname=openexr version=3.1.5 -revision=1 +revision=2 build_style=cmake build_helper="qemu" hostmakedepends="pkg-config" @@ -11,14 +11,19 @@ maintainer="André Cerqueira " license="BSD-3-Clause" homepage="https://www.openexr.com/" changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr/main/CHANGES.md" -distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>openexr-${version}.tar.gz" checksum=93925805c1fc4f8162b35f0ae109c4a75344e6decae5a240afdfce25f8a433ec -if [ "$XBPS_TARGET_WORDSIZE" = "32" ] -then - make_check=no # Test Fails in i868 +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=ON" +else + configure_args+=" -DBUILD_TESTING=OFF" +fi + +if [ "$XBPS_MACHINE" = "i686" ]; then + make_check=no # Test Fails in i686 # See upstream: - # https://github.com/AcademySoftwareFoundation/openexr/issues/876 + # https://github.com/AcademySoftwareFoundation/openexr/issues/1281 fi post_install() { From a2507313bdd50d1ed951b2756dd20d8cea8733e6 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:15 +0000 Subject: [PATCH 03/17] alembic: revbump for imath-3.1.7. --- srcpkgs/alembic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template index 32b92ef4a76b..7530a40491c0 100644 --- a/srcpkgs/alembic/template +++ b/srcpkgs/alembic/template @@ -1,7 +1,7 @@ # Template file for 'alembic' pkgname=alembic version=1.8.4 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="zlib-devel imath-devel" @@ -35,7 +35,7 @@ alembic-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/cmake } } From d3a5f485b3c0077022088265a5661278b4b601e8 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:16 +0000 Subject: [PATCH 04/17] calligra: revbump for imath-3.1.7. --- srcpkgs/calligra/template | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index daf927aeb06a..fa2d3a09c3dd 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=11 +revision=12 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" @@ -22,7 +22,7 @@ depends="calligra-filters calligra-libs calligra-plugins calligra-karbon short_desc="Illustration application" maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" -homepage="http://www.calligra-suite.org/" +homepage="https://www.calligra-suite.org/" distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" checksum=b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147 @@ -76,6 +76,7 @@ calligra-filters_package() { cmake -P ${wrksrc}/build/filters/cmake_install.cmake } } + calligra-libs_package() { short_desc+=" - libraries" pkg_install() { @@ -85,6 +86,7 @@ calligra-libs_package() { done } } + calligra-plugins_package() { short_desc+=" - plugins" pkg_install() { @@ -92,6 +94,7 @@ calligra-plugins_package() { cmake -P ${wrksrc}/build/plugins/cmake_install.cmake } } + calligra-karbon_package() { short_desc+=" - Create scalable vector drawings" pkg_install() { @@ -99,11 +102,13 @@ calligra-karbon_package() { cmake -P ${wrksrc}/build/karbon/cmake_install.cmake } } + calligra-kexi_package() { build_style=meta depends="kexi" short_desc+=" - Develop desktop db apps (transitional dummy package)" } + calligra-stage_package() { short_desc+=" - Write presentation documents" pkg_install() { @@ -111,11 +116,13 @@ calligra-stage_package() { cmake -P ${wrksrc}/build/stage/cmake_install.cmake } } + calligra-krita_package() { build_style=meta short_desc+=" - Edit and paint images (transitional dummy package)" depends="krita>=${version}_${revision}" } + calligra-sheets_package() { short_desc+=" - Write spreadsheet documents" pkg_install() { @@ -123,6 +130,7 @@ calligra-sheets_package() { cmake -P ${wrksrc}/build/sheets/cmake_install.cmake } } + calligra-words_package() { short_desc+=" - Word Processor" depends="calligra-plugins" @@ -131,6 +139,7 @@ calligra-words_package() { cmake -P ${wrksrc}/build/words/cmake_install.cmake } } + calligra-handbook_package() { build_style=meta short_desc+=" - Documentation (removed temporarily)" @@ -139,6 +148,7 @@ calligra-handbook_package() { # cmake -P ${wrksrc}/build/doc/calligra/cmake_install.cmake #} } + calligra-extras_package() { short_desc+=" - Extras" pkg_install() { @@ -148,6 +158,7 @@ calligra-extras_package() { cmake -P ${wrksrc}/build/data/cmake_install.cmake } } + calligra-devtools_package() { short_desc+=" - Developer tools" pkg_install() { @@ -157,6 +168,7 @@ calligra-devtools_package() { vbin build/filters/sheets/excel/sidewinder/recordsxml2cpp } } + calligra-gemini_package() { short_desc+=" - QML interface for Calligra Words and Stage" depends="qt5-quickcontrols kirigami2" From edd0f34aba7584ac8222dd8120b3336208af2ced Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:16 +0000 Subject: [PATCH 05/17] darktable: revbump for imath-3.1.7. --- srcpkgs/darktable/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index ed5e4b1b67b7..c21012cb7a1c 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable version=4.2.1 -revision=1 +revision=2 # upstream only supports these archs: archs="x86_64* aarch64* ppc64le*" build_style=cmake @@ -20,7 +20,7 @@ depends="adwaita-icon-theme" short_desc="Virtual lighttable and darkroom for photographers" maintainer="lemmi " license="GPL-3.0-or-later" -homepage="http://www.darktable.org/" +homepage="https://www.darktable.org/" changelog="https://github.com/darktable-org/darktable/releases" distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz" checksum=603a39c6074291a601f7feb16ebb453fd0c5b02a6f5d3c7ab6db612eadc97bac From a8dc11d756814563110db86e2bbe6a3d12b91271 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:17 +0000 Subject: [PATCH 06/17] Field3D: revbump for imath-3.1.7. --- srcpkgs/Field3D/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template index f8abd1333056..5e430c0d86e4 100644 --- a/srcpkgs/Field3D/template +++ b/srcpkgs/Field3D/template @@ -1,7 +1,7 @@ # Template file for 'Field3D' pkgname=Field3D version=1.7.3 -revision=5 +revision=6 build_style=cmake makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel" short_desc="Library for storing voxel data on disk and in memory" From 5df7e57ddc3f74cbc82213e01e9a034a14d28c96 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:17 +0000 Subject: [PATCH 07/17] gmic: revbump for imath-3.1.7. --- srcpkgs/gmic/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 8e3b80047f26..43c6e0672a2b 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,7 +1,7 @@ # Template file for 'gmic' pkgname=gmic version=3.1.6 -revision=1 +revision=2 _zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0 create_wrksrc=yes build_wrksrc="src" From 217f5d22227f9a51c4981a9715539dca91c19b54 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:17 +0000 Subject: [PATCH 08/17] hugin: revbump for imath-3.1.7. --- srcpkgs/hugin/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 2177b3c40d49..dc8669a63f3f 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2022.0.0 -revision=3 +revision=4 build_style=cmake build_helper=cmake-wxWidgets-gtk3 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates" @@ -14,9 +14,9 @@ depends="exiftool enblend-enfuse" short_desc="Easy to use panoramic imaging toolchain" maintainer="lemmi " license="GPL-2.0-or-later" -homepage="http://hugin.sourceforge.net/" +homepage="https://hugin.sourceforge.net/" changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/hugin/hugin/hugin-${version%.*}/hugin-${version}.tar.bz2" checksum=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7 python_version=3 From 71d51649a00cfbd34b06d2f07d99a926c36c59d4 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:18 +0000 Subject: [PATCH 09/17] kimageformats: revbump for imath-3.1.7. --- srcpkgs/kimageformats/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 3f3145d7fd8d..16b4098bff9a 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,7 +1,7 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.103.0 -revision=1 +revision=2 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools @@ -11,5 +11,10 @@ short_desc="KDE Plugins to allow QImage to support extra file formats" maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" -distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="${KDE_SITE}/frameworks/${version%.*}/kimageformats-${version}.tar.xz" checksum=dd7dc417aacc9dfe74745e4dfd9750129051c36502fa1cd18b92c4035d721e7e + +if [ "$XBPS_MACHINE" = i686 ]; then + # FIXME: some tests fail on i686. + make_check=no +fi From 1a5ac47f4d89535aeccf9cedf4398cc7d7229f43 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:18 +0000 Subject: [PATCH 10/17] krita: revbump for imath-3.1.7. --- srcpkgs/krita/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index e3bbde19a61a..deb68e921254 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=5.0.8 -revision=3 +revision=4 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 @@ -25,6 +25,7 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.xz" checksum=4c221a3c7bbbb8d3297ffe9032c8946cbd835623f22b27f08f617aaa4e496083 python_version=3 replaces="calligra-krita>=0" +# FIXME make_check=no case "$XBPS_TARGET_MACHINE" in @@ -44,7 +45,7 @@ pre_configure() { } krita-devel_package() { - depends="krita>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 37f1142e92e1e04e58d9c699694cad9e9cbd12d5 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:18 +0000 Subject: [PATCH 11/17] libgdal: revbump for imath-3.1.7. --- srcpkgs/libgdal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index 0f13822bfbe2..3f9d3afea627 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.5.3 -revision=5 +revision=6 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON From 8d3feaae76315ad082728668e02496e480353c34 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:19 +0000 Subject: [PATCH 12/17] opencolorio: revbump for imath-3.1.7. --- srcpkgs/opencolorio/template | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template index 8b9505ca9ae4..4679a10653d2 100644 --- a/srcpkgs/opencolorio/template +++ b/srcpkgs/opencolorio/template @@ -1,28 +1,30 @@ # Template file for 'opencolorio' pkgname=opencolorio version=2.1.2 -revision=1 +revision=2 build_style=cmake -configure_args="-DUSE_EXTERNAL_TINYXML=ON -DUSE_EXTERNAL_LCMS=ON - -DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE +configure_args="-DCMAKE_CONFIGURATION_TYPES=None + -DOCIO_INSTALL_EXT_PACKAGES=NONE -Dpystring_ROOT=${XBPS_CROSS_BASE}/usr - -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11" -case "$XBPS_TARGET_MACHINE" in - x86_64*) ;; - *) configure_args+=" -DOCIO_USE_SSE=OFF" ;; -esac + -Dpybind11_ROOT=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11 + -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF" hostmakedepends="pkg-config git python3" -makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel +makedepends="lcms2-devel pystring-devel glew-devel libfreeglut-devel expat-devel yaml-cpp-devel imath-devel python3-pybind11" short_desc="Complete color management solution" maintainer="lemmi " license="custom:openimageio" -homepage="http://opencolorio.org" -changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog" -distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz" +homepage="https://opencolorio.org" +changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/OpenColorIO/master/ChangeLog" +distfiles="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${version}.tar.gz" checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b -make_check=no #(GPU tests): failed to open display '' +make_check=no # A couple tests fail. + +case "$XBPS_TARGET_MACHINE" in + x86_64*) ;; + *) configure_args+=" -DOCIO_USE_SSE=OFF" ;; +esac post_install() { vlicense LICENSE From 18335a9ecfe7b146fa15c0ff8461d41d1ff1531d Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:19 +0000 Subject: [PATCH 13/17] openimageio: update to 2.4.9.0. --- common/shlibs | 4 ++-- srcpkgs/openimageio/template | 19 +++---------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2de46a865ba1..250d55977ce4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2242,8 +2242,8 @@ libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.9.3_4 libxmp.so.4 libxmp-4.3.7_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.2.3 openimageio-2.3.18.0_1 -libOpenImageIO.so.2.3 openimageio-2.3.18.0_1 +libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1 +libOpenImageIO.so.2.4 openimageio-2.4.9.0_1 libOpenColorIO.so.2.1 opencolorio-2.1.2_1 libpystring.so.1 pystring-1.1.3_1 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1 diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index cc9d7a33984e..56eeb3600eb4 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,10 +1,10 @@ # Template file for 'openimageio' pkgname=openimageio -version=2.3.18.0 +version=2.4.9.0 revision=1 build_style=cmake build_helper=qemu -configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1 +configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 -DSTOP_ON_WARNING=0 -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF -DCMAKE_CXX_STANDARD=14 -DBUILD_MISSING_DEPS=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_FMT=OFF" hostmakedepends="pkg-config git" @@ -18,7 +18,7 @@ license="BSD-3-Clause" homepage="https://sites.google.com/site/openimageio/home" changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz" -checksum=09c7fa0685fdb34f696f2e5d44c2ba2336b5ca6ad8851cb516575508fe06397a +checksum=d04c12575d63d13ed64fc037ea37da616224736213d785de9f50337f6eb5a9ed # Runs checks even for features we disabled. make_check=no @@ -31,19 +31,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -pre_build() { - local f - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - # Add libatomic to the targets - vsed -i src/libOpenImageIO/CMakeLists.txt \ - -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);" - for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do - vsed -i src/${f}/CMakeLists.txt \ - -e "s;^\(target_link_libraries .*\));\1 atomic);" - done - fi -} - post_install() { vlicense LICENSE.md LICENSE } From b96cf9fe5ff6e73efa325bac8cae08b2d7836286 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:16 +0000 Subject: [PATCH 14/17] blender: revbump for imath-3.1.7 and openimageio-2.4.9.0. --- srcpkgs/blender/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index a3255cddbc95..b0abf23224ee 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=3.4.1 -revision=1 +revision=2 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts" @@ -11,9 +11,9 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON -DWITH_OPENSUBDIV=ON -DWITH_OPENCOLLADA=ON -DWITH_SYSTEM_GLEW=ON -DWITH_OPENVDB=ON -DWITH_ALEMBIC=ON -DWITH_GHOST_X11=ON -DWITH_GHOST_WAYLAND=ON -DWITH_GHOST_LIBDECOR=ON - -DWITH_BUILDINFO=OFF -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib + -DWITH_BUILDINFO=OFF -DPYTHON_VERSION=${py3_ver} -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}' - -DPYTHON_INCLUDE_DIRS=/$py3_inc" + -DPYTHON_INCLUDE_DIRS=/${py3_inc}" hostmakedepends="pkg-config" makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel From 14a50f22135ad5d46469deb1a889c021aedd5d7c Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:19 +0000 Subject: [PATCH 15/17] synfig: revbump for imath-3.1.7. --- srcpkgs/synfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index 182dc3cd280f..5f5f5bb3f4b2 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -2,7 +2,7 @@ # Should be kept in sync with 'synfigstudio' and 'ETL' pkgname=synfig version=1.4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" @@ -12,7 +12,7 @@ depends="ImageMagick" short_desc="CLI 2D vector and timeline-based animation software" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="http://www.synfig.org/" +homepage="https://www.synfig.org/" distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz" checksum=cd9882a091433e22e484e47d7bfe542aaefd3f62bfd746d306be4ce964756f06 From 92d99e84a93c9751f044215a9e41dfc9adb7a050 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:20 +0000 Subject: [PATCH 16/17] synfigstudio: revbump for imath-3.1.7. --- srcpkgs/synfigstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index 61d50676c6e1..91349169ed2b 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -2,7 +2,7 @@ # Should be kept in sync with 'synfig' and 'ETL' pkgname=synfigstudio version=1.4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-update-mimedb" hostmakedepends="pkg-config intltool gettext synfig" From 6e10f02d7f79917b7805401496e893f62bf60333 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Tue, 7 Mar 2023 19:58:20 +0000 Subject: [PATCH 17/17] vigra: revbump for imath-3.1.7. --- srcpkgs/vigra/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index 055d5a3b7f6c..c4b82308587b 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,7 +1,7 @@ # Template file for 'vigra' pkgname=vigra version=1.11.1 -revision=8 +revision=9 build_style=cmake configure_args="-DWITH_OPENEXR=1" hostmakedepends="python3" @@ -31,7 +31,7 @@ post_install() { } vigra-doc_package() { - depends="vigra>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - documentation" pkg_install() { vmove usr/share/vigra/doc @@ -40,7 +40,7 @@ vigra-doc_package() { vigra-devel_package() { # vigra-config is python script - depends="vigra>=${version}_${revision} $makedepends python3" + depends="${sourcepkg}>=${version}_${revision} ${makedepends} python3" short_desc+=" - development files" pkg_install() { vmove usr/bin