* Re: imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
@ 2023-03-08 14:27 ` motorto
2023-03-08 17:23 ` [PR PATCH] [Updated] " mhmdanas
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-08 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1460238107
Comment:
I can only take a look at this properly after 20th of March (when my laptop comes back from warranty).
Maybe @lemmi can give a proper review sonner than me.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
2023-03-08 14:27 ` motorto
@ 2023-03-08 17:23 ` mhmdanas
2023-03-08 21:01 ` mhmdanas
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-08 17:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 22246 bytes --]
From 2803211ab3f1ae956eb71108203cbb205d6da3ec Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:55:41 +0000
Subject: [PATCH 01/17] imath: update to 3.1.7.
---
common/shlibs | 2 +-
srcpkgs/imath/template | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..73feed6c2a25 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 2729357d7465..b7c832bec0d7 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,6 +1,6 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
+version=3.1.7
revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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
@@ -34,7 +40,7 @@ imath-python3_package() {
}
imath-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} imath-python3>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From cf46b464910bb1f220da2c1095103649796bc66f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 c0c0e9c5c7193333f610d03005d71f4814fb57e5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 67795a11ee70f02d1d4c83947fd106ce60ffaa53 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 04/17] blender: revbump for imath-3.1.7.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a3255cddbc95..4ec73e05acf5 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"
From ef4df12ad24024702ae466b010a0af6d483c436c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 05/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 <me@johnnynator.dev>"
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 e9aa5ade71d854c2e6d285ee2e4d6c5b601cb800 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 06/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 <lemmi@nerd2nerd.org>"
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 b231d8eb645ecacb337b378643bd534b6bebdb6e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 07/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 3a104074befca3532cc2b5200b06cfa210f55640 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 08/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 518b1a1922f68d88cb92eb3618ab5fe2c9aeacb2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 09/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 <lemmi@nerd2nerd.org>"
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 0c8027cd45dcf363331b27d3e2b71262146af045 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 10/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 <me@johnnynator.dev>"
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 369f51eb37ccc9f325d705ecf216fd78c2a11db2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 11/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 adf2b72090110209aafc36688bd25904f7d65eca Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 12/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 2966f0d761375fdc422fb78bdca0b3f24cdf7e2c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:19 +0000
Subject: [PATCH 13/17] opencolorio: revbump for imath-3.1.7.
---
srcpkgs/opencolorio/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 8b9505ca9ae4..344b94232dc4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,16 +1,12 @@
# 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
-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
hostmakedepends="pkg-config git python3"
makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
@@ -18,12 +14,17 @@ makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="custom:openimageio"
-homepage="http://opencolorio.org"
+homepage="https://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
make_check=no #(GPU tests): failed to open display ''
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*) ;;
+ *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
+esac
+
post_install() {
vlicense LICENSE
}
From 4c9939c8956aaa1a412a975d8049f6562861b3f5 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:19 +0000
Subject: [PATCH 14/17] openimageio: revbump for imath-3.1.7.
---
srcpkgs/openimageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index cc9d7a33984e..638116e38033 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.3.18.0
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -36,7 +36,7 @@ pre_build() {
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);"
+ -e "s;^\(target_link_libraries (OpenImageIO \);\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);"
From 334197a36f107fd9705ecb20cda23140ae72a2b7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 8f17f5a3b1a48bbb9859ebfceacaead4eb1d3ead Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 ab17ab2af1201e5addc839f2330fa2a35c2beeaa Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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..c902e70b31de 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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
2023-03-08 14:27 ` motorto
2023-03-08 17:23 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-03-08 21:01 ` mhmdanas
2023-03-09 0:50 ` lemmi
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-08 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 22245 bytes --]
From 741178474b0ee161b8e5a641a5ce9ac1d51da6dd Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:55:41 +0000
Subject: [PATCH 01/17] imath: update to 3.1.7.
---
common/shlibs | 2 +-
srcpkgs/imath/template | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..73feed6c2a25 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 2729357d7465..b7c832bec0d7 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,6 +1,6 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
+version=3.1.7
revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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
@@ -34,7 +40,7 @@ imath-python3_package() {
}
imath-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} imath-python3>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From a92dc896bda49970a2abd0dc7bd60fb2fe81c408 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 e6a6905db3ecc1d9f5e8719b0ea92ff93142f07a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 f65afd62e1da57dd5d47dd90b3031b70e4e9dc68 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 04/17] blender: revbump for imath-3.1.7.
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a3255cddbc95..4ec73e05acf5 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"
From 60640c7dc373e0b86a91070a4f11d3d160ec386e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 05/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 <me@johnnynator.dev>"
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 89a386906d0f37156cf609b994fbbfec6b81f6d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 06/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 <lemmi@nerd2nerd.org>"
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 ffa6da7f475d982bbfd31902b12550176a6b9563 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 07/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 4efd0c4da710720c7b2ec43d131de93bcfbc5c43 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 08/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 e241b36bc94753d5a9bfdd272f834d2673d779c0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 09/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 <lemmi@nerd2nerd.org>"
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 b9942fcc66b55d70f880f068f4ac262471486594 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 10/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 <me@johnnynator.dev>"
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 25635bf9d75e36f06517f2b5a068ec93594865b2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 11/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 196d6201962802fea22671312c818b3f67a0f9ae Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 12/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 c5d83a43c50ffa8665832e1275a418d9619fb5e3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:19 +0000
Subject: [PATCH 13/17] opencolorio: revbump for imath-3.1.7.
---
srcpkgs/opencolorio/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 8b9505ca9ae4..344b94232dc4 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -1,16 +1,12 @@
# 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
-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
hostmakedepends="pkg-config git python3"
makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
libfreeglut-devel expat-devel yaml-cpp-devel imath-devel
@@ -18,12 +14,17 @@ makedepends="tinyxml-devel lcms2-devel pystring-devel glew-devel
short_desc="Complete color management solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="custom:openimageio"
-homepage="http://opencolorio.org"
+homepage="https://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
checksum=6c6d153470a7dbe56136073e7abea42fa34d06edc519ffc0a159daf9f9962b0b
make_check=no #(GPU tests): failed to open display ''
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*) ;;
+ *) configure_args+=" -DOCIO_USE_SSE=OFF" ;;
+esac
+
post_install() {
vlicense LICENSE
}
From 201e68d7e772ab0b72e43520036450aec925e529 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:19 +0000
Subject: [PATCH 14/17] openimageio: revbump for imath-3.1.7.
---
srcpkgs/openimageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index cc9d7a33984e..b0040cdeeb1b 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.3.18.0
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -36,7 +36,7 @@ pre_build() {
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);"
+ -e "s;^\(target_link_libraries (OpenImageIO\);\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);"
From fbed967ecd6ee15f1d5cdb795a8876892264462c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 c317c6b09bc42c8b717d8588e5b83e9cddf65c05 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 be72f20af6f2dce3dfa6dbb2d8b0cb03ecd102a6 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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..c902e70b31de 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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (2 preceding siblings ...)
2023-03-08 21:01 ` mhmdanas
@ 2023-03-09 0:50 ` lemmi
2023-03-09 10:26 ` mhmdanas
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: lemmi @ 2023-03-09 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
New comment by lemmi on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1461095608
Comment:
I had a quick glance at it and the changes to my templates were probably overdue anyway, so thank you :)
As I'm not yet setup to do larger builds like this, I'd like someone else to run some tests.
Also it seam CI is running into timeout, I'm adding `[ci skip]` to this.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (3 preceding siblings ...)
2023-03-09 0:50 ` lemmi
@ 2023-03-09 10:26 ` mhmdanas
2023-03-14 23:02 ` [PR PATCH] [Updated] " mhmdanas
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-09 10:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 650 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1461748851
Comment:
> I had a quick glance at it and the changes to my templates were probably overdue anyway, so thank you :)
You're welcome. :)
> As I'm not yet setup to do larger builds like this, I'd like someone else to run some tests.
What kind of tests are we talking about here?
> Also it seam CI is running into timeout, I'm adding `[ci skip]` to this.
That's fair enough.
`openimageio` is failing to build on armv6l-musl in the CI because the vsed regexes need updates, so I'll try to handle that.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (4 preceding siblings ...)
2023-03-09 10:26 ` mhmdanas
@ 2023-03-14 23:02 ` mhmdanas
2023-03-14 23:06 ` mhmdanas
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-14 23:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 24960 bytes --]
From b2dcaf42d016d03e53147dfedcf7e93f731f770a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:55:41 +0000
Subject: [PATCH 01/17] imath: update to 3.1.7.
---
common/shlibs | 2 +-
srcpkgs/imath/template | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 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 2729357d7465..b7c832bec0d7 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,6 +1,6 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
+version=3.1.7
revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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
@@ -34,7 +40,7 @@ imath-python3_package() {
}
imath-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}, imath-python3>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} imath-python3>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 9341d7cca84be2474748f5a558a2e4a566cff576 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 3b7e7aea79b19303be0cde8ce47ef9c8bc622b4b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 4594d1df95265e4e021065feed9613c8ce79b3d8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 6226a0921840c9996d0e52a7f9d3cc1b1a49ea09 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 0a4800669965dde9eb56923b4157d1429487860b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 8c6d5caf3266353d407f91eef298d6a61f58851d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 1d6a18b1cc97660e5ad650e7ea23516b905b1cf9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 5e5b7611fe9a1eacc3fef03220e22958fc825ec6 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 2bfbeff67a1ce0ea3cb245481296d715bcf44aef Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 fcf75c8adfe72573a22a471f9d06cfd24708aac9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 db6f8ade1654b690adc65bd632f216c50e6310aa Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 93ac2addc6f2f1607271d26046964b270413ff99 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 e7e14795549990235a7170d5357be95234a47a07 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 786ee90bd83660c1d182cbb928f7f2283344e159 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 4331749c1423b90c9954183324884f2f0cd1f1f0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 64b9e70811872fed560a750fd96900bc4738fde9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (5 preceding siblings ...)
2023-03-14 23:02 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-03-14 23:06 ` mhmdanas
2023-03-15 17:04 ` [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0 mhmdanas
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-14 23:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1468984700
Comment:
I'd appreciate somebody testing this PR well. I'll try to do that myself, but I'm afraid time doesn't permit me to do so (and also, my machine takes ages to build everything changed here).
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (6 preceding siblings ...)
2023-03-14 23:06 ` mhmdanas
@ 2023-03-15 17:04 ` mhmdanas
2023-03-19 12:09 ` mhmdanas
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-15 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7, openimageio: update to 2.4.9.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 24824 bytes --]
From 4c101ff2aa9ecc1dc8881ddd0f7797b79bfa8294 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 <triallax@tutanota.com>
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 <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (7 preceding siblings ...)
2023-03-15 17:04 ` [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0 mhmdanas
@ 2023-03-19 12:09 ` mhmdanas
2023-03-23 12:51 ` [PR PATCH] [Updated] " mhmdanas
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-19 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1475232757
Comment:
For what it's worth, my Void laptop's fan stopped working, and until I get around to fixing that, I'd appreciate it if someone could take over this PR (at the very minimum, removing the duplicate variable definitions in the imath template that I mistakenly pushed, and testing the updated and changed packages).
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (8 preceding siblings ...)
2023-03-19 12:09 ` mhmdanas
@ 2023-03-23 12:51 ` mhmdanas
2023-03-25 12:30 ` motorto
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-23 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7, openimageio: update to 2.4.9.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 24854 bytes --]
From c533c9f4f7f216892b7c37e3b07e98d53b7ee4c8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..30cabd69d60f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4228,7 +4228,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 892e103b02d8..6570b51fbf69 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
-revision=3
+version=3.1.7
+revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
hostmakedepends="python3-numpy"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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 +50,6 @@ imath-python3-devel_package() {
}
}
-
imath-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 8da603c0b2a674239007bf8c6f5f174a1161d422 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 5b382e2d35c63ba466d3df55d08f0ae461475c74 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 57d6245a04e7ad7f32221dd1c00b19ff49de568c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 693672d8630d18b99d5a9b5ec69d141935bbaa6a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 463d86bf472a440831a63758a597a8d9db5bbf1a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 514954ad91a3ab9093ff6547f56a2ad70935b961 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 757c9af771c65c94726a633bbb6d4f0c0eaf7a27 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 0af2cb599d84de0930f16daecf26c94f138e7aac Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <me@johnnynator.dev>"
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 a17009e78e3d4a5e52f94f63a40ea5df2b08bfcb Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 b116df28304d2e8cf97789d282c369e408911755 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 3f1b926ef667b7fe0b90e3521e886a9066d3bb99 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 7db752ea28fe64446bbd86c4ed196c27537b2e21 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 30cabd69d60f..4dd651cddce8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2243,8 +2243,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 50b2e73efbe974ce1d525d012000b04d67f8f4de Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 b02a24cf4280b5102a32b725deede56217557d98 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 952fad8633d66d6bd52d483d1448adaba9c7617a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 11bba508e237075c623e42149f4b664bdca54a3a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (9 preceding siblings ...)
2023-03-23 12:51 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-03-25 12:30 ` motorto
2023-03-25 13:08 ` mhmdanas
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-25 12:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483812439
Comment:
Had a lock at the PR and I don't have any objections ! LGTM
Currently don't have a quick way to do large builds as this one, (have a dual core here) but I will leave overnight [xxbuild](https://github.com/Piraty/xxtools/blob/master/xxbuild) running.
@mhmdanas could you please test for some archs as well ?
I can have the cross-builds ` aarch64-musl aarch64 armv7l-musl armv7l armv6l-musl armv6l` and you do the rest `x86_64 x86_64-musl i686` ?
```
$ XXBUILD_ARCHS="aarch64 x86_64-musl i686" xxbuild -Q
```
Finally got a working laptop !
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (10 preceding siblings ...)
2023-03-25 12:30 ` motorto
@ 2023-03-25 13:08 ` mhmdanas
2023-03-25 13:39 ` motorto
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-25 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483819936
Comment:
> I can have the cross-builds aarch64-musl aarch64 armv7l-musl armv7l armv6l-musl armv6l and you do the rest x86_64 x86_64-musl i686 ?
Sure. For what it's worth, my laptop is also a dual-core (with a mere 4 GBs of RAM to boot), but I'll leave it running the builds for some time. I'll report back as soon as the builds are over.
> Finally got a working laptop !
\o/
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (11 preceding siblings ...)
2023-03-25 13:08 ` mhmdanas
@ 2023-03-25 13:39 ` motorto
2023-03-25 19:49 ` motorto
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-25 13:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [ ] aarch64 (cross)
- [ ] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [ ] i686
- [ ] x86_64
- [ ] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (12 preceding siblings ...)
2023-03-25 13:39 ` motorto
@ 2023-03-25 19:49 ` motorto
2023-03-25 19:49 ` motorto
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-25 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [ ] aarch64 (cross)
- [x] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [ ] i686
- [ ] x86_64
- [ ] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (13 preceding siblings ...)
2023-03-25 19:49 ` motorto
@ 2023-03-25 19:49 ` motorto
2023-03-26 17:15 ` motorto
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-25 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [ ] i686
- [ ] x86_64
- [ ] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (14 preceding siblings ...)
2023-03-25 19:49 ` motorto
@ 2023-03-26 17:15 ` motorto
2023-03-27 19:09 ` motorto
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-26 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [ ] i686
- [x] x86_64
- [ ] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (15 preceding siblings ...)
2023-03-26 17:15 ` motorto
@ 2023-03-27 19:09 ` motorto
2023-03-27 22:24 ` [PR PATCH] [Updated] " mhmdanas
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-27 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [ ] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (16 preceding siblings ...)
2023-03-27 19:09 ` motorto
@ 2023-03-27 22:24 ` mhmdanas
2023-03-27 22:27 ` motorto
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-27 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7, openimageio: update to 2.4.9.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 26600 bytes --]
From b4fe1d447c4708d014be1d74dd71bf1e96e738e4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..30cabd69d60f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4228,7 +4228,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 892e103b02d8..6570b51fbf69 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
-revision=3
+version=3.1.7
+revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
hostmakedepends="python3-numpy"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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 +50,6 @@ imath-python3-devel_package() {
}
}
-
imath-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From e6cfb397d0a354d9f767db599d0d9faaff304f5f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 6c62588444fe2961589965cbd3770dc405a5a708 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 daa1e596a15deeec496566dc313404d26d9922f9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 04/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 5c28b9812113b80f79c337bd45b4e45820d7ecc3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 05/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 <me@johnnynator.dev>"
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 583dfc118efa489c1e34c35414e1d46eccc17867 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 06/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 <lemmi@nerd2nerd.org>"
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 8deadd72e654218b5048e6c11c0f76665c3ae9b1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 07/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 98963aad0aed2cf44e2a73198d63b93b9ebb4ab3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 08/17] gmic: revbump for imath-3.1.7.
---
srcpkgs/gmic/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 8e3b80047f26..771f93a3cd7e 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=3.1.6
-revision=1
+revision=2
_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
create_wrksrc=yes
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
-make_build_args=NOSTRIP=yes
+make_build_args="NOSTRIP=yes"
make_use_env=yes
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
@@ -16,8 +16,8 @@ makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-dev
short_desc="GREYC's Magic for Image Computing (image processing framework)"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
license="CECILL-2.1, CECILL-C"
-homepage="http://gmic.eu/"
-distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
+homepage="https://gmic.eu/"
+distfiles="https://gmic.eu/files/source/gmic_${version}.tar.gz
https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
From 04df64e2d3533281592f3aa8cabaa3f9fff67402 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 09/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 <lemmi@nerd2nerd.org>"
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 34c8a2001eadbfb80ba25e5a3c6b1d61305365a7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 10/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 <me@johnnynator.dev>"
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 66593f043845700f5211fb095a94ae6e77fae79e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 11/17] libgdal: revbump for imath-3.1.7.
---
srcpkgs/libgdal/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 0f13822bfbe2..99c0f3299880 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
@@ -19,10 +19,9 @@ short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.gdal.org"
-changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
-subpackages="libgdal-devel libgdal-tools libgdal-python3"
python_version=3
if [ -z "$CROSS_BUILD" ]; then
@@ -67,7 +66,7 @@ libgdal-devel_package() {
libgdal-python3_package() {
depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - python3 bindings"
+ short_desc+=" - Python 3 bindings"
pkg_install() {
vmove ${py3_sitelib}
}
From dbeb158592d00572287b19d696e6622c95ce0fac Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 e2c029e95a83661972cfe7a60a26f5f639538c49 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 30cabd69d60f..4dd651cddce8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2243,8 +2243,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 de9f289535ac0ca0943cb5454995bcf79f9a9f9d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 91f32beffb7d4dba9627b76ce7ae7888a0718b63 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 b0716948c4a4f5faaf5e665706451793b68f7c06 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 f9e14ad2d6331ebd73c42ab6d0162b13b18e8bac Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (17 preceding siblings ...)
2023-03-27 22:24 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-03-27 22:27 ` motorto
2023-03-28 6:22 ` motorto
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-27 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [ ] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [x] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (18 preceding siblings ...)
2023-03-27 22:27 ` motorto
@ 2023-03-28 6:22 ` motorto
2023-03-28 19:36 ` motorto
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-28 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [x] armv6l (cross)
- [ ] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [x] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (19 preceding siblings ...)
2023-03-28 6:22 ` motorto
@ 2023-03-28 19:36 ` motorto
2023-03-28 19:36 ` motorto
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-28 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [x] armv6l (cross)
- [x] armv6l-musl (cross)
- [ ] armv7l (cross)
- [ ] armv7l-musl (cross)
- [x] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (20 preceding siblings ...)
2023-03-28 19:36 ` motorto
@ 2023-03-28 19:36 ` motorto
2023-03-29 10:35 ` motorto
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-28 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [x] armv6l (cross)
- [x] armv6l-musl (cross)
- [x] armv7l (cross)
- [ ] armv7l-musl (cross)
- [x] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (21 preceding siblings ...)
2023-03-28 19:36 ` motorto
@ 2023-03-29 10:35 ` motorto
2023-03-29 11:30 ` mhmdanas
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: motorto @ 2023-03-29 10:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1483827701
Comment:
Probably just do an arch at the time ! Lets keep track of the archs here:
- [x] aarch64 (cross)
- [x] aarch64-musl (cross)
- [x] armv6l (cross)
- [x] armv6l-musl (cross)
- [x] armv7l (cross)
- [x] armv7l-musl (cross)
- [x] i686
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (22 preceding siblings ...)
2023-03-29 10:35 ` motorto
@ 2023-03-29 11:30 ` mhmdanas
2023-04-12 22:37 ` [PR PATCH] [Updated] " mhmdanas
2023-04-12 22:53 ` [PR PATCH] [Merged]: " abenson
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-03-29 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42652#issuecomment-1488426549
Comment:
This was built on all the archs normally tested in the CI (see above comment), so this should be ready for review/merge.
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Updated] imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (23 preceding siblings ...)
2023-03-29 11:30 ` mhmdanas
@ 2023-04-12 22:37 ` mhmdanas
2023-04-12 22:53 ` [PR PATCH] [Merged]: " abenson
25 siblings, 0 replies; 27+ messages in thread
From: mhmdanas @ 2023-04-12 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages imath-3.1.7
https://github.com/void-linux/void-packages/pull/42652
imath: update to 3.1.7, openimageio: update to 2.4.9.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/42652.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.7-42652.patch --]
[-- Type: text/x-diff, Size: 26600 bytes --]
From 7676918d4f70ac88247c449cfa1c3d120a753e4c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 847f5daec09d..9f7035b62cb2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4233,7 +4233,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 892e103b02d8..6570b51fbf69 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
# Template file for 'imath'
pkgname=imath
-version=3.1.6
-revision=3
+version=3.1.7
+revision=1
build_style=cmake
configure_args="-DPYTHON=ON"
hostmakedepends="python3-numpy"
@@ -9,14 +9,20 @@ makedepends="boost-devel python3-devel python3-numpy"
short_desc="C++/Python library for 2D/3D vector/matrix/math operations"
maintainer="André Cerqueira <acerqueira021@gmail.com>"
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 +50,6 @@ imath-python3-devel_package() {
}
}
-
imath-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 562bc77fc0aa5475fcba58863d8e360aedffc4f2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <acerqueira021@gmail.com>"
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 f573d80f33c0a838c2b907a17ffff4ba15e61a76 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 1d65b7408c906da9e9e3a78c3d0462ac6815da45 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 04/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 d8888ef5ff4ec0a17149ed78b17ba32e4ac9fdb9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 05/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 <me@johnnynator.dev>"
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 cfe4a6f4bcfd013403f768c57f2b9b0cbd68fa1b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:16 +0000
Subject: [PATCH 06/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 4d2798fc23a2..a31b4304d670 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=4.2.1
-revision=3
+revision=4
# 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 <lemmi@nerd2nerd.org>"
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 022a2ac877eb5506b074bb4d154814591a153ab2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 07/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 885232ba68729f06b35ac2092fb3839c8ece9494 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 08/17] gmic: revbump for imath-3.1.7.
---
srcpkgs/gmic/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index 8e3b80047f26..771f93a3cd7e 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,13 +1,13 @@
# Template file for 'gmic'
pkgname=gmic
version=3.1.6
-revision=1
+revision=2
_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
create_wrksrc=yes
build_wrksrc="src"
build_style=gnu-makefile
build_helper=qmake
-make_build_args=NOSTRIP=yes
+make_build_args="NOSTRIP=yes"
make_use_env=yes
hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel
@@ -16,8 +16,8 @@ makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-dev
short_desc="GREYC's Magic for Image Computing (image processing framework)"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
license="CECILL-2.1, CECILL-C"
-homepage="http://gmic.eu/"
-distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz
+homepage="https://gmic.eu/"
+distfiles="https://gmic.eu/files/source/gmic_${version}.tar.gz
https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz"
checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4
257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8"
From 29af00fb80f086181b016e41abf413cff3066753 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:17 +0000
Subject: [PATCH 09/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 <lemmi@nerd2nerd.org>"
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 fde9a3d0d6f5a046bd0a21c8f3197c9dc3841c2b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 10/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 <me@johnnynator.dev>"
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 525e309b018935d7f858dbeff860f8bcc83ad70f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 7 Mar 2023 19:58:18 +0000
Subject: [PATCH 11/17] libgdal: revbump for imath-3.1.7.
---
srcpkgs/libgdal/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 0f13822bfbe2..99c0f3299880 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
@@ -19,10 +19,9 @@ short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://www.gdal.org"
-changelog="https://github.com/OSGeo/gdal/raw/v${version}/NEWS.md"
+changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md"
distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890
-subpackages="libgdal-devel libgdal-tools libgdal-python3"
python_version=3
if [ -z "$CROSS_BUILD" ]; then
@@ -67,7 +66,7 @@ libgdal-devel_package() {
libgdal-python3_package() {
depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - python3 bindings"
+ short_desc+=" - Python 3 bindings"
pkg_install() {
vmove ${py3_sitelib}
}
From 0f24d01de7c7f706cf801cb4ffbe2c0b50f41039 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <lemmi@nerd2nerd.org>"
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 888786605dbb17496c330ec0615b95b1d110faef Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 9f7035b62cb2..605a8249c8e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2248,8 +2248,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 79b92f2c6824b5d73b31d05200616dbdca55fb3d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 98434900c4101974c26db8afacd90633069a1e45 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 <orphan@voidlinux.org>"
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 6ee03f5f9260519ea480cb088c594994bda20d93 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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 b46c4915f009582588b0edf8e7f427db03a8fc5e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
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
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [PR PATCH] [Merged]: imath: update to 3.1.7, openimageio: update to 2.4.9.0.
2023-03-07 20:15 [PR PATCH] imath: update to 3.1.7 mhmdanas
` (24 preceding siblings ...)
2023-04-12 22:37 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-04-12 22:53 ` abenson
25 siblings, 0 replies; 27+ messages in thread
From: abenson @ 2023-04-12 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]
There's a merged pull request on the void-packages repository
imath: update to 3.1.7, openimageio: update to 2.4.9.0.
https://github.com/void-linux/void-packages/pull/42652
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@motorto
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
^ permalink raw reply [flat|nested] 27+ messages in thread