* [PR PATCH] Android tools
@ 2025-04-17 22:09 dkwo
2025-04-17 22:21 ` [PR PATCH] [Updated] " dkwo
` (54 more replies)
0 siblings, 55 replies; 56+ messages in thread
From: dkwo @ 2025-04-17 22:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 4308 bytes --]
From f83084657a84130f8e6651d997d078b0f4c833a0 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 1/2] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From abc3126a3e306dfdff65f964aa718bfbda1f5722 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 2/2] android-tools: update to 35.0.2
---
srcpkgs/android-tools/patches/musl.patch | 11 -----------
srcpkgs/android-tools/template | 14 +++++++-------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/android-tools/patches/musl.patch
diff --git a/srcpkgs/android-tools/patches/musl.patch b/srcpkgs/android-tools/patches/musl.patch
deleted file mode 100644
index 5c9f0f91aa322a..00000000000000
--- a/srcpkgs/android-tools/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vendor/CMakeLists.sparse.txt 2022-07-13 18:44:44.000000000 +0200
-+++ - 2022-11-20 01:25:48.530247621 +0100
-@@ -5,7 +5,7 @@
- core/libsparse/sparse_crc32.cpp
- core/libsparse/sparse_err.cpp
- core/libsparse/sparse_read.cpp)
--
-+target_compile_definitions(libsparse PRIVATE SEEK_DATA=3 SEEK_HOLE=4)
- target_include_directories(libsparse PUBLIC
- core/libsparse/include libbase/include)
- target_link_libraries(libsparse PRIVATE libbase)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..3bd0135b7ea888 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,9 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
@ 2025-04-17 22:21 ` dkwo
2025-04-19 21:47 ` dkwo
` (53 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-17 22:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 3489 bytes --]
From f83084657a84130f8e6651d997d078b0f4c833a0 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 1/2] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 73e51409973690a39024d07cc00c71664e227424 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 2/2] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..3bd0135b7ea888 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,9 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
2025-04-17 22:21 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-19 21:47 ` dkwo
2025-04-19 21:57 ` dkwo
` (52 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 3564 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 1/2] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From dd93d3e0c659971fada1a2e434703a37a3f3d87f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 2/2] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..ae9d10b4cd26f2 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
2025-04-17 22:21 ` [PR PATCH] [Updated] " dkwo
2025-04-19 21:47 ` dkwo
@ 2025-04-19 21:57 ` dkwo
2025-04-19 22:17 ` dkwo
` (51 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 100098 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d093d3ea2c6ad160bea350001a451f9683b8fca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt-11.0.2
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..a0f7607b39e2ad 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
From ec47e2fc4c0d13ee7733d0871be2444dd4ad09c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 17d2fd8977e8db7cc644d0fd65fc971247eedf0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From d08ebe7c22b94b4a40314f912c89f53c250d758c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From caf09ac0f728a08cab5066268dc6aacd3e4ea6f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
...3db2b25977037c7520a8316183636a262130.patch | 221 +++++++
...2f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch | 41 ++
...030e2e2b6e1488148d3828baeb8f5911eb8d.patch | 22 +
...d101f24a409efddb2f29e8c14002c9836a85.patch | 550 ++++++++++++++++++
...7499067b9db9841175b5a2d6934dc65e4522.patch | 151 +++++
srcpkgs/cherrytree/patches/series | 5 +
6 files changed, 990 insertions(+)
create mode 100644 srcpkgs/cherrytree/patches/05233db2b25977037c7520a8316183636a262130.patch
create mode 100644 srcpkgs/cherrytree/patches/22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch
create mode 100644 srcpkgs/cherrytree/patches/76f0030e2e2b6e1488148d3828baeb8f5911eb8d.patch
create mode 100644 srcpkgs/cherrytree/patches/ccc2d101f24a409efddb2f29e8c14002c9836a85.patch
create mode 100644 srcpkgs/cherrytree/patches/fc1d7499067b9db9841175b5a2d6934dc65e4522.patch
create mode 100644 srcpkgs/cherrytree/patches/series
diff --git a/srcpkgs/cherrytree/patches/05233db2b25977037c7520a8316183636a262130.patch b/srcpkgs/cherrytree/patches/05233db2b25977037c7520a8316183636a262130.patch
new file mode 100644
index 00000000000000..31e4d5999fad07
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/05233db2b25977037c7520a8316183636a262130.patch
@@ -0,0 +1,221 @@
+From 05233db2b25977037c7520a8316183636a262130 Mon Sep 17 00:00:00 2001
+From: Giuseppe Penone <giuspen@gmail.com>
+Date: Thu, 22 Aug 2024 22:58:03 +0100
+Subject: [PATCH] fixed fmt issue on fs::path (#2548)
+
+---
+ src/ct/ct_app.cc | 2 +-
+ src/ct/ct_filesystem.cc | 20 ++++++++++----------
+ src/ct/ct_imports.cc | 2 +-
+ src/ct/ct_main_win_file.cc | 8 ++++----
+ src/ct/ct_storage_control.cc | 8 ++++----
+ src/ct/ct_storage_multifile.cc | 6 +++---
+ 6 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/ct/ct_app.cc b/src/ct/ct_app.cc
+index 788e6092..66460cd0 100644
+--- a/src/ct/ct_app.cc
++++ b/src/ct/ct_app.cc
+@@ -152,7 +152,7 @@ void CtApp::on_activate()
+ }
+ else {
+ const fs::path last_doc_path{_pCtConfig->recentDocsFilepaths.front()};
+- spdlog::info("{} Last doc not found: {}", __FUNCTION__, last_doc_path);
++ spdlog::info("{} Last doc not found: {}", __FUNCTION__, last_doc_path.string());
+ _pCtConfig->recentDocsFilepaths.move_or_push_back(last_doc_path);
+ pAppWindow->menu_set_items_recent_documents();
+ }
+diff --git a/src/ct/ct_filesystem.cc b/src/ct/ct_filesystem.cc
+index 5c5f5ea7..1b94a186 100644
+--- a/src/ct/ct_filesystem.cc
++++ b/src/ct/ct_filesystem.cc
+@@ -163,13 +163,13 @@ bool remove(const fs::path& path2rm)
+ {
+ if (fs::is_directory(path2rm)) {
+ if (g_rmdir(path2rm.c_str()) != 0) {
+- spdlog::error("fs::remove: g_rmdir failed to remove {}", path2rm);
++ spdlog::error("fs::remove: g_rmdir failed to remove {}", path2rm.string());
+ return false;
+ }
+ }
+ else if (fs::exists(path2rm)) {
+ if (::g_remove(path2rm.c_str()) != 0) {
+- spdlog::error("fs::remove: g_remove failed to remove {}", path2rm);
++ spdlog::error("fs::remove: g_remove failed to remove {}", path2rm.string());
+ return false;
+ }
+ }
+@@ -249,13 +249,13 @@ time_t getmtime(const path& p)
+ std::uintmax_t file_size(const path& p)
+ {
+ if (fs::is_directory(p)) {
+- spdlog::error("fs::file_size: path is a directory, {}", p);
++ spdlog::error("fs::file_size: path is a directory, {}", p.string());
+ return 0;
+ }
+
+ GStatBuf st;
+ if (g_stat(p.c_str(), &st) != 0) {
+- spdlog::error("fs::file_size: g_stat failed, {}", p);
++ spdlog::error("fs::file_size: g_stat failed, {}", p.string());
+ return 0;
+ }
+
+@@ -317,7 +317,7 @@ void _open_path_with_default_app(const fs::path& file_or_folder_path)
+ // Open Filepath with External App
+ void open_filepath(const fs::path& filepath, bool open_folder_if_file_not_exists, CtConfig* config)
+ {
+- spdlog::debug("fs::open_filepath {}", filepath);
++ spdlog::debug("fs::open_filepath {}", filepath.string());
+ if (config->filelinkCustomOn) {
+ std::string cmd = fmt::sprintf(config->filelinkCustomAct, filepath.string());
+ _locale_env_vars_set_for_external_cmd(true/*isPre*/);
+@@ -344,7 +344,7 @@ void open_filepath(const fs::path& filepath, bool open_folder_if_file_not_exists
+ // Open Folderpath with External App
+ void open_folderpath(const fs::path& folderpath, CtConfig* config)
+ {
+- spdlog::debug("fs::open_folderpath {}", folderpath);
++ spdlog::debug("fs::open_folderpath {}", folderpath.string());
+ if (config->folderlinkCustomOn) {
+ std::string cmd = fmt::sprintf(config->folderlinkCustomAct, folderpath.string());
+ _locale_env_vars_set_for_external_cmd(true/*isPre*/);
+@@ -361,12 +361,12 @@ void open_folderpath(const fs::path& folderpath, CtConfig* config)
+
+ path prepare_export_folder(const path& dir_place, path new_folder, bool overwrite_existing)
+ {
+- if (fs::is_directory(dir_place / new_folder))
+- {
++ const fs::path dir_place_new_folder = dir_place / new_folder;
++ if (fs::is_directory(dir_place_new_folder)) {
+ // todo:
+ if (overwrite_existing) {
+- spdlog::debug("fs::prepare_export_folder: removing dir {}", dir_place / new_folder);
+- remove_all(dir_place / new_folder);
++ spdlog::debug("fs::prepare_export_folder: removing dir {}", dir_place_new_folder.string());
++ remove_all(dir_place_new_folder);
+ }
+ else {
+ int n = 2;
+diff --git a/src/ct/ct_imports.cc b/src/ct/ct_imports.cc
+index 20e5d01d..59947ee4 100644
+--- a/src/ct/ct_imports.cc
++++ b/src/ct/ct_imports.cc
+@@ -454,7 +454,7 @@ std::unique_ptr<CtImportedNode> CtPlainTextImport::import_file(const fs::path& f
+ }
+ }
+ catch (std::exception& ex) {
+- spdlog::error("{}, what: {}, file: {}", __FUNCTION__, ex.what(), file);
++ spdlog::error("{}, what: {}, file: {}", __FUNCTION__, ex.what(), file.string());
+ }
+ return nullptr;
+ }
+diff --git a/src/ct/ct_main_win_file.cc b/src/ct/ct_main_win_file.cc
+index 52540b7f..752f97ee 100644
+--- a/src/ct/ct_main_win_file.cc
++++ b/src/ct/ct_main_win_file.cc
+@@ -194,14 +194,14 @@ bool CtMainWin::file_open(const fs::path& filepath,
+ spdlog::debug("trying {} -> {}", curr_backup_file.string(), filepath.string());
+ new_storage = CtStorageControl::load_from(this, filepath, doc_type, error_or_warning, password);
+ if (new_storage) {
+- spdlog::debug("OK recover from {}", curr_backup_file);
++ spdlog::debug("OK recover from {}", curr_backup_file.string());
+ break;
+ }
+ fs::move_file(filepath, curr_backup_file);
+ spdlog::debug("moved back {} -> {}", filepath.string(), curr_backup_file.string());
+ }
+ else {
+- spdlog::debug("?? backed up data, {} missing", curr_backup_file);
++ spdlog::debug("?? backed up data, {} missing", curr_backup_file.string());
+ if (++missing_backup > 3) break;
+ }
+ }
+@@ -445,7 +445,7 @@ void CtMainWin::mod_time_sentinel_restart()
+
+ bool CtMainWin::file_insert_plain_text(const fs::path& filepath)
+ {
+- spdlog::debug("trying to insert text file as node: {}", filepath);
++ spdlog::debug("trying to insert text file as node: {}", filepath.string());
+ try {
+ Glib::RefPtr<Gsv::Buffer> pBuffer = Gsv::Buffer::create();
+ if (CtStrUtil::file_any_encoding_load_into_source_buffer(filepath.string(), pBuffer)) {
+@@ -459,7 +459,7 @@ bool CtMainWin::file_insert_plain_text(const fs::path& filepath)
+ }
+ }
+ catch (std::exception& ex) {
+- spdlog::error("{}, what: {}, file: {}", __FUNCTION__, ex.what(), filepath);
++ spdlog::error("{}, what: {}, file: {}", __FUNCTION__, ex.what(), filepath.string());
+ }
+ return false;
+ }
+diff --git a/src/ct/ct_storage_control.cc b/src/ct/ct_storage_control.cc
+index 9a6e813a..34dd0a1b 100644
+--- a/src/ct/ct_storage_control.cc
++++ b/src/ct/ct_storage_control.cc
+@@ -443,7 +443,7 @@ Glib::RefPtr<Gsv::Buffer> CtStorageControl::get_delayed_text_buffer(const gint64
+ fs::get_doc_type_from_file_ext(filesInTmpDir.front()) == fs::get_doc_type_from_file_ext(temp_file_path) and
+ fs::move_file(filesInTmpDir.front(), temp_file_path))
+ {
+- spdlog::debug("encrypt doc renamed {} -> {}", filesInTmpDir.front().filename(), temp_file_path.filename());
++ spdlog::debug("encrypt doc renamed {} -> {}", filesInTmpDir.front().filename().string(), temp_file_path.filename().string());
+ return temp_file_path;
+ }
+ }
+@@ -476,7 +476,7 @@ Glib::RefPtr<Gsv::Buffer> CtStorageControl::get_delayed_text_buffer(const gint64
+ return false;
+ }
+ if (not fs::is_regular_file(file_to)) {
+- spdlog::debug("!! is_regular_file {}", file_to);
++ spdlog::debug("!! is_regular_file {}", file_to.string());
+ if (not tmp_prev_archive.empty()) {
+ (void)fs::move_file(tmp_prev_archive, file_to);
+ }
+@@ -628,7 +628,7 @@ void CtStorageControl::_backupEncryptThread()
+ break;
+ }
+ #if defined(DEBUG_BACKUP_ENCRYPT)
+- spdlog::debug("{} -> {}", tilda_node_dir_from, tilda_node_dir_to);
++ spdlog::debug("{} -> {}", tilda_node_dir_from.string(), tilda_node_dir_to.string());
+ #endif // DEBUG_BACKUP_ENCRYPT
+ }
+ tilda_dirpath = tilda_dirpath.string().substr(0, tilda_dirpath.string().size()-1);
+@@ -647,7 +647,7 @@ void CtStorageControl::_backupEncryptThread()
+ }
+ #if defined(DEBUG_BACKUP_ENCRYPT)
+ else {
+- spdlog::debug("{} -> {}", pBackupEncryptData->main_backup, tilda_node_dir_to);
++ spdlog::debug("{} -> {}", pBackupEncryptData->main_backup, tilda_node_dir_to.string());
+ }
+ #endif // DEBUG_BACKUP_ENCRYPT
+ }
+diff --git a/src/ct/ct_storage_multifile.cc b/src/ct/ct_storage_multifile.cc
+index ebd729e0..b7b10b4d 100644
+--- a/src/ct/ct_storage_multifile.cc
++++ b/src/ct/ct_storage_multifile.cc
+@@ -284,7 +284,7 @@ void CtStorageMultiFile::_hier_try_move_node(const fs::path& dir_path_to)
+ };
+ f_find_dir_from(_dir_path);
+ if (not dir_path_from.empty()) {
+- spdlog::debug("{} -> {}", dir_path_from, dir_path_to);
++ spdlog::debug("{} -> {}", dir_path_from.string(), dir_path_to.string());
+ fs::move_file(dir_path_from, dir_path_to);
+ }
+ }
+@@ -520,7 +520,7 @@ bool CtStorageMultiFile::populate_treestore(const fs::path& dir_path, Glib::ustr
+ const fs::path curr_backup_dir = first_backup_dir + str::repeat(CtConst::CHAR_TILDE, b).raw();
+ if (fs::is_directory(curr_backup_dir)) {
+ missing_backup = 0;
+- spdlog::debug("backed up data, {} found", curr_backup_dir);
++ spdlog::debug("backed up data, {} found", curr_backup_dir.string());
+ const fs::path backup_node_xml_path = curr_backup_dir / nodedir.filename() / NODE_XML;
+ try {
+ pParser = CtStorageXml::get_parser(backup_node_xml_path);
+@@ -541,7 +541,7 @@ bool CtStorageMultiFile::populate_treestore(const fs::path& dir_path, Glib::ustr
+ }
+ }
+ else {
+- spdlog::debug("?? backed up data, {} missing", curr_backup_dir);
++ spdlog::debug("?? backed up data, {} missing", curr_backup_dir.string());
+ if (++missing_backup > 3) break;
+ }
+ }
diff --git a/srcpkgs/cherrytree/patches/22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch b/srcpkgs/cherrytree/patches/22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch
new file mode 100644
index 00000000000000..bb4bcaebb8af15
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch
@@ -0,0 +1,41 @@
+From 22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de Mon Sep 17 00:00:00 2001
+From: Giuseppe Penone <giuspen@gmail.com>
+Date: Thu, 22 Aug 2024 22:22:46 +0100
+Subject: [PATCH] fixed fmt issue on fs::path (#2548)
+
+---
+ src/ct/ct_config.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ct/ct_config.cc b/src/ct/ct_config.cc
+index 3ebb5451..44a7ab10 100644
+--- a/src/ct/ct_config.cc
++++ b/src/ct/ct_config.cc
+@@ -69,7 +69,7 @@ void CtConfig::move_from_tmp()
+ {
+ if (not _configFilepathTmp.string().empty() and fs::exists(_configFilepathTmp)) {
+ if (not fs::move_file(_configFilepathTmp, _configFilepath)) {
+- spdlog::error("{} -> {}", _configFilepathTmp, _configFilepath);
++ spdlog::error("{} -> {}", _configFilepathTmp.string(), _configFilepath.string());
+ }
+ }
+ }
+@@ -92,15 +92,15 @@ bool CtConfig::_load_from_file()
+ _uKeyFile->load_from_file(_configFilepath.string());
+ }
+ catch (Glib::Error& error) {
+- spdlog::error("CtConfig {}: {}", _configFilepath, error.what().raw());
++ spdlog::error("CtConfig {}: {}", _configFilepath.string(), error.what().raw());
+ return false;
+ }
+ _populate_data_from_keyfile();
+ _uKeyFile.reset(nullptr);
+- spdlog::debug("{} parsed", _configFilepath);
++ spdlog::debug("{} parsed", _configFilepath.string());
+ return true;
+ }
+- spdlog::warn("{} missing", _configFilepath);
++ spdlog::warn("{} missing", _configFilepath.string());
+ return false;
+ }
+
diff --git a/srcpkgs/cherrytree/patches/76f0030e2e2b6e1488148d3828baeb8f5911eb8d.patch b/srcpkgs/cherrytree/patches/76f0030e2e2b6e1488148d3828baeb8f5911eb8d.patch
new file mode 100644
index 00000000000000..88c1030e21cce6
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/76f0030e2e2b6e1488148d3828baeb8f5911eb8d.patch
@@ -0,0 +1,22 @@
+From 76f0030e2e2b6e1488148d3828baeb8f5911eb8d Mon Sep 17 00:00:00 2001
+From: Giuseppe Penone <giuspen@gmail.com>
+Date: Wed, 21 Aug 2024 22:42:54 +0100
+Subject: [PATCH] fixed fmt issue on fs::path (#2548)
+
+---
+ src/ct/ct_actions_others.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ct/ct_actions_others.cc b/src/ct/ct_actions_others.cc
+index 91ff638e..6931d411 100644
+--- a/src/ct/ct_actions_others.cc
++++ b/src/ct/ct_actions_others.cc
+@@ -898,7 +898,7 @@ bool CtActions::_on_embfiles_sentinel_timeout()
+ for (auto& item : _embfiles_opened) {
+ const fs::path& tmp_filepath = item.second.tmp_filepath;
+ if (not fs::is_regular_file(tmp_filepath)) {
+- spdlog::debug("embdrop {}", tmp_filepath);
++ spdlog::debug("embdrop {}", tmp_filepath.string());
+ _embfiles_opened.erase(item.first);
+ break;
+ }
diff --git a/srcpkgs/cherrytree/patches/ccc2d101f24a409efddb2f29e8c14002c9836a85.patch b/srcpkgs/cherrytree/patches/ccc2d101f24a409efddb2f29e8c14002c9836a85.patch
new file mode 100644
index 00000000000000..32b2af2060e6e0
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/ccc2d101f24a409efddb2f29e8c14002c9836a85.patch
@@ -0,0 +1,550 @@
+From ccc2d101f24a409efddb2f29e8c14002c9836a85 Mon Sep 17 00:00:00 2001
+From: Giuseppe Penone <giuspen@gmail.com>
+Date: Wed, 21 Aug 2024 18:19:40 +0100
+Subject: [PATCH] removed fmt custom formatter for Glib::ustring (#2548)
+
+---
+ src/ct/ct_actions_edit.cc | 6 +++---
+ src/ct/ct_actions_find.cc | 4 ++--
+ src/ct/ct_actions_others.cc | 2 +-
+ src/ct/ct_clipboard.cc | 10 +++++-----
+ src/ct/ct_config.cc | 2 +-
+ src/ct/ct_dialogs_find.cc | 2 +-
+ src/ct/ct_export2html.cc | 10 +++++-----
+ src/ct/ct_export2pdf.cc | 10 +++++-----
+ src/ct/ct_export2txt.cc | 2 +-
+ src/ct/ct_filesystem.cc | 2 +-
+ src/ct/ct_image.cc | 2 +-
+ src/ct/ct_imports.cc | 4 ++--
+ src/ct/ct_logging.h | 13 +------------
+ src/ct/ct_main_win_buffer.cc | 4 ++--
+ src/ct/ct_main_win_events.cc | 2 +-
+ src/ct/ct_misc_utils.cc | 4 ++--
+ src/ct/ct_misc_utils.h | 2 +-
+ src/ct/ct_storage_control.cc | 6 +++---
+ src/ct/ct_storage_multifile.cc | 2 +-
+ src/ct/ct_storage_sqlite.cc | 4 ++--
+ src/ct/ct_storage_sqlite.h | 4 ++--
+ src/ct/ct_storage_xml.cc | 2 +-
+ src/ct/ct_treestore.cc | 6 +++---
+ tests/tests_encoding.cpp | 4 ++--
+ 24 files changed, 49 insertions(+), 60 deletions(-)
+
+diff --git a/src/ct/ct_actions_edit.cc b/src/ct/ct_actions_edit.cc
+index 972838431..155d935ff 100644
+--- a/src/ct/ct_actions_edit.cc
++++ b/src/ct/ct_actions_edit.cc
+@@ -93,7 +93,7 @@ void CtActions::image_insert()
+ rPixbuf = Gdk::Pixbuf::create_from_file(filename);
+ }
+ catch (Glib::Error& error) {
+- spdlog::error("{} {}", __FUNCTION__, error.what());
++ spdlog::error("{} {}", __FUNCTION__, error.what().raw());
+ }
+ if (rPixbuf)
+ _image_edit_dialog(rPixbuf, _curr_buffer()->get_insert()->get_iter(), nullptr/*pIterBound*/);
+@@ -303,7 +303,7 @@ TocEntry find_toc_entries(CtActions& actions, CtTreeIter& node, unsigned depth)
+ std::unordered_map<int, int> encountered_headers;
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = node.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name().raw()));
+ }
+ Gtk::TextIter text_iter = rTextBuffer->begin();
+
+@@ -354,7 +354,7 @@ TocEntry find_toc_entries(CtActions& actions, CtTreeIter& node, unsigned depth)
+ entry.children.emplace_back(fmt::format("node {} {}", node_id, anchor_txt), false/*is_node*/, txt, depth + 1, h_lvl);
+ }
+ catch(std::invalid_argument&) {
+- spdlog::error("Could not convert [{}] to an integer", h_level_str);
++ spdlog::error("Could not convert [{}] to an integer", h_level_str.raw());
+ }
+ }
+
+diff --git a/src/ct/ct_actions_find.cc b/src/ct/ct_actions_find.cc
+index 47a708873..d0b8cabad 100644
+--- a/src/ct/ct_actions_find.cc
++++ b/src/ct/ct_actions_find.cc
+@@ -218,7 +218,7 @@ void CtActions::find_in_multiple_nodes_ok_clicked()
+ if (_s_options.node_content) {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ct_node_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), ct_node_iter.get_node_name()), *_pCtMainWin);
++ CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), ct_node_iter.get_node_name().raw()), *_pCtMainWin);
+ break;
+ }
+ }
+@@ -440,7 +440,7 @@ CtMatchType CtActions::_parse_given_node_content(CtTreeIter node_iter,
+ if (_s_options.node_content) {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ct_node_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), ct_node_iter.get_node_name()), *_pCtMainWin);
++ CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), ct_node_iter.get_node_name().raw()), *_pCtMainWin);
+ break;
+ }
+ }
+diff --git a/src/ct/ct_actions_others.cc b/src/ct/ct_actions_others.cc
+index a7c6746eb..91ff638e4 100644
+--- a/src/ct/ct_actions_others.cc
++++ b/src/ct/ct_actions_others.cc
+@@ -575,7 +575,7 @@ void CtActions::_exec_code(const bool is_all)
+ }
+ else {
+ const int retVal = std::system(terminal_cmd.c_str());
+- if (retVal != 0) spdlog::error("system({}) returned {}", terminal_cmd, retVal);
++ if (retVal != 0) spdlog::error("system({}) returned {}", terminal_cmd.raw(), retVal);
+ }
+ }
+
+diff --git a/src/ct/ct_clipboard.cc b/src/ct/ct_clipboard.cc
+index 9c9bc3ca7..8ca0b080f 100644
+--- a/src/ct/ct_clipboard.cc
++++ b/src/ct/ct_clipboard.cc
+@@ -246,7 +246,7 @@ void CtClipboard::anchor_link_to_clipboard(CtTreeIter node, const Glib::ustring&
+ CtClipboardData* clip_data = new CtClipboardData{};
+ std::string tml = R"XML(<?xml version="1.0" encoding="UTF-8"?><root><slot><rich_text link="node {} {}">{}</rich_text></slot></root>)XML";
+ clip_data->rich_text = fmt::format(tml, node.get_node_id(), str::xml_escape(anchor_name), str::xml_escape(anchor_name));
+- clip_data->plain_text = fmt::format("{} - {} - {}", node.get_cherrytree_filepath(), CtMiscUtil::get_node_hierarchical_name(node, " / ", false/*for_filename*/).c_str(), anchor_name);
++ clip_data->plain_text = fmt::format("{} - {} - {}", node.get_cherrytree_filepath(), CtMiscUtil::get_node_hierarchical_name(node, " / ", false/*for_filename*/).c_str(), anchor_name.raw());
+
+ _set_clipboard_data({CtConst::TARGET_CTD_RICH_TEXT, CtConst::TARGET_CTD_PLAIN_TEXT}, clip_data);
+ }
+@@ -756,7 +756,7 @@ void CtClipboard::on_received_to_uri_list(const Gtk::SelectionData& selection_da
+ property_value = "webs " + element;
+ }
+ else if (str::startswith(element, "file://")) {
+- Glib::ustring file_path = element.substr(7);
++ std::string file_path = element.substr(7);
+ file_path = str::replace(file_path, "%20", CtConst::CHAR_SPACE);
+ g_autofree gchar* mimetype = g_content_type_guess(file_path.c_str(), nullptr, 0, nullptr);
+ if (mimetype and str::startswith(mimetype, "image/") and Glib::file_test(file_path, Glib::FILE_TEST_IS_REGULAR)) {
+@@ -794,7 +794,7 @@ void CtClipboard::on_received_to_uri_list(const Gtk::SelectionData& selection_da
+ _pCtMainWin->get_ct_actions()->embfile_insert_path(element);
+ }
+ else {
+- spdlog::debug("'{}' not dir or file", element);
++ spdlog::debug("'{}' not dir or file", element.raw());
+ }
+ }
+ if (not property_value.empty()) {
+@@ -883,10 +883,10 @@ void CtClipboard::_yaml_to_codebox(const Glib::ustring& yaml_text, Gtk::TextView
+ _xml_to_codebox(xml_doc.write_to_string(), pTextView);
+ }
+ catch (std::exception& e) {
+- spdlog::error("_yaml_to_codebox exception: {}\n{}", e.what(), yaml_text);
++ spdlog::error("_yaml_to_codebox exception: {}\n{}", e.what(), yaml_text.raw());
+ }
+ catch (...) {
+- spdlog::error("_yaml_to_codebox unknown exception\n{}", yaml_text);
++ spdlog::error("_yaml_to_codebox unknown exception\n{}", yaml_text.raw());
+ }
+ }
+
+diff --git a/src/ct/ct_config.cc b/src/ct/ct_config.cc
+index 2470ab82f..3ebb54512 100644
+--- a/src/ct/ct_config.cc
++++ b/src/ct/ct_config.cc
+@@ -92,7 +92,7 @@ bool CtConfig::_load_from_file()
+ _uKeyFile->load_from_file(_configFilepath.string());
+ }
+ catch (Glib::Error& error) {
+- spdlog::error("CtConfig {}: {}", _configFilepath, error.what());
++ spdlog::error("CtConfig {}: {}", _configFilepath, error.what().raw());
+ return false;
+ }
+ _populate_data_from_keyfile();
+diff --git a/src/ct/ct_dialogs_find.cc b/src/ct/ct_dialogs_find.cc
+index a4e8c4e4b..78ef6dc31 100644
+--- a/src/ct/ct_dialogs_find.cc
++++ b/src/ct/ct_dialogs_find.cc
+@@ -526,7 +526,7 @@ void CtDialogs::match_dialog(const std::string& str_find,
+ pButtonNext->set_image_position(Gtk::PositionType::POS_RIGHT);
+ CtMenuAction* pAction = pCtMainWin->get_ct_menu().find_action("toggle_show_allmatches_dlg");
+ Glib::ustring label = CtStrUtil::get_accelerator_label(pAction->get_shortcut(pCtMainWin->get_ct_config()));
+- Gtk::Button* pButtonHide = pMatchesDialog->add_button(str::format(_("Hide (Restore with '%s')"), label), Gtk::RESPONSE_CLOSE);
++ Gtk::Button* pButtonHide = pMatchesDialog->add_button(str::format(_("Hide (Restore with '%s')"), label.raw()), Gtk::RESPONSE_CLOSE);
+ pButtonHide->set_image_from_icon_name("ct_close", Gtk::ICON_SIZE_BUTTON);
+
+ rModel->load_current_page();
+diff --git a/src/ct/ct_export2html.cc b/src/ct/ct_export2html.cc
+index ea2acce2c..2e777548a 100644
+--- a/src/ct/ct_export2html.cc
++++ b/src/ct/ct_export2html.cc
+@@ -1,7 +1,7 @@
+ /*
+ * ct_export2html.cc
+ *
+- * Copyright 2009-2023
++ * Copyright 2009-2024
+ * Giuseppe Penone <giuspen@gmail.com>
+ * Evgenii Gurianov <https://github.com/txe>
+ *
+@@ -83,9 +83,9 @@ void CtExport2Html::node_export_to_html(CtTreeIter tree_iter, const CtExportOpti
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+- Glib::ustring html_text = str::format(HTML_HEADER, tree_iter.get_node_name());
++ Glib::ustring html_text = str::format(HTML_HEADER, tree_iter.get_node_name().raw());
+ if (not index.empty() and options.index_in_page) {
+ auto script = R"HTML(
+ <script type='text/javascript'>
+@@ -270,7 +270,7 @@ void CtExport2Html::nodes_all_export_to_single_html(bool all_tree, const CtExpor
+ else {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+ html_text += _html_get_from_code_buffer(rTextBuffer, -1, -1, tree_iter.get_node_syntax_highlighting());
+ }
+@@ -529,7 +529,7 @@ void CtExport2Html::_html_get_from_treestore_node(CtTreeIter tree_iter,
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+ auto widgets = tree_iter.get_anchored_widgets(sel_start, sel_end);
+ out_widgets = std::vector<CtAnchoredWidget*>(widgets.begin(), widgets.end()); // copy from list to vector
+diff --git a/src/ct/ct_export2pdf.cc b/src/ct/ct_export2pdf.cc
+index 88aafdef5..4afacb154 100644
+--- a/src/ct/ct_export2pdf.cc
++++ b/src/ct/ct_export2pdf.cc
+@@ -1,7 +1,7 @@
+ /*
+ * ct_export2pdf.cc
+ *
+- * Copyright 2009-2023
++ * Copyright 2009-2024
+ * Giuseppe Penone <giuspen@gmail.com>
+ * Evgenii Gurianov <https://github.com/txe>
+ *
+@@ -355,7 +355,7 @@ std::shared_ptr<CtPangoText> CtExport2Pango::_pango_link_url(const Glib::ustring
+ #endif /* !_WIN32 && !__APPLE__ */
+ }
+ else {
+- spdlog::debug("invalid link entry {}, text {}", link, tagged_text);
++ spdlog::debug("invalid link entry {}, text {}", link.raw(), tagged_text.raw());
+ return std::make_shared<CtPangoText>(tagged_text, CtConst::RICH_TEXT_ID, indent, pango_dir);
+ }
+
+@@ -367,7 +367,7 @@ void CtExport2Pdf::node_export_print(const fs::path& pdf_filepath, CtTreeIter tr
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+ std::vector<CtPangoObjectPtr> pango_slots;
+ if (tree_iter.get_node_is_text()) {
+@@ -409,7 +409,7 @@ void CtExport2Pdf::_nodes_all_export_print_iter(CtTreeIter tree_iter,
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+ std::vector<CtPangoObjectPtr> node_pango_slots;
+ if (tree_iter.get_node_is_text()) {
+@@ -592,7 +592,7 @@ bool CtPrint::_cairo_tag_can_apply(const Glib::ustring& tag_name, const Glib::us
+ return true;
+ }
+ }
+- spdlog::debug("{} dropped", tag_attr);
++ spdlog::debug("{} dropped", tag_attr.raw());
+ return false;
+ }
+
+diff --git a/src/ct/ct_export2txt.cc b/src/ct/ct_export2txt.cc
+index fbf4a810c..4d471a41b 100644
+--- a/src/ct/ct_export2txt.cc
++++ b/src/ct/ct_export2txt.cc
+@@ -34,7 +34,7 @@ Glib::ustring CtExport2Txt::node_export_to_txt(CtTreeIter tree_iter, fs::path fi
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), tree_iter.get_node_name().raw()));
+ }
+ Glib::ustring plain_text;
+ if (export_options.include_node_name) {
+diff --git a/src/ct/ct_filesystem.cc b/src/ct/ct_filesystem.cc
+index 821d470d9..5c5f5ea7d 100644
+--- a/src/ct/ct_filesystem.cc
++++ b/src/ct/ct_filesystem.cc
+@@ -202,7 +202,7 @@ bool copy_file(const path& from, const path& to)
+ return rFileFrom->copy(rFileTo, Gio::FILE_COPY_OVERWRITE);
+ }
+ catch (Gio::Error& error) {
+- spdlog::debug("fs::copy_file, error: {}, from: {}, to: {}", error.what(), from.string(), to.string());
++ spdlog::debug("fs::copy_file, error: {}, from: {}, to: {}", error.what().raw(), from.string(), to.string());
+ return false;
+ }
+ }
+diff --git a/src/ct/ct_image.cc b/src/ct/ct_image.cc
+index 50e807985..12944e73d 100644
+--- a/src/ct/ct_image.cc
++++ b/src/ct/ct_image.cc
+@@ -433,7 +433,7 @@ static const char* get_dvipng_bin_cmd()
+ return rPixbuf;
+ }
+ catch (Glib::Error& error) {
+- spdlog::error("{} {}", __FUNCTION__, error.what());
++ spdlog::error("{} {}", __FUNCTION__, error.what().raw());
+ }
+ // fallback
+ return pCtMainWin->get_icon_theme()->load_icon("ct_warning", 48);
+diff --git a/src/ct/ct_imports.cc b/src/ct/ct_imports.cc
+index 203ca6650..20e5d01dc 100644
+--- a/src/ct/ct_imports.cc
++++ b/src/ct/ct_imports.cc
+@@ -1,7 +1,7 @@
+ /*
+ * ct_imports.cc
+ *
+- * Copyright 2009-2023
++ * Copyright 2009-2024
+ * Giuseppe Penone <giuspen@gmail.com>
+ * Evgenii Gurianov <https://github.com/txe>
+ *
+@@ -384,7 +384,7 @@ void CtTomboyImport::_iterate_tomboy_note(xmlpp::Element* iter, std::unique_ptr<
+ _is_link_to_node = false;
+ }
+ else {
+- spdlog::debug(dom_iter->get_name());
++ spdlog::debug(dom_iter->get_name().raw());
+ _iterate_tomboy_note(dom_iter_el, node);
+ }
+ }
+diff --git a/src/ct/ct_logging.h b/src/ct/ct_logging.h
+index dfe2ef7fb..e447ba4e1 100644
+--- a/src/ct/ct_logging.h
++++ b/src/ct/ct_logging.h
+@@ -1,7 +1,7 @@
+ /*
+ * ct_logging.h
+ *
+- * Copyright 2009-2021
++ * Copyright 2009-2024
+ * Giuseppe Penone <giuspen@gmail.com>
+ * Evgenii Gurianov <https://github.com/txe>
+ *
+@@ -32,14 +32,3 @@
+ #include "spdlog/fmt/bundled/core.h"
+ #include "spdlog/fmt/bundled/printf.h"
+ #endif // not SHARED_FMT_SPDLOG
+-#include <glibmm/ustring.h>
+-
+-// ostream works badly on Win32 due to locale encoding
+-template <>
+-struct fmt::formatter<Glib::ustring>: formatter<string_view> {
+- // parse is inherited from formatter<string_view>.
+- template <typename FormatContext>
+- auto format(Glib::ustring c, FormatContext& ctx) {
+- return formatter<string_view>::format(c.c_str(), ctx);
+- }
+-};
+diff --git a/src/ct/ct_main_win_buffer.cc b/src/ct/ct_main_win_buffer.cc
+index 4d69e89d3..f04471ae5 100644
+--- a/src/ct/ct_main_win_buffer.cc
++++ b/src/ct/ct_main_win_buffer.cc
+@@ -125,7 +125,7 @@ void CtMainWin::reapply_syntax_highlighting(const char target/*'r':RichText, 'p'
+ if (node.get_node_is_rich_text()) {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = node.get_node_text_buffer();
+ if (not rTextBuffer) {
+- error = str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name());
++ error = str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name().raw());
+ return true; /* true for stop */
+ }
+ apply_syntax_highlighting(rTextBuffer, node.get_node_syntax_highlighting(), true/*forceReApply*/);
+@@ -144,7 +144,7 @@ void CtMainWin::reapply_syntax_highlighting(const char target/*'r':RichText, 'p'
+ else {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = node.get_node_text_buffer();
+ if (not rTextBuffer) {
+- error = str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name());
++ error = str::format(_("Failed to retrieve the content of the node '%s'"), node.get_node_name().raw());
+ return true; /* true for stop */
+ }
+ apply_syntax_highlighting(rTextBuffer, node.get_node_syntax_highlighting(), true/*forceReApply*/);
+diff --git a/src/ct/ct_main_win_events.cc b/src/ct/ct_main_win_events.cc
+index 732336414..99095a392 100644
+--- a/src/ct/ct_main_win_events.cc
++++ b/src/ct/ct_main_win_events.cc
+@@ -56,7 +56,7 @@ void CtMainWin::_on_treeview_cursor_changed()
+
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = treeIter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), treeIter.get_node_name()), *this);
++ CtDialogs::error_dialog(str::format(_("Failed to retrieve the content of the node '%s'"), treeIter.get_node_name().raw()), *this);
+ if (_prevTreeIter) {
+ _uCtTreeview->set_cursor_safe(_prevTreeIter);
+ }
+diff --git a/src/ct/ct_misc_utils.cc b/src/ct/ct_misc_utils.cc
+index 8ed98b8b3..2b452fe86 100644
+--- a/src/ct/ct_misc_utils.cc
++++ b/src/ct/ct_misc_utils.cc
+@@ -1160,7 +1160,7 @@ int str::indexOf(const Glib::ustring& str, const gunichar& uc)
+ return index != std::string::npos ? static_cast<int>(index) : -1;
+ }
+
+-Glib::ustring str::xml_escape(const Glib::ustring& text)
++std::string str::xml_escape(const Glib::ustring& text)
+ {
+ Glib::ustring buffer;
+ buffer.reserve(text.size());
+@@ -1175,7 +1175,7 @@ Glib::ustring str::xml_escape(const Glib::ustring& text)
+ default: buffer.append(1, *ch); break;
+ }
+ }
+- return buffer;
++ return buffer.raw();
+ }
+
+ Glib::ustring str::sanitize_bad_symbols(const Glib::ustring& xml_content)
+diff --git a/src/ct/ct_misc_utils.h b/src/ct/ct_misc_utils.h
+index dc2cb09a2..d75a0f263 100644
+--- a/src/ct/ct_misc_utils.h
++++ b/src/ct/ct_misc_utils.h
+@@ -328,7 +328,7 @@ int indexOf(const std::array<T, size>& array, const T& uc)
+ return -1;
+ }
+
+-Glib::ustring xml_escape(const Glib::ustring& text);
++std::string xml_escape(const Glib::ustring& text);
+
+ Glib::ustring sanitize_bad_symbols(const Glib::ustring& xml_content);
+
+diff --git a/src/ct/ct_storage_control.cc b/src/ct/ct_storage_control.cc
+index 54b9c145b..9a6e813a0 100644
+--- a/src/ct/ct_storage_control.cc
++++ b/src/ct/ct_storage_control.cc
+@@ -140,7 +140,7 @@ static const std::string BAD_ARCHIVE{"_BAD_ARC_"};
+ return Glib::build_filename(first_backup_dir, CtConst::CHAR_DOT + Glib::path_get_basename(file_or_dir_path)) + CtConst::CHAR_TILDE;
+ }
+ catch (Glib::Error& ex) {
+- spdlog::error("failed to create backup directory: {}, \n{}", first_backup_dir, ex.what());
++ spdlog::error("failed to create backup directory: {}, \n{}", first_backup_dir, ex.what().raw());
+ return "";
+ }
+ };
+@@ -778,7 +778,7 @@ void CtStorageCache::generate_cache(CtMainWin* pCtMainWin, const CtStorageSyncPe
+ CtTreeIter ct_tree_iter = store.to_ct_tree_iter(iter);
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ct_tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- error = str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter.get_node_name());
++ error = str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter.get_node_name().raw());
+ return true; /* true for stop */
+ }
+ for (auto widget : ct_tree_iter.get_anchored_widgets_fast())
+@@ -795,7 +795,7 @@ void CtStorageCache::generate_cache(CtMainWin* pCtMainWin, const CtStorageSyncPe
+ if (node_pair.second.buff && ct_tree_iter.get_node_is_rich_text()) {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ct_tree_iter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter.get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter.get_node_name().raw()));
+ }
+ for (auto widget : ct_tree_iter.get_anchored_widgets_fast())
+ if (widget->get_type() == CtAnchWidgType::ImagePng) // important to check type
+diff --git a/src/ct/ct_storage_multifile.cc b/src/ct/ct_storage_multifile.cc
+index 966cba10c..ebd729e0e 100644
+--- a/src/ct/ct_storage_multifile.cc
++++ b/src/ct/ct_storage_multifile.cc
+@@ -455,7 +455,7 @@ bool CtStorageMultiFile::_nodes_to_multifile(const CtTreeIter* ct_tree_iter,
+ }
+ }
+ catch (Glib::Error& error) {
+- spdlog::error("{} {}", __FUNCTION__, error.what());
++ spdlog::error("{} {}", __FUNCTION__, error.what().raw());
+ }
+ return false;
+ }
+diff --git a/src/ct/ct_storage_sqlite.cc b/src/ct/ct_storage_sqlite.cc
+index 476e563ed..dd2c703bb 100644
+--- a/src/ct/ct_storage_sqlite.cc
++++ b/src/ct/ct_storage_sqlite.cc
+@@ -108,8 +108,8 @@ const char CtStorageSqlite::TABLE_BOOKMARK_CREATE[]{"CREATE TABLE bookmark ("
+ const char CtStorageSqlite::TABLE_BOOKMARK_INSERT[]{"INSERT INTO bookmark VALUES(?,?)"};
+ const char CtStorageSqlite::TABLE_BOOKMARK_DELETE[]{"DELETE FROM bookmark"};
+
+-const Glib::ustring CtStorageSqlite::ERR_SQLITE_PREPV2{"!! sqlite3_prepare_v2: "};
+-const Glib::ustring CtStorageSqlite::ERR_SQLITE_STEP{"!! sqlite3_step: "};
++/*static*/const std::string CtStorageSqlite::ERR_SQLITE_PREPV2{"!! sqlite3_prepare_v2: "};
++/*static*/const std::string CtStorageSqlite::ERR_SQLITE_STEP{"!! sqlite3_step: "};
+
+ class Sqlite3StmtAuto
+ {
+diff --git a/src/ct/ct_storage_sqlite.h b/src/ct/ct_storage_sqlite.h
+index e6cad42df..e42fe9cd4 100644
+--- a/src/ct/ct_storage_sqlite.h
++++ b/src/ct/ct_storage_sqlite.h
+@@ -129,8 +129,8 @@ class CtStorageSqlite : public CtStorageEntity
+ static const char TABLE_BOOKMARK_CREATE[];
+ static const char TABLE_BOOKMARK_INSERT[];
+ static const char TABLE_BOOKMARK_DELETE[];
+- static const Glib::ustring ERR_SQLITE_PREPV2;
+- static const Glib::ustring ERR_SQLITE_STEP;
++ static const std::string ERR_SQLITE_PREPV2;
++ static const std::string ERR_SQLITE_STEP;
+ static const char* safe_sqlite3_column_text(sqlite3_stmt* stmt, int iCol);
+
+ private:
+diff --git a/src/ct/ct_storage_xml.cc b/src/ct/ct_storage_xml.cc
+index 555c72362..3e0fc8cc4 100644
+--- a/src/ct/ct_storage_xml.cc
++++ b/src/ct/ct_storage_xml.cc
+@@ -249,7 +249,7 @@ void CtStorageXml::_nodes_to_xml(CtTreeIter* ct_tree_iter,
+ {
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ct_tree_iter->get_node_text_buffer();
+ if (not rTextBuffer) {
+- throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter->get_node_name()));
++ throw std::runtime_error(str::format(_("Failed to retrieve the content of the node '%s'"), ct_tree_iter->get_node_name().raw()));
+ }
+ xmlpp::Element* p_node_node = CtStorageXmlHelper{_pCtMainWin}.node_to_xml(
+ ct_tree_iter,
+diff --git a/src/ct/ct_treestore.cc b/src/ct/ct_treestore.cc
+index 44c0d14bf..bd3d34eac 100644
+--- a/src/ct/ct_treestore.cc
++++ b/src/ct/ct_treestore.cc
+@@ -866,8 +866,8 @@ void CtTreeStore::text_view_apply_textbuffer(CtTreeIter& treeIter, CtTextView* p
+ const gint64 nodeMasterId = treeIter.get_node_shared_master_id();
+ const gint64 nodeId = treeIter.get_node_id();
+ const Glib::ustring nodeName = treeIter.get_node_name();
+- if (nodeMasterId <= 0) spdlog::debug("Node {} > {}", nodeId, nodeName);
+- else spdlog::debug("Node {}[{}] > {}", nodeId, nodeMasterId, nodeName);
++ if (nodeMasterId <= 0) spdlog::debug("Node {} > {}", nodeId, nodeName.raw());
++ else spdlog::debug("Node {}[{}] > {}", nodeId, nodeMasterId, nodeName.raw());
+
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = treeIter.get_node_text_buffer();
+ _pCtMainWin->apply_syntax_highlighting(rTextBuffer, treeIter.get_node_syntax_highlighting(), false/*forceReApply*/);
+@@ -1416,7 +1416,7 @@ bool CtTreeStore::populate_summary_info(CtSummaryInfo& summaryInfo)
+ // ensure the node content is populated
+ Glib::RefPtr<Gsv::Buffer> rTextBuffer = ctTreeIter.get_node_text_buffer();
+ if (not rTextBuffer) {
+- error = str::format(_("Failed to retrieve the content of the node '%s'"), ctTreeIter.get_node_name());
++ error = str::format(_("Failed to retrieve the content of the node '%s'"), ctTreeIter.get_node_name().raw());
+ return true; /* true for stop */
+ }
+ const gint64 shared_master_id = ctTreeIter.get_node_shared_master_id();
+diff --git a/tests/tests_encoding.cpp b/tests/tests_encoding.cpp
+index ce3ce3101..80683ced8 100644
+--- a/tests/tests_encoding.cpp
++++ b/tests/tests_encoding.cpp
+@@ -1,7 +1,7 @@
+ /*
+ * tests_encoding.cpp
+ *
+- * Copyright 2009-2020
++ * Copyright 2009-2024
+ * Giuseppe Penone <giuspen@gmail.com>
+ * Evgenii Gurianov <https://github.com/txe>
+ *
+@@ -28,5 +28,5 @@ TEST(EncodingGroup, ustring_format)
+ {
+ // on win32 this could throw an exception due to locale
+ Glib::ustring str = "привет こんにちは";
+- ASSERT_STREQ(str.c_str(), fmt::format("{}", str).c_str());
++ ASSERT_STREQ(str.c_str(), fmt::format("{}", str.raw()).c_str());
+ }
diff --git a/srcpkgs/cherrytree/patches/fc1d7499067b9db9841175b5a2d6934dc65e4522.patch b/srcpkgs/cherrytree/patches/fc1d7499067b9db9841175b5a2d6934dc65e4522.patch
new file mode 100644
index 00000000000000..dd117eaf8c83b3
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/fc1d7499067b9db9841175b5a2d6934dc65e4522.patch
@@ -0,0 +1,151 @@
+From fc1d7499067b9db9841175b5a2d6934dc65e4522 Mon Sep 17 00:00:00 2001
+From: Ben Cotton <bcotton@funnelfiasco.com>
+Date: Fri, 23 Aug 2024 06:02:31 -0400
+Subject: [PATCH] Fix formatting issues with fmt 11 (#2548) (#2560)
+
+CherryTree fails to build on Fedora Rawhide due to errors introduced by
+fmt 11. This commit fixes all of the remaining errors raised during
+compile.
+
+Fixes #2548
+
+Signed-off-by: Ben Cotton <bcotton@fedoraproject.org>
+Co-authored-by: Ben Cotton <bcotton@fedoraproject.org>
+---
+ src/ct/ct_export2html.cc | 4 ++--
+ src/ct/ct_storage_control.cc | 12 ++++++------
+ src/ct/ct_storage_multifile.cc | 6 +++---
+ src/ct/ct_storage_sqlite.cc | 6 +++---
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/ct/ct_export2html.cc b/src/ct/ct_export2html.cc
+index 2e777548..b74aff5a 100644
+--- a/src/ct/ct_export2html.cc
++++ b/src/ct/ct_export2html.cc
+@@ -180,7 +180,7 @@ void CtExport2Html::nodes_all_export_to_multiple_html(bool all_tree, const CtExp
+ tree_links_text += "</div>\n";
+
+ // create index html page
+- Glib::ustring html_text = str::format(HTML_HEADER, _pCtMainWin->get_ct_storage()->get_file_name());
++ Glib::ustring html_text = str::format(HTML_HEADER, _pCtMainWin->get_ct_storage()->get_file_name().string());
+ if (options.index_in_page) {
+ html_text += "<div class='two-panels'>\n<div class='tree-panel'>\n";
+ html_text += tree_links_text;
+@@ -283,7 +283,7 @@ void CtExport2Html::nodes_all_export_to_single_html(bool all_tree, const CtExpor
+ }
+ };
+
+- Glib::ustring html_header = str::format(HTML_HEADER, _pCtMainWin->get_ct_storage()->get_file_name());
++ Glib::ustring html_header = str::format(HTML_HEADER, _pCtMainWin->get_ct_storage()->get_file_name().string());
+ rFileStream->write(html_header.c_str(), html_header.bytes());
+
+ // start to iterarte nodes
+diff --git a/src/ct/ct_storage_control.cc b/src/ct/ct_storage_control.cc
+index 34dd0a1b..e2b6f114 100644
+--- a/src/ct/ct_storage_control.cc
++++ b/src/ct/ct_storage_control.cc
+@@ -78,7 +78,7 @@ static const std::string BAD_ARCHIVE{"_BAD_ARC_"};
+ return nullptr;
+ }
+ if (extracted_file_path.string() == BAD_ARCHIVE) {
+- throw std::runtime_error(str::format(_("'%s' is Not a Valid Archive"), file_path));
++ throw std::runtime_error(str::format(_("'%s' is Not a Valid Archive"), file_path.string()));
+ }
+ }
+ }
+@@ -533,14 +533,14 @@ void CtStorageControl::_backupEncryptThread()
+ // move back the latest file version
+ (void)fs::move_file(pBackupEncryptData->main_backup, pBackupEncryptData->file_path);
+ #if defined(DEBUG_BACKUP_ENCRYPT)
+- spdlog::debug("{} -> {}", pBackupEncryptData->main_backup, pBackupEncryptData->file_path);
++ spdlog::debug("{} -> {}", pBackupEncryptData->main_backup, pBackupEncryptData->file_path.string());
+ #endif // DEBUG_BACKUP_ENCRYPT
+ _pCtMainWin->errorsDEQueue.push_back(_("Failed to encrypt the file"));
+ _pCtMainWin->dispatcherErrorMsg.emit();
+ continue;
+ }
+ #if defined(DEBUG_BACKUP_ENCRYPT)
+- spdlog::debug("{} => {}", pBackupEncryptData->extracted_copy, pBackupEncryptData->file_path);
++ spdlog::debug("{} => {}", pBackupEncryptData->extracted_copy, pBackupEncryptData->file_path.string());
+ #endif // DEBUG_BACKUP_ENCRYPT
+ }
+
+@@ -729,12 +729,12 @@ void CtStorageControl::add_nodes_from_storage(const fs::path& file_path,
+ {
+ if (is_folder) {
+ if (not fs::is_directory(file_path)) {
+- throw std::runtime_error(fmt::format("{} not a dir", file_path));
++ throw std::runtime_error(fmt::format("{} not a dir", file_path.string()));
+ }
+ }
+ else {
+ if (not fs::is_regular_file(file_path)) {
+- throw std::runtime_error(fmt::format("{} not a file", file_path));
++ throw std::runtime_error(fmt::format("{} not a file", file_path.string()));
+ }
+ }
+
+@@ -747,7 +747,7 @@ void CtStorageControl::add_nodes_from_storage(const fs::path& file_path,
+ return;
+ }
+ if (extracted_file_path.string() == BAD_ARCHIVE) {
+- throw std::runtime_error(str::format(_("'%s' is Not a Valid Archive"), file_path));
++ throw std::runtime_error(str::format(_("'%s' is Not a Valid Archive"), file_path.string()));
+ }
+ }
+
+diff --git a/src/ct/ct_storage_multifile.cc b/src/ct/ct_storage_multifile.cc
+index b7b10b4d..94db12bb 100644
+--- a/src/ct/ct_storage_multifile.cc
++++ b/src/ct/ct_storage_multifile.cc
+@@ -510,7 +510,7 @@ bool CtStorageMultiFile::populate_treestore(const fs::path& dir_path, Glib::ustr
+ parsingOk = true;
+ }
+ catch (std::exception& ex) {
+- spdlog::error("parse {} : {} - trying first backup...", node_xml_path, ex.what());
++ spdlog::error("parse {} : {} - trying first backup...", node_xml_path.string(), ex.what());
+ }
+ if (not parsingOk) {
+ std::string first_backup_dir;
+@@ -527,13 +527,13 @@ bool CtStorageMultiFile::populate_treestore(const fs::path& dir_path, Glib::ustr
+ parsingOk = true;
+ }
+ catch (std::exception& ex) {
+- spdlog::error("parse {} : {} - trying backup {}...", node_xml_path, ex.what(), b+2);
++ spdlog::error("parse {} : {} - trying backup {}...", node_xml_path.string(), ex.what(), b+2);
+ }
+ if (parsingOk) {
+ if (fs::exists(node_xml_path)) {
+ fs::move_file(node_xml_path, node_xml_path.parent_path() / (node_xml_path.stem() + std::string{"_BAD.xml"}));
+ }
+- spdlog::debug("parse backed up data ok, copying {} -> {}", backup_node_xml_path, node_xml_path);
++ spdlog::debug("parse backed up data ok, copying {} -> {}", backup_node_xml_path.string(), node_xml_path.string());
+ fs::copy_file(backup_node_xml_path, node_xml_path);
+ if (error.empty()) error += _("A Restore From Backup Was Necessary For:");
+ error += "\n\n" + node_xml_path.string();
+diff --git a/src/ct/ct_storage_sqlite.cc b/src/ct/ct_storage_sqlite.cc
+index dd2c703b..3b0b9217 100644
+--- a/src/ct/ct_storage_sqlite.cc
++++ b/src/ct/ct_storage_sqlite.cc
+@@ -207,10 +207,10 @@ void CtStorageSqlite::test_connection()
+ }
+ catch(std::exception& e) {
+ spdlog::debug("{} {}", __FUNCTION__, e.what());
+- throw std::runtime_error(str::format(_("%s write failed - file is missing. Reattach USB drive or shared resource!"), _file_path));
++ throw std::runtime_error(str::format(_("%s write failed - file is missing. Reattach USB drive or shared resource!"), _file_path.string()));
+ }
+ if (not test_readwrite())
+- throw std::runtime_error(str::format(_("%s write failed - is file blocked by a sync program?"), _file_path));
++ throw std::runtime_error(str::format(_("%s write failed - is file blocked by a sync program?"), _file_path.string()));
+ (void)_check_database_integrity();
+ }
+
+@@ -223,7 +223,7 @@ void CtStorageSqlite::try_reopen()
+ }
+ catch(std::exception& e) {
+ spdlog::debug("{} {}", __FUNCTION__, e.what());
+- throw std::runtime_error(str::format(_("%s reopen failed - file is missing. Reattach USB drive or shared resource!"), _file_path));
++ throw std::runtime_error(str::format(_("%s reopen failed - file is missing. Reattach USB drive or shared resource!"), _file_path.string()));
+ }
+ (void)_check_database_integrity();
+ }
diff --git a/srcpkgs/cherrytree/patches/series b/srcpkgs/cherrytree/patches/series
new file mode 100644
index 00000000000000..22ed6296f2952f
--- /dev/null
+++ b/srcpkgs/cherrytree/patches/series
@@ -0,0 +1,5 @@
+76f0030e2e2b6e1488148d3828baeb8f5911eb8d.patch
+ccc2d101f24a409efddb2f29e8c14002c9836a85.patch
+22142f3b44fef81e67c9bfbcdaed2f80ab2ff5de.patch
+05233db2b25977037c7520a8316183636a262130.patch
+fc1d7499067b9db9841175b5a2d6934dc65e4522.patch
From 21b021c676e2bf26f7e3e27fe752c0573a67b047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From e4b04ee3a78be7ef0e83025444764d6d4bb3dae8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 0ade44bdf6822803c54ae076c5dd9c3fc9989bd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From fbb3f135ae9ee4a0f593212a86944505d44941ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From ae7d06543604a67a74c55cb2275ae6d758544e73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From db48fe4fb171fb83d92171ea00582d85fd593037 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From cea4f55504ffb3a0e6e0c529f111d40805604cad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.2.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..20df4f404f5f55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.2.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 78949570224490187981be92bd25c1787f835f23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: rebuild for fmt-11.0.2
---
...70051c1c2b5fb6f2da8fb6422b27418c3dfa.patch | 47 +++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch
diff --git a/srcpkgs/gnuradio/patches/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch b/srcpkgs/gnuradio/patches/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch
new file mode 100644
index 00000000000000..9de16700eac8f4
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/19b070051c1c2b5fb6f2da8fb6422b27418c3dfa.patch
@@ -0,0 +1,47 @@
+From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 09:27:16 +0800
+Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for
+ using fmt::join()
+
+fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
+include the corresponding header in spdlog for using it.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ gnuradio-runtime/lib/io_signature.cc | 5 +++++
+ gr-blocks/lib/message_debug_impl.cc | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
+index 812f444f8bb..76bb2aba670 100644
+--- a/gnuradio-runtime/lib/io_signature.cc
++++ b/gnuradio-runtime/lib/io_signature.cc
+@@ -16,6 +16,11 @@
+ #include <spdlog/tweakme.h>
+
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <string_view>
+ #include <algorithm>
+ #include <memory>
+diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
+index 41d312e43c3..373287b02ab 100644
+--- a/gr-blocks/lib/message_debug_impl.cc
++++ b/gr-blocks/lib/message_debug_impl.cc
+@@ -19,6 +19,11 @@
+ #include <pmt/pmt.h>
+ #include <spdlog/common.h>
+ #include <spdlog/fmt/fmt.h>
++#if __has_include(<spdlog/fmt/ranges.h>)
++#include <spdlog/fmt/ranges.h>
++#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
++#include <spdlog/fmt/bundled/ranges.h>
++#endif
+ #include <functional>
+ #include <utility>
+ #include <vector>
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From 462643074ba64449031903ed790c32c4ce8f7722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 0ef4a345ebd268ad7290020bb029f13bbfec80f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From ca02bd7c9453804b5b64507c2c3e09f19b4a2846 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 1860b2220a9c57e2dfae236f7783b2f0dfd732d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: rebuild for fmt-11.0.2
---
...869715e3efca87942d79c3173a6b21a6925d.patch | 79 +++++++++++++++++++
1 file changed, 79 insertions(+)
create mode 100644 srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
diff --git a/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
new file mode 100644
index 00000000000000..f6d8c7d3376906
--- /dev/null
+++ b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
From 22fd0b504f7204185514c42d838a9dbef8c2b600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 41d16002ea44a01947ed5b1168ed1614a7f4ef6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
From de3e617d549daf8e7912bc1ab7fa66a8b14bad15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From a1bd041562b0d3c0cad529ac31fbe24ade607be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt-11.0.2
---
srcpkgs/paps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 6589c4873e14106d3583202376ee7b7c1e7ea9a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.14.1.
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..e23866f2c94a93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.14 libspdlog-1.14.1_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..fb073f81fceca4 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.14.1
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 2cc7f66811eb7f58349b418aca8898da87dd308d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:12 +0200
Subject: [PATCH 25/26] vtk: update to 9.3.1.
---
common/shlibs | 110 +++++++++++++++++++++++
srcpkgs/vtk/patches/01-vtkioss-fmt.patch | 59 ++++++++++++
srcpkgs/vtk/patches/02-vtkioss-fmt.patch | 23 +++++
srcpkgs/vtk/template | 5 +-
4 files changed, 196 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vtk/patches/01-vtkioss-fmt.patch
create mode 100644 srcpkgs/vtk/patches/02-vtkioss-fmt.patch
diff --git a/common/shlibs b/common/shlibs
index e23866f2c94a93..ce515db81b505d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3450,6 +3450,116 @@ libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.3.so.1 vtk-9.3.2_1
+libvtksys-9.3.so.1 vtk-9.3.2_1
+libvtkCommonMisc-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingContext2D-9.3.so.1 vtk-9.3.2_1
+libvtkCommonTransforms-9.3.so.1 vtk-9.3.2_1
+libvtkCommonMath-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLOD-9.3.so.1 vtk-9.3.2_1
+libvtkViewsInfovis-9.3.so.1 vtk-9.3.2_1
+libvtkIOIOSS-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLabel-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersPoints-9.3.so.1 vtk-9.3.2_1
+libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeneral-9.3.so.1 vtk-9.3.2_1
+libvtkCommonDataModel-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersTopology-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSources-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOOggTheora-9.3.so.1 vtk-9.3.2_1
+libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.2_1
+libvtkIOAMR-9.3.so.1 vtk-9.3.2_1
+libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.2_1
+libvtkIOSegY-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersTexture-9.3.so.1 vtk-9.3.2_1
+libvtkIOVideo-9.3.so.1 vtk-9.3.2_1
+libvtkImagingSources-9.3.so.1 vtk-9.3.2_1
+libvtkImagingStencil-9.3.so.1 vtk-9.3.2_1
+libvtkIOCGNSReader-9.3.so.1 vtk-9.3.2_1
+libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkIOVeraOut-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersHybrid-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionImage-9.3.so.1 vtk-9.3.2_1
+libvtkChartsCore-9.3.so.1 vtk-9.3.2_1
+libvtkImagingStatistics-9.3.so.1 vtk-9.3.2_1
+libvtkImagingHybrid-9.3.so.1 vtk-9.3.2_1
+libvtkGeovisCore-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionWidgets-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersImaging-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersVerdict-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSMP-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingUI-9.3.so.1 vtk-9.3.2_1
+libvtkIOHDF-9.3.so.1 vtk-9.3.2_1
+libvtkCommonSystem-9.3.so.1 vtk-9.3.2_1
+libvtkImagingColor-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.2_1
+libvtkParallelCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOInfovis-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkImagingFourier-9.3.so.1 vtk-9.3.2_1
+libvtkCommonColor-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.2_1
+libvtkIOSQL-9.3.so.1 vtk-9.3.2_1
+libvtkIOImage-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersCore-9.3.so.1 vtk-9.3.2_1
+libvtkInfovisCore-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersExtraction-9.3.so.1 vtk-9.3.2_1
+libvtkIOGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.2_1
+libvtkIOMovie-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVolume-9.3.so.1 vtk-9.3.2_1
+libvtkIOEnSight-9.3.so.1 vtk-9.3.2_1
+libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersStatistics-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSelection-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersModeling-9.3.so.1 vtk-9.3.2_1
+libvtkViewsCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOMotionFX-9.3.so.1 vtk-9.3.2_1
+libvtkIOLSDyna-9.3.so.1 vtk-9.3.2_1
+libvtkIOParallel-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingImage-9.3.so.1 vtk-9.3.2_1
+libvtkIOXMLParser-9.3.so.1 vtk-9.3.2_1
+libvtkImagingMorphological-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersParallel-9.3.so.1 vtk-9.3.2_1
+libvtkViewsContext2D-9.3.so.1 vtk-9.3.2_1
+libvtkIOImport-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkIOAsynchronous-9.3.so.1 vtk-9.3.2_1
+libvtkIOTecplotTable-9.3.so.1 vtk-9.3.2_1
+libvtkIOCityGML-9.3.so.1 vtk-9.3.2_1
+libvtkImagingMath-9.3.so.1 vtk-9.3.2_1
+libvtkIOParallelXML-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeneric-9.3.so.1 vtk-9.3.2_1
+libvtkIONetCDF-9.3.so.1 vtk-9.3.2_1
+libvtkImagingCore-9.3.so.1 vtk-9.3.2_1
+libvtkInfovisLayout-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.2_1
+libvtkIOExportPDF-9.3.so.1 vtk-9.3.2_1
+libvtkImagingGeneral-9.3.so.1 vtk-9.3.2_1
+libvtkIOXML-9.3.so.1 vtk-9.3.2_1
+libvtkIOChemistry-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionStyle-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersAMR-9.3.so.1 vtk-9.3.2_1
+libvtkIOMINC-9.3.so.1 vtk-9.3.2_1
+libvtkTestingRendering-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.2_1
+libvtkDomainsChemistry-9.3.so.1 vtk-9.3.2_1
+libvtkIOExport-9.3.so.1 vtk-9.3.2_1
+libvtkIOCore-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.2_1
+libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.2_1
+libvtkIOLegacy-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingFreeType-9.3.so.1 vtk-9.3.2_1
+libvtkIOPLY-9.3.so.1 vtk-9.3.2_1
+libvtkIOExodus-9.3.so.1 vtk-9.3.2_1
+libvtkkissfft-9.3.so.1 vtk-9.3.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/01-vtkioss-fmt.patch b/srcpkgs/vtk/patches/01-vtkioss-fmt.patch
new file mode 100644
index 00000000000000..45c60721ae0862
--- /dev/null
+++ b/srcpkgs/vtk/patches/01-vtkioss-fmt.patch
@@ -0,0 +1,59 @@
+From ff6336d8ca857d6909987a82526cefdfd34aaf2c Mon Sep 17 00:00:00 2001
+From: Greg Sjaardema <gdsjaar@sandia.gov>
+Date: Tue, 2 Jan 2024 17:25:41 -0700
+Subject: [PATCH] FMT: Fixes for latest releast of lib::fmt
+
+---
+ ThirdParty/ioss/vtkioss/Ioss_IOFactory.C | 1 +
+ ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C | 1 +
+ ThirdParty/ioss/vtkioss/Ioss_Utils.C | 1 +
+ ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C | 1 +
+ 15 files changed, 15 insertions(+)
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
+--- a/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_IOFactory.C
+@@ -12,6 +12,7 @@
+ #include <cstddef> // for nullptr
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map> // for _Rb_tree_iterator, etc
+ #include <ostream> // for basic_ostream, etc
+ #include <set>
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
+index d650c38c84..581c21b158 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_StructuredBlock.C
+@@ -15,6 +15,7 @@
+ #include <Ioss_StructuredBlock.h>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+
+ #include <cstddef> // for size_t
+ #include <numeric>
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_Utils.C b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
+index effcfd6199..6e98057473 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
+@@ -21,6 +21,7 @@
+ #include VTK_FMT(fmt/chrono.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <fstream>
+ #include <sstream>
+ #include <string>
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
+index edee536489..b0f9706b7c 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_ZoneConnectivity.C
+@@ -9,6 +9,7 @@
+ #include <cstddef> // for size_t
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <string> // for string
+ #include <vector> // for vector
+
diff --git a/srcpkgs/vtk/patches/02-vtkioss-fmt.patch b/srcpkgs/vtk/patches/02-vtkioss-fmt.patch
new file mode 100644
index 00000000000000..b3070a1722908a
--- /dev/null
+++ b/srcpkgs/vtk/patches/02-vtkioss-fmt.patch
@@ -0,0 +1,23 @@
+From 80470e638859457c6bd2513dbc85a725b2bef78d Mon Sep 17 00:00:00 2001
+From: Greg Sjaardema <gdsjaar@sandia.gov>
+Date: Wed, 31 Jul 2024 07:38:40 -0600
+Subject: [PATCH] IOSS: Fix some misues of lib::fmt causing issues with C++20
+
+---
+ ThirdParty/ioss/vtkioss/Ioss_DatabaseIO.C | 7 ++-----
+ ThirdParty/ioss/vtkioss/Ioss_Utils.C | 2 +-
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_DatabaseIO.C b/ThirdParty/ioss/vtkioss/Ioss_DatabaseIO.C
+index 870140a1d2..f16b426753 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_DatabaseIO.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_DatabaseIO.C
+@@ -1638,7 +1635,7 @@ namespace {
+ else {
+ char sep = (util.parallel_size() > 1) ? ':' : ' ';
+ for (auto &p_time : all_times) {
+- fmt::print(strm, "{:8d}{}", p_time, sep);
++ fmt::print(strm, "{:8}{}", p_time, sep);
+ }
+ }
+ if (util.parallel_size() > 1) {
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..4ce852d19ce25e 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -28,6 +28,7 @@ license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+<<<<<<< HEAD
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
@@ -36,6 +37,8 @@ case "$XBPS_TARGET_MACHINE" in
makedepends+=" openmpi-devel"
;;
esac
+=======
+>>>>>>> 2bcd07e5631 (vtk: update to 9.3.1.)
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
From 67c1667fbb525cb9fd38c735d9ff6ab0a97d9268 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 26/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (2 preceding siblings ...)
2025-04-19 21:57 ` dkwo
@ 2025-04-19 22:17 ` dkwo
2025-04-19 22:25 ` dkwo
` (50 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 22:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 41728 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d093d3ea2c6ad160bea350001a451f9683b8fca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt-11.0.2
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..a0f7607b39e2ad 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
From ec47e2fc4c0d13ee7733d0871be2444dd4ad09c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 17d2fd8977e8db7cc644d0fd65fc971247eedf0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From d08ebe7c22b94b4a40314f912c89f53c250d758c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fa5ce15916508a21046f2d0d6a2add3bd42c0ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 35ed7ee253af3d1e6004261a8054c0c0731036e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From e3394a45060bb136efd2ab680b61c1b5d266542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 1a74773087cc350cb92973da371682263b8c87e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 646aba2cdcd115b2a1f57f1bedcb4b51e29f5c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 9ab91925f647e2ba199820680f36d7587bcd07a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 1cf87c6951367d3488c4b24bdd1e1978afe3b050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From e3eb41e360aad2423e3fe136e946c21ae7d0e111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.2.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..20df4f404f5f55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.2.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From ddca4300cac4ee0c4d6bc969ff4f0c5e84342e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: rebuild for fmt-11.0.2
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From cc9e417fc66ae73d4b1ac66e2cc8d2eb87651562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 21fdc07441d9a49eda7c6ff3a049813135257f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5ce17089ad1a0ba33f9260ec36796d424bc0aba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 222d303dcba9c75d83f760b23a2dd90be4792c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: rebuild for fmt-11.0.2
---
...869715e3efca87942d79c3173a6b21a6925d.patch | 79 +++++++++++++++++++
srcpkgs/mpd/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
diff --git a/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
new file mode 100644
index 00000000000000..f6d8c7d3376906
--- /dev/null
+++ b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..7fcf0a743e8aab 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.15
-revision=4
+revision=5
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 3a8179e32b05ea93cd1a9b172d9dd80a19baf4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From ee25819d74ef85e6caba1edc12919fdeb735d269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b757a8e37f099a7ea3d8f3f71ecf12eef4a3247f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 6c63f863f614e4757ad274b2a03e68f81595c8b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt-11.0.2
---
srcpkgs/paps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From d5c4b38d971a3bb7ae7e031df97d933d243623d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.14.1.
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..e23866f2c94a93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.14 libspdlog-1.14.1_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..fb073f81fceca4 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.14.1
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From de2d04949ec42e9734eb89f58c0f5159524baad2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:12 +0200
Subject: [PATCH 25/26] vtk: update to 9.3.1.
---
common/shlibs | 110 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/vtk/template | 2 +-
2 files changed, 111 insertions(+), 1 deletion(-)
diff --git a/common/shlibs b/common/shlibs
index e23866f2c94a93..ce515db81b505d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3450,6 +3450,116 @@ libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.3.so.1 vtk-9.3.2_1
+libvtksys-9.3.so.1 vtk-9.3.2_1
+libvtkCommonMisc-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingContext2D-9.3.so.1 vtk-9.3.2_1
+libvtkCommonTransforms-9.3.so.1 vtk-9.3.2_1
+libvtkCommonMath-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLOD-9.3.so.1 vtk-9.3.2_1
+libvtkViewsInfovis-9.3.so.1 vtk-9.3.2_1
+libvtkIOIOSS-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLabel-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersPoints-9.3.so.1 vtk-9.3.2_1
+libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeneral-9.3.so.1 vtk-9.3.2_1
+libvtkCommonDataModel-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersTopology-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSources-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOOggTheora-9.3.so.1 vtk-9.3.2_1
+libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.2_1
+libvtkIOAMR-9.3.so.1 vtk-9.3.2_1
+libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.2_1
+libvtkIOSegY-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersTexture-9.3.so.1 vtk-9.3.2_1
+libvtkIOVideo-9.3.so.1 vtk-9.3.2_1
+libvtkImagingSources-9.3.so.1 vtk-9.3.2_1
+libvtkImagingStencil-9.3.so.1 vtk-9.3.2_1
+libvtkIOCGNSReader-9.3.so.1 vtk-9.3.2_1
+libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkIOVeraOut-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersHybrid-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionImage-9.3.so.1 vtk-9.3.2_1
+libvtkChartsCore-9.3.so.1 vtk-9.3.2_1
+libvtkImagingStatistics-9.3.so.1 vtk-9.3.2_1
+libvtkImagingHybrid-9.3.so.1 vtk-9.3.2_1
+libvtkGeovisCore-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionWidgets-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersImaging-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersVerdict-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSMP-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingUI-9.3.so.1 vtk-9.3.2_1
+libvtkIOHDF-9.3.so.1 vtk-9.3.2_1
+libvtkCommonSystem-9.3.so.1 vtk-9.3.2_1
+libvtkImagingColor-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.2_1
+libvtkParallelCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOInfovis-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkImagingFourier-9.3.so.1 vtk-9.3.2_1
+libvtkCommonColor-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.2_1
+libvtkIOSQL-9.3.so.1 vtk-9.3.2_1
+libvtkIOImage-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersCore-9.3.so.1 vtk-9.3.2_1
+libvtkInfovisCore-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersExtraction-9.3.so.1 vtk-9.3.2_1
+libvtkIOGeometry-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.2_1
+libvtkIOMovie-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingVolume-9.3.so.1 vtk-9.3.2_1
+libvtkIOEnSight-9.3.so.1 vtk-9.3.2_1
+libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersStatistics-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersSelection-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersModeling-9.3.so.1 vtk-9.3.2_1
+libvtkViewsCore-9.3.so.1 vtk-9.3.2_1
+libvtkIOMotionFX-9.3.so.1 vtk-9.3.2_1
+libvtkIOLSDyna-9.3.so.1 vtk-9.3.2_1
+libvtkIOParallel-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingImage-9.3.so.1 vtk-9.3.2_1
+libvtkIOXMLParser-9.3.so.1 vtk-9.3.2_1
+libvtkImagingMorphological-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersParallel-9.3.so.1 vtk-9.3.2_1
+libvtkViewsContext2D-9.3.so.1 vtk-9.3.2_1
+libvtkIOImport-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkIOAsynchronous-9.3.so.1 vtk-9.3.2_1
+libvtkIOTecplotTable-9.3.so.1 vtk-9.3.2_1
+libvtkIOCityGML-9.3.so.1 vtk-9.3.2_1
+libvtkImagingMath-9.3.so.1 vtk-9.3.2_1
+libvtkIOParallelXML-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersGeneric-9.3.so.1 vtk-9.3.2_1
+libvtkIONetCDF-9.3.so.1 vtk-9.3.2_1
+libvtkImagingCore-9.3.so.1 vtk-9.3.2_1
+libvtkInfovisLayout-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.2_1
+libvtkIOExportPDF-9.3.so.1 vtk-9.3.2_1
+libvtkImagingGeneral-9.3.so.1 vtk-9.3.2_1
+libvtkIOXML-9.3.so.1 vtk-9.3.2_1
+libvtkIOChemistry-9.3.so.1 vtk-9.3.2_1
+libvtkInteractionStyle-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersAMR-9.3.so.1 vtk-9.3.2_1
+libvtkIOMINC-9.3.so.1 vtk-9.3.2_1
+libvtkTestingRendering-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.2_1
+libvtkDomainsChemistry-9.3.so.1 vtk-9.3.2_1
+libvtkIOExport-9.3.so.1 vtk-9.3.2_1
+libvtkIOCore-9.3.so.1 vtk-9.3.2_1
+libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.2_1
+libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.2_1
+libvtkIOLegacy-9.3.so.1 vtk-9.3.2_1
+libvtkRenderingFreeType-9.3.so.1 vtk-9.3.2_1
+libvtkIOPLY-9.3.so.1 vtk-9.3.2_1
+libvtkIOExodus-9.3.so.1 vtk-9.3.2_1
+libvtkkissfft-9.3.so.1 vtk-9.3.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
From 51a4ee4b2f92e83b559412d947e02a051899f194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 26/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (3 preceding siblings ...)
2025-04-19 22:17 ` dkwo
@ 2025-04-19 22:25 ` dkwo
2025-04-19 22:35 ` dkwo
` (49 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 36635 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d093d3ea2c6ad160bea350001a451f9683b8fca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt-11.0.2
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..a0f7607b39e2ad 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
From ec47e2fc4c0d13ee7733d0871be2444dd4ad09c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 17d2fd8977e8db7cc644d0fd65fc971247eedf0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From d08ebe7c22b94b4a40314f912c89f53c250d758c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fa5ce15916508a21046f2d0d6a2add3bd42c0ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 35ed7ee253af3d1e6004261a8054c0c0731036e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From e3394a45060bb136efd2ab680b61c1b5d266542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 1a74773087cc350cb92973da371682263b8c87e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 646aba2cdcd115b2a1f57f1bedcb4b51e29f5c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 9ab91925f647e2ba199820680f36d7587bcd07a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 1cf87c6951367d3488c4b24bdd1e1978afe3b050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From e3eb41e360aad2423e3fe136e946c21ae7d0e111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.2.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..20df4f404f5f55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.2.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From ddca4300cac4ee0c4d6bc969ff4f0c5e84342e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: rebuild for fmt-11.0.2
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From cc9e417fc66ae73d4b1ac66e2cc8d2eb87651562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 21fdc07441d9a49eda7c6ff3a049813135257f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5ce17089ad1a0ba33f9260ec36796d424bc0aba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 222d303dcba9c75d83f760b23a2dd90be4792c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: rebuild for fmt-11.0.2
---
...869715e3efca87942d79c3173a6b21a6925d.patch | 79 +++++++++++++++++++
srcpkgs/mpd/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
diff --git a/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
new file mode 100644
index 00000000000000..f6d8c7d3376906
--- /dev/null
+++ b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..7fcf0a743e8aab 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.15
-revision=4
+revision=5
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 3a8179e32b05ea93cd1a9b172d9dd80a19baf4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From ee25819d74ef85e6caba1edc12919fdeb735d269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b757a8e37f099a7ea3d8f3f71ecf12eef4a3247f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 6c63f863f614e4757ad274b2a03e68f81595c8b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt-11.0.2
---
srcpkgs/paps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From d5c4b38d971a3bb7ae7e031df97d933d243623d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.14.1.
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..e23866f2c94a93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.14 libspdlog-1.14.1_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..fb073f81fceca4 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.14.1
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 3173755822877e9ee2732843dc899b988ee365c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 4f30cf0bac6152eb05fe96b2c1c9608453312f14 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: bump for fmt
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (4 preceding siblings ...)
2025-04-19 22:25 ` dkwo
@ 2025-04-19 22:35 ` dkwo
2025-04-19 23:09 ` dkwo
` (48 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 36634 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d093d3ea2c6ad160bea350001a451f9683b8fca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt-11.0.2
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..a0f7607b39e2ad 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
From ec47e2fc4c0d13ee7733d0871be2444dd4ad09c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 17d2fd8977e8db7cc644d0fd65fc971247eedf0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From d08ebe7c22b94b4a40314f912c89f53c250d758c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fa5ce15916508a21046f2d0d6a2add3bd42c0ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 35ed7ee253af3d1e6004261a8054c0c0731036e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From e3394a45060bb136efd2ab680b61c1b5d266542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 1a74773087cc350cb92973da371682263b8c87e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 646aba2cdcd115b2a1f57f1bedcb4b51e29f5c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 9ab91925f647e2ba199820680f36d7587bcd07a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 1cf87c6951367d3488c4b24bdd1e1978afe3b050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From e3eb41e360aad2423e3fe136e946c21ae7d0e111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.2.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..20df4f404f5f55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.2.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From ddca4300cac4ee0c4d6bc969ff4f0c5e84342e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: rebuild for fmt-11.0.2
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From cc9e417fc66ae73d4b1ac66e2cc8d2eb87651562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 21fdc07441d9a49eda7c6ff3a049813135257f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5ce17089ad1a0ba33f9260ec36796d424bc0aba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 222d303dcba9c75d83f760b23a2dd90be4792c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: rebuild for fmt-11.0.2
---
...869715e3efca87942d79c3173a6b21a6925d.patch | 79 +++++++++++++++++++
srcpkgs/mpd/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
diff --git a/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
new file mode 100644
index 00000000000000..f6d8c7d3376906
--- /dev/null
+++ b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..7fcf0a743e8aab 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.15
-revision=4
+revision=5
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 3a8179e32b05ea93cd1a9b172d9dd80a19baf4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From ee25819d74ef85e6caba1edc12919fdeb735d269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b757a8e37f099a7ea3d8f3f71ecf12eef4a3247f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 6c63f863f614e4757ad274b2a03e68f81595c8b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt-11.0.2
---
srcpkgs/paps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From fba5a3c2556621386b76e6b295977b76241eac80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..289f61344dac87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 53940a934b40abd434dcdcec15989e1b559f0e27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 6f741bed68a3d21e0f1cbbfaa62c6329e2fac3db Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: bump for fmt
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (5 preceding siblings ...)
2025-04-19 22:35 ` dkwo
@ 2025-04-19 23:09 ` dkwo
2025-04-19 23:46 ` dkwo
` (47 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 23:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 41226 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/30] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/30] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d093d3ea2c6ad160bea350001a451f9683b8fca5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/30] 0ad: rebuild for fmt-11.0.2
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..a0f7607b39e2ad 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
From ec47e2fc4c0d13ee7733d0871be2444dd4ad09c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/30] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 17d2fd8977e8db7cc644d0fd65fc971247eedf0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/30] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From d08ebe7c22b94b4a40314f912c89f53c250d758c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/30] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fa5ce15916508a21046f2d0d6a2add3bd42c0ef3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/30] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 35ed7ee253af3d1e6004261a8054c0c0731036e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/30] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From e3394a45060bb136efd2ab680b61c1b5d266542f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/30] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 1a74773087cc350cb92973da371682263b8c87e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/30] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 646aba2cdcd115b2a1f57f1bedcb4b51e29f5c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/30] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 9ab91925f647e2ba199820680f36d7587bcd07a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/30] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 1cf87c6951367d3488c4b24bdd1e1978afe3b050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/30] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From e3eb41e360aad2423e3fe136e946c21ae7d0e111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/30] gerbera: update to 2.2.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..20df4f404f5f55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.2.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From ddca4300cac4ee0c4d6bc969ff4f0c5e84342e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/30] gnuradio: rebuild for fmt-11.0.2
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From cc9e417fc66ae73d4b1ac66e2cc8d2eb87651562 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/30] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 21fdc07441d9a49eda7c6ff3a049813135257f7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/30] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5ce17089ad1a0ba33f9260ec36796d424bc0aba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/30] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 222d303dcba9c75d83f760b23a2dd90be4792c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/30] mpd: rebuild for fmt-11.0.2
---
...869715e3efca87942d79c3173a6b21a6925d.patch | 79 +++++++++++++++++++
srcpkgs/mpd/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
diff --git a/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
new file mode 100644
index 00000000000000..f6d8c7d3376906
--- /dev/null
+++ b/srcpkgs/mpd/patches/1402869715e3efca87942d79c3173a6b21a6925d.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..7fcf0a743e8aab 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.15
-revision=4
+revision=5
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 3a8179e32b05ea93cd1a9b172d9dd80a19baf4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/30] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From ee25819d74ef85e6caba1edc12919fdeb735d269 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/30] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b757a8e37f099a7ea3d8f3f71ecf12eef4a3247f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/30] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 6c63f863f614e4757ad274b2a03e68f81595c8b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/30] paps: rebuild for fmt-11.0.2
---
srcpkgs/paps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From fba5a3c2556621386b76e6b295977b76241eac80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/30] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..289f61344dac87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 53940a934b40abd434dcdcec15989e1b559f0e27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/30] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 6f741bed68a3d21e0f1cbbfaa62c6329e2fac3db Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/30] vtk: bump for fmt
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
From 8e3d02f9fc891b17bcc94307bcb6c731f9cbd0aa Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:48:04 -0400
Subject: [PATCH 27/30] paps: mark broken
---
srcpkgs/paps/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 71a802089a7c14..06a6a3b388bd0c 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -12,3 +12,4 @@ homepage="https://github.com/dov/paps"
distfiles="https://github.com/dov/paps/archive/v${version}.tar.gz"
checksum=8fd8db04e6f8c5c164806d2c1b5fea6096daf583f83f06d1e4813ea61edc291f
python_version=3
+broken="error: invalid conversion from 'const char*' to 'char*' [-fpermissive]"
From 818e8433881777fb3bc0de388bbd85d77633fb9b Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:53:45 -0400
Subject: [PATCH 28/30] Revert "vtk: bump for fmt"
This reverts commit 6f741bed68a3d21e0f1cbbfaa62c6329e2fac3db.
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 0c93f9a1ea7015..6964c221b92f8f 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=4
+revision=3
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
From 7d9c0d60c0e4fc6c6d2919adbc285a713c7f749a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:54:12 -0400
Subject: [PATCH 29/30] Revert "android-tools: update to 35.0.2"
This reverts commit fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d.
---
srcpkgs/android-tools/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 6970f39a7e9b38..09625d11a5ae77 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,13 +1,11 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=35.0.2
-revision=1
+version=34.0.5
+revision=2
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-# requires new changes in libusb that have not been released yet
-configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
-hostmakedepends="perl go protobuf pkg-config samurai"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
+hostmakedepends="perl go protobuf pkg-config"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -15,13 +13,11 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
-
-case "${XBPS_TARGET_MACHINE}" in
- i686*) CXXFLAGS="-msse2";;
-esac
+checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
post_install() {
+ # zsh's built in works, while this one doesn't
+ rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 05641362d92eadf2f8385f2f20a13e04c6c24750 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 19:08:57 -0400
Subject: [PATCH 30/30] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 20df4f404f5f55..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,6 +1,6 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=2.2.0
+version=2.5.0
revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (6 preceding siblings ...)
2025-04-19 23:09 ` dkwo
@ 2025-04-19 23:46 ` dkwo
2025-04-20 14:50 ` dkwo
` (46 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-19 23:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 39281 bytes --]
From cd68d4058655ca8602cb4325df8e74090b076219 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/28] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/28] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 99cc2013977ff537baabeeafb6577829c0fb3d1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/28] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 3d1354bee0452d6e52a85ebebb887471b773dddf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/28] Bear: rebuild for fmt-11.0.2
---
...afe61299c87449023d63336389f159b55808.patch | 55 +++++++++++++++++++
srcpkgs/Bear/template | 2 +-
2 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
diff --git a/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
new file mode 100644
index 00000000000000..0603c34719b655
--- /dev/null
+++ b/srcpkgs/Bear/patches/8afeafe61299c87449023d63336389f159b55808.patch
@@ -0,0 +1,55 @@
+From 8afeafe61299c87449023d63336389f159b55808 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Sun, 14 Jul 2024 08:47:53 +0800
+Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt::join() was moved into fmt/ranges.h since fmt v11, so include
+this header for using fmt::join(). otherwise, we'd have following
+compilation failure when building Bear with fmt v11 and up:
+
+```
+/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
+ 255 | fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
+ | ^~~~
+```
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ source/citnames/source/semantic/Parsers.h | 1 +
+ source/citnames/source/semantic/Semantic.cc | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
+index 90e64f9e..34203a17 100644
+--- a/source/citnames/source/semantic/Parsers.h
++++ b/source/citnames/source/semantic/Parsers.h
+@@ -30,6 +30,7 @@
+ #include <optional>
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+
+ namespace cs::semantic {
+
+diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
+index da762956..54d3e62d 100644
+--- a/source/citnames/source/semantic/Semantic.cc
++++ b/source/citnames/source/semantic/Semantic.cc
+@@ -21,6 +21,7 @@
+ #include "semantic/Semantic.h"
+
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #ifdef HAVE_FMT_STD_H
+ #include <fmt/std.h>
+ #else
+@@ -133,4 +134,4 @@ namespace cs::semantic {
+ }
+ return results;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From dff3bb6bac13144105438907454cf81d1353c5ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/28] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From eb0f74144aa954055de9fc413c775d666b17e790 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/28] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From f3eb010ddba1b2cf2003b3387d311892a40c94ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/28] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 315ae347a1b3a511c38b34a1e575a2e20a192f8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/28] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From b8d382d2b7c6286c913f12c8b11bef34c6b5f25a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/28] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 3dd94dd07e21a74fc69217578e96798011e24a4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/28] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From c5681630ce9f1c732abfd38dcbfe3e7f3eda32e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/28] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 531453555e13d593ccba0bd01c18b5c3bf74ce64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/28] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 4d50dda6e9d1e5437d8bc98edfa288b391b588c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/28] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From a862adc7fbc31b106083398aafa1b50e881b44c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/28] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From a9590280e01f77993751a1d9827771d015a613ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/28] gnuradio: rebuild for fmt-11.0.2
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..f907992afa3562 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.11.0
-revision=4
+revision=5
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
From 4fad8ff8e5c7556c950f4927d6701283b617ad12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/28] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From fe70882b42b8c17da49602e0b0850518d232ed6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/28] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 35d6f0d96fce01dc9dd1beb0a5e6dd3778ec0442 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/28] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From a09dc89c93fe5e5f649640bdcfcda053fedcbe23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/28] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 57344de03ccb13ea4d58f1a0557b282aea17b293 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/28] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From b4db9e43dca5766398e64ead2aca2ea2512139ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/28] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 1bc8adec40a72619400e47aee75293c359f071be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/28] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 30548d3838c459c48465d16ce6024e16ba3a7cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/28] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 0cb28f5954fbcb405cf755407b52975c5719e1ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/28] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..289f61344dac87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 102096e967cf50d19a0710beab4a417739af8eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/28] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 4163c3e2013c5372d44c6a738c6d48841a7f7c4a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/28] vtk: bump for fmt
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
From b95dcc5f3392e6c712223fcafe44b820cf82c48c Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:53:45 -0400
Subject: [PATCH 27/28] Revert "vtk: bump for fmt"
This reverts commit 6f741bed68a3d21e0f1cbbfaa62c6329e2fac3db.
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 0c93f9a1ea7015..6964c221b92f8f 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=4
+revision=3
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
From 4ccbf018c6127a84a8cef1ad71f1d5061470b7a6 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:54:12 -0400
Subject: [PATCH 28/28] Revert "android-tools: update to 35.0.2"
This reverts commit fe6a1b0ebb3239e9760bacf880eb6dc7fbfbaa4d.
---
srcpkgs/android-tools/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 6970f39a7e9b38..09625d11a5ae77 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,13 +1,11 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=35.0.2
-revision=1
+version=34.0.5
+revision=2
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-# requires new changes in libusb that have not been released yet
-configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
-hostmakedepends="perl go protobuf pkg-config samurai"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
+hostmakedepends="perl go protobuf pkg-config"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -15,13 +13,11 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
-
-case "${XBPS_TARGET_MACHINE}" in
- i686*) CXXFLAGS="-msse2";;
-esac
+checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
post_install() {
+ # zsh's built in works, while this one doesn't
+ rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (7 preceding siblings ...)
2025-04-19 23:46 ` dkwo
@ 2025-04-20 14:50 ` dkwo
2025-04-20 18:30 ` dkwo
` (45 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-20 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 37194 bytes --]
From 6989ce0d54abc9683f5eaa19f1227070b11e50df Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 8aa061a74962acfda798f27fe5d73d851963e8ed Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From a9a85b2a3c1298ba6820f3d872ee8ce9e373ad5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 566a54e320d36c6b6a2a1bd298c72440842b608a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 23fa2da24c2e0564ac6adb3ca74c27a28afeccce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From b704335fd315f38d42739da93206314a9877f3a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From f86b9aff3756c8cc2b8129c3f605b93ea391a00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From dc46abf05311c7d35d29228ee8ec545bf924dd5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 80a563c599bb340e2e335c82389ebde187a9b8e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From eaba4089029c593c85b62d3a7ba63ec2a44e2185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 068f1370f07ce75ad6100b9449edc50deb36fc9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 24434b3fb7e47307797cc866fbbafee5ac08b705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From d44ee1c28624b548a6c0b6c5ead6fd534c8d0b06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 7711a5c90bf25473c56a6d300cdd83daec2c248e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 33f63ca423e4c2085b59dc37107fe4e3a7669cdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..18be86c402bf84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3315,28 +3315,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 6079761b38a2e2c0ef6f8404b7919ced6bd0dd9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 07efd22665e43465e0aadbd477de1f7e184c61b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 8e0c32f692cb55be4a3e9c43eceb53462ab32762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From e935cb04bf224701fc19f452eb2f5d7c812e38a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From bc5427b5c567c8014935d541443a8fe35683fb25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 6a843032abd4ce236ffdcd777c8fa5b88ad7ffc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 87210880f6f02b8c601c14a092caa0ec6e90888e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From e27d9aeb50570578ce94f5570b678d89ba2e92f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 9c2905c0d422e248282da30b2128458b2febc8ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 18be86c402bf84..651f9e334e3363 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 86c4f43b2a35f9e06415075bd62ccdb77d4f6950 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 93f22f0927298df3cb0c7a021ea1cbd007375fda Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: bump for fmt
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (8 preceding siblings ...)
2025-04-20 14:50 ` dkwo
@ 2025-04-20 18:30 ` dkwo
2025-04-20 19:01 ` dkwo
` (44 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-20 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. I see you have a prior attempt at fmt. Shall I pull in the bumps from there?
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 37771 bytes --]
From 6989ce0d54abc9683f5eaa19f1227070b11e50df Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 8aa061a74962acfda798f27fe5d73d851963e8ed Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From a9a85b2a3c1298ba6820f3d872ee8ce9e373ad5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 566a54e320d36c6b6a2a1bd298c72440842b608a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 23fa2da24c2e0564ac6adb3ca74c27a28afeccce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From b704335fd315f38d42739da93206314a9877f3a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From f86b9aff3756c8cc2b8129c3f605b93ea391a00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From dc46abf05311c7d35d29228ee8ec545bf924dd5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 80a563c599bb340e2e335c82389ebde187a9b8e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From eaba4089029c593c85b62d3a7ba63ec2a44e2185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 068f1370f07ce75ad6100b9449edc50deb36fc9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 24434b3fb7e47307797cc866fbbafee5ac08b705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From d44ee1c28624b548a6c0b6c5ead6fd534c8d0b06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 7711a5c90bf25473c56a6d300cdd83daec2c248e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 33f63ca423e4c2085b59dc37107fe4e3a7669cdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..18be86c402bf84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3315,28 +3315,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 6079761b38a2e2c0ef6f8404b7919ced6bd0dd9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 07efd22665e43465e0aadbd477de1f7e184c61b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 8e0c32f692cb55be4a3e9c43eceb53462ab32762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From e935cb04bf224701fc19f452eb2f5d7c812e38a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From bc5427b5c567c8014935d541443a8fe35683fb25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 6a843032abd4ce236ffdcd777c8fa5b88ad7ffc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 87210880f6f02b8c601c14a092caa0ec6e90888e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From e27d9aeb50570578ce94f5570b678d89ba2e92f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 9c2905c0d422e248282da30b2128458b2febc8ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 18be86c402bf84..651f9e334e3363 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 86c4f43b2a35f9e06415075bd62ccdb77d4f6950 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 88075a6e59d5aa66b9548fa3f1820f680f275915 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: use vendored fmt (otherwise it fails)
---
srcpkgs/vtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..ab6a0c0d83318d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -21,7 +21,7 @@ makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
libXt-devel libjpeg-turbo-devel tiff-devel hdf5-devel netcdf-devel
libxml2-devel jsoncpp-devel libogg-devel libtheora-devel
eigen double-conversion-devel glew-devel pugixml-devel sqlite-devel
- gl2ps-devel proj-devel python3-devel json-c++ fmt-devel"
+ gl2ps-devel proj-devel python3-devel json-c++"
short_desc="System for 3D computer graphics, image processing, and visualization"
maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (9 preceding siblings ...)
2025-04-20 18:30 ` dkwo
@ 2025-04-20 19:01 ` dkwo
2025-04-20 23:28 ` dkwo
` (43 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-20 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted from your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 38543 bytes --]
From 6989ce0d54abc9683f5eaa19f1227070b11e50df Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 8aa061a74962acfda798f27fe5d73d851963e8ed Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From a9a85b2a3c1298ba6820f3d872ee8ce9e373ad5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 566a54e320d36c6b6a2a1bd298c72440842b608a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 23fa2da24c2e0564ac6adb3ca74c27a28afeccce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From b704335fd315f38d42739da93206314a9877f3a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From f86b9aff3756c8cc2b8129c3f605b93ea391a00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From dc46abf05311c7d35d29228ee8ec545bf924dd5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 80a563c599bb340e2e335c82389ebde187a9b8e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From eaba4089029c593c85b62d3a7ba63ec2a44e2185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 068f1370f07ce75ad6100b9449edc50deb36fc9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 24434b3fb7e47307797cc866fbbafee5ac08b705 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From d44ee1c28624b548a6c0b6c5ead6fd534c8d0b06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 7711a5c90bf25473c56a6d300cdd83daec2c248e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 33f63ca423e4c2085b59dc37107fe4e3a7669cdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..18be86c402bf84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3315,28 +3315,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 6079761b38a2e2c0ef6f8404b7919ced6bd0dd9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 07efd22665e43465e0aadbd477de1f7e184c61b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 8e0c32f692cb55be4a3e9c43eceb53462ab32762 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From e935cb04bf224701fc19f452eb2f5d7c812e38a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From bc5427b5c567c8014935d541443a8fe35683fb25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 6a843032abd4ce236ffdcd777c8fa5b88ad7ffc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 87210880f6f02b8c601c14a092caa0ec6e90888e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From e27d9aeb50570578ce94f5570b678d89ba2e92f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 9c2905c0d422e248282da30b2128458b2febc8ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 18be86c402bf84..651f9e334e3363 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 86c4f43b2a35f9e06415075bd62ccdb77d4f6950 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 079762f4b2faf241d1ba1cc90084b8e1493bb8e5 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: patch for fmt
---
srcpkgs/vtk/patches/fmt-11.patch | 22 ++++++++++++++++++++++
srcpkgs/vtk/template | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..0c93f9a1ea7015 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.3.1
-revision=3
+revision=4
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (10 preceding siblings ...)
2025-04-20 19:01 ` dkwo
@ 2025-04-20 23:28 ` dkwo
2025-04-20 23:53 ` dkwo
` (42 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-20 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted from your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 61840 bytes --]
From 0f1c74cf16c3a0b5fbeca64586703b3b05e67e6a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 9d534eed685ba8d34b9d6144e8742fa111206f75 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 5a09d2843e0504b5dc87b8b17c826d89ad632ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 29ef3528147fb296c05b962e9af04048af08850d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 21ce2f28a16830ba39d9445749de8a0f5716fe70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 5ce4b9937854e6315ab19f22cb734b72d1398654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From ee6973f6212ebd205db3b00ac9017329fc6a490e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From c945bd026512ca68a902ae6c704488cd9bb53c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 10a4ffe0f112384d330812876c847911c549a6ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From bcda48d7d10a7e747a83df478c136d820ebde46d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 5e3dc6317db750f48197d87441fcd7b16555751d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 86c3a036d12089f65204c6ecd65a76788a629658 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 93fbab77ef8dd23d84fbd84bfcfb910a5cd666eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 1d6e13c40d464751175a4ff995a413e109311a42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From e39c2827f0609eea61f2f945ae941dfb86dfa0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..18be86c402bf84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3315,28 +3315,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From d7201c6fc4ab5748e5ca991f8c71fee49a13ca46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From e326fe025971a21ba1dcbfd7c28403fe84d76db2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 9bf6709cb9953389ce10c52edde5e0b5d3d44342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From ad645d9186b3667c4772e91fc27d5db72b27fe10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From a7bc3f75171636a61cb2dc49ceeb47e1f92f8386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 1a8d60c9a7d0411558a3a99e8949e17a81182fed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 078cc4a21cc73110c132918ea9a2f4c34a8950d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 92e40afd5847bdf853c2ca458c98d106ab6dd608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 84f6a4554e4d186ff4f7a0e6b432a27f55246b33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 18be86c402bf84..651f9e334e3363 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From fc8856186fd7bf0810c454f55a978bb7822256f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 8518c691f22905f160ddcb91927c2093ce7fb9ec Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
srcpkgs/vtk/patches/0001-stat64.patch | 390 --------------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 -----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/template | 6 +-
4 files changed, 25 insertions(+), 563 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..73bfa8b7d814de 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -27,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (11 preceding siblings ...)
2025-04-20 23:28 ` dkwo
@ 2025-04-20 23:53 ` dkwo
2025-04-21 17:00 ` dkwo
` (41 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-20 23:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted from your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 62939 bytes --]
From 0f1c74cf16c3a0b5fbeca64586703b3b05e67e6a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..f424a91bd329b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 9d534eed685ba8d34b9d6144e8742fa111206f75 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 5a09d2843e0504b5dc87b8b17c826d89ad632ea6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 29ef3528147fb296c05b962e9af04048af08850d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 21ce2f28a16830ba39d9445749de8a0f5716fe70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 5ce4b9937854e6315ab19f22cb734b72d1398654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From ee6973f6212ebd205db3b00ac9017329fc6a490e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From c945bd026512ca68a902ae6c704488cd9bb53c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 10a4ffe0f112384d330812876c847911c549a6ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From bcda48d7d10a7e747a83df478c136d820ebde46d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 5e3dc6317db750f48197d87441fcd7b16555751d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 86c3a036d12089f65204c6ecd65a76788a629658 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 93fbab77ef8dd23d84fbd84bfcfb910a5cd666eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 1d6e13c40d464751175a4ff995a413e109311a42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From e39c2827f0609eea61f2f945ae941dfb86dfa0d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f424a91bd329b7..18be86c402bf84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3315,28 +3315,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From d7201c6fc4ab5748e5ca991f8c71fee49a13ca46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From e326fe025971a21ba1dcbfd7c28403fe84d76db2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 9bf6709cb9953389ce10c52edde5e0b5d3d44342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From ad645d9186b3667c4772e91fc27d5db72b27fe10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From a7bc3f75171636a61cb2dc49ceeb47e1f92f8386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 1a8d60c9a7d0411558a3a99e8949e17a81182fed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 078cc4a21cc73110c132918ea9a2f4c34a8950d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 92e40afd5847bdf853c2ca458c98d106ab6dd608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 84f6a4554e4d186ff4f7a0e6b432a27f55246b33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 18be86c402bf84..651f9e334e3363 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From fc8856186fd7bf0810c454f55a978bb7822256f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From aa06c476f1f89471f8c07470e4e5375058df944d Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 6 +-
5 files changed, 25 insertions(+), 589 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..73bfa8b7d814de 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -27,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (12 preceding siblings ...)
2025-04-20 23:53 ` dkwo
@ 2025-04-21 17:00 ` dkwo
2025-04-21 21:18 ` dkwo
` (40 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-21 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes, needed recent fastboot to install grapheneos on new phone.
- I built this PR locally for my native architecture, (x86_64-glibc)
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted from your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 63322 bytes --]
From f244bd9ee497301b4ee5cc36b1984817b9e79773 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 38c9c2656ae2f0..988ad3553fbd69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From da9c9bf3a79087ecd7224e381b7df78c4aba81da Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 1fd9d50f76aa072d3b9810bb2ef242301ca717c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 76c702d429a5da20db0fcb6a46764cdbccdd3f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From f465cd62354d7c868fa3e70306cac556b7a1a4c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e19263a815040a73df03869cf8f8569de988b7f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fdc99cacfa96a8fb930c292f01b24235a9594cc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 86716cb77c97aa584422efb111cb209409bf6f70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From ba54103d6f6df4fd66a818da7485777dbb631498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 47922111f69ed80c5b0fb408f4872197a705af58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 3d4a71231ad7493b8427a2b5aa1f46e74f91d81b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From d6104f13bf1d783fed35fbdadf123e2f497165c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: rebuild for fmt-11.0.2
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From 3e1f067ff129eda1a6d033dae695a01fa888f5bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 2120152d09a64f0d086999b7dbf058fdecea0a7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 704795d7f5fc59a02579800ac55044944a012494 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 988ad3553fbd69..eae1ebcc3a60d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From d3feec85b8ef21382fb5ccba0c6e37e8d7847b80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 18c44e08d055a7f757c00a20c124331342ac11ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 9f739484528baab0787b7100098e0f09f6d96f78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 04b469a6ef400f43efdb374e4e123596d57a2777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 066fcd77adee2fcb2082729e63411f4e2b2ab27a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From a446d01221418aee7de1426659e47c3efeddfd6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 50b437f94a4fad0fc98f3b243afb99e818051098 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 1e974c0d8b6805a369772ab530e9ecc7922f2f64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 8fa72c1f1f795d57829781e75c33ecff7c37ee83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index eae1ebcc3a60d4..39e9ade5f2e9c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 306b2fba4fdadcdb0bcd5037a6b171c9a6ed9049 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 47b2372c8ca0fd146fc002434618edd7de14f9b6 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
5 files changed, 26 insertions(+), 589 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (13 preceding siblings ...)
2025-04-21 17:00 ` dkwo
@ 2025-04-21 21:18 ` dkwo
2025-04-22 1:15 ` dkwo
` (39 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-21 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used android-tools on x86_64-glibc, built everything (except for kodi) natively on aarc64-glibc.
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 66829 bytes --]
From f244bd9ee497301b4ee5cc36b1984817b9e79773 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 38c9c2656ae2f0..988ad3553fbd69 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From da9c9bf3a79087ecd7224e381b7df78c4aba81da Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 1fd9d50f76aa072d3b9810bb2ef242301ca717c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 76c702d429a5da20db0fcb6a46764cdbccdd3f41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From f465cd62354d7c868fa3e70306cac556b7a1a4c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e19263a815040a73df03869cf8f8569de988b7f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From fdc99cacfa96a8fb930c292f01b24235a9594cc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 86716cb77c97aa584422efb111cb209409bf6f70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From ba54103d6f6df4fd66a818da7485777dbb631498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 47922111f69ed80c5b0fb408f4872197a705af58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 3d4a71231ad7493b8427a2b5aa1f46e74f91d81b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From c1d9fd6d62d130850ac5764d92d0dd40a5556683 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..8b9e44300ce144 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
From a2c10601a4a171737065a9c732eea25981e08844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From fc923b0b31beca38f2ddd87e16a620de922c6ece Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 6e08bc1fa297b88d60620a2119cd176cc38b65fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 988ad3553fbd69..eae1ebcc3a60d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 649978a32ab148d5131627e909068417043e0c72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 1769d0a45084a37c95de4ffa5b8afe2a636a6cad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From e0b07499c099d01bb26be6f964526572cc0124d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From ce81158a90c74e490664d40a339247bc28116a72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 414a4963dd45bfdb05b2c8d29fd021d4a775b7fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From e4fe96a405d1863187a1053a58ff0b6a41d6932b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From cf1ab9d62e0734db68cc6469d45230e05947b9db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 00c69bafd8eec37472b67841f3db5d9b9e79083e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 913f44e227b37fe78b827d6c2ad9daf048103bba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index eae1ebcc3a60d4..39e9ade5f2e9c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 2ed549b5a8ac7674357fd3ec1b1b71ffe6467b20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From b4b6a0a3e8d07a4eadd1835c6b0bcfd8f1d42bb6 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
5 files changed, 26 insertions(+), 589 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (14 preceding siblings ...)
2025-04-21 21:18 ` dkwo
@ 2025-04-22 1:15 ` dkwo
2025-04-22 15:01 ` dkwo
` (38 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-22 1:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used android-tools on x86_64-glibc, built everything (except for kodi) natively on aarc64-glibc.
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 67426 bytes --]
From a1dc4608da308bf0c91a47377772e69d1a8695dd Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 356a859383f37e..7334a2070dcbd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 7e85aa8f29a6994341440a03da8dea380c171041 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 77c589e757fbd1d0124f72d3cf7785a7d2c29061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 927058afe13f46742aa536f9dca8959735f3d726 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 5c3f8444a9313b7f4207418152806379bc11e3aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt-11.0.2
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e2422ec3cd19154c271b7570bd14d7fa2950411f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt-11.0.2
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 39f186040d5f0b6ab3411ddb1de9548518aafa21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt-11.0.2
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 4f0d07974bfe4e8068c1d36b6a288fa353d99ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 07cf4d19755eac9827ae5d766ef72ee4b8fc1731 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt-11.0.2
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From c95a99f6fb7372b9f73825d99c7c5af7820541e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 83461cdf49689a7dcb2f0e0aaf27685578d26c4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt-11.0.2
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From b779a3ca535119c09c291da4a6b7e15ad38dc499 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From aacbdfa3d739506e505a190d01cb5f80d5f97e80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt-11.0.2
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 82c68abf444a505f7630c2ef5ebbbc27712970d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 57c2de587133f8216d324da5fda32293b72d8120 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7334a2070dcbd9..11afdd33c6610f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From acba11488bbd6fd3bb8d9612456e3b9801bc6d98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt-11.0.2
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From be28a5085ee79aeee2fcc38592f90edda85e3fb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt-11.0.2
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5c2c9f2d42d4695fc2f109229061406d54ed7df3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt-11.0.2
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 0fbde49e7b0c4eee9972293098dbe8af95d6082f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 988d1b15cc2328471158fa3a992387ea2719383a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt-11.0.2
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 04b19f8da24684b23ddcb011f8a27aa1a2e518e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt-11.0.2
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 3c2ea628629ef509fbbfe8ce6028c153144191cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt-11.0.2
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 28e2ae5897d2c96a25e6b35d5661798f1761d80a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 61ef70150c2b91b59beb9d888b964dad2f08256f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11afdd33c6610f..b99da445c23fa8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From f2ad259776dca708452a414e608b5609b014f2ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt-11.0.2
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From a4baebd5922ba13bed9ed8722eb4e1e8ece9560a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
5 files changed, 26 insertions(+), 589 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (15 preceding siblings ...)
2025-04-22 1:15 ` dkwo
@ 2025-04-22 15:01 ` dkwo
2025-04-22 18:32 ` dkwo
` (37 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-22 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used android-tools on x86_64-glibc, built everything (except for kodi, freecad) natively on aarc64-glibc.
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 77045 bytes --]
From 0aa3ea17ab20913b4071a422672b1b6ab4291e0f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From b543e5489fdc51e295b3d5c83b44273d89fa6c3c Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 2c38d76d0297477c10724136d9c2387cdc370598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 9ee5628a9a02862ae6c04d59997a1dadbe3b3c73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 3734b2643f234e63cda3a3c092b9b55eeec002f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e98286c99eca4d379d547321c99fbba2135bd47c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 1a7d56c6f7bd1a5a4db26d4fd393890d491eb140 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From bdce68455347f4437f0d8d31d3d7aab5fe7a6b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 34caed6d8fd03c39bf643ea30fa7e1a09d9ff47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 0bd57add9cb5b01d7f222a5a1e4a8c3902467f6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.3.
---
srcpkgs/devilutionX/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..c052c2518fcd8c 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.3
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -13,8 +13,8 @@ license="Unlicense"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From caa15a4ab8f4781857dbac29e40d53cb12f1903f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From d760ae3d1b46a4dc7e3e169a51dc1cf938023e39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From e4230fffe2fe3332ecd92be6e7a9a865ddd46d43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From e813566ef2548b6eab33f26bcdf29f8cc118cf05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From bb2a0872b4b90b86a66885045da4c0fddbefb9cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 127f89fbdb1b418f699e192a2dcc4ba9f00f7322 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 3ca694eb7bddd80678107f463ef2e1309c0ad15b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From e8200191c185e0238258afe5a801ac2022954b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 7c3a78ba8253bd28b8a72eb881e37b3a2ea8e9ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 970d5b1a25ed8eac04692a221d59f2b1bba9df9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 7d8f368bcadc87f8814a970f3af5b488ffe140b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From f390d1012d15fa0f8d81569c73cdc131b142f7af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 1dff21e7ee74fd2073e03fe062c7be64a99a9c1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From dd281263a1c8edfc2d219b0ac299f6dd66d5642a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 20e3faf12bae6312834f535f0624529f6735a1f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 65fdfa390590a5ed8e32433e46d634d76d934b52 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (16 preceding siblings ...)
2025-04-22 15:01 ` dkwo
@ 2025-04-22 18:32 ` dkwo
2025-04-22 20:24 ` dkwo
` (36 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-22 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2822156472
Comment:
`devilutionX` has one test failure for i686: `205 - Timedemo.WarriorLevel1to2 (Failed)`.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (17 preceding siblings ...)
2025-04-22 18:32 ` dkwo
@ 2025-04-22 20:24 ` dkwo
2025-04-22 20:53 ` [PR PATCH] [Updated] " dkwo
` (35 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-22 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2822156472
Comment:
`devilutionX` has one test failure `205 - Timedemo.WarriorLevel1to2 (Failed)`.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (18 preceding siblings ...)
2025-04-22 20:24 ` dkwo
@ 2025-04-22 20:53 ` dkwo
2025-04-23 14:27 ` dkwo
` (34 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-22 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used android-tools on x86_64-glibc, built everything (except for kodi, freecad) natively on aarc64-glibc.
cc @Johnnynator I had to add fmt to android-tools. Edit: adapted your prior pr, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 78055 bytes --]
From 00537462c0dcb75af61aa939a27cd514d6b81d6a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From f5f9ae699baa296dcb8f8d9675bc34eacede850f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 8f85b16bbdc0a7c8986fefe33634bde17d8fe58d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 55cda14862893f8fb741506d1bf40f23d56914ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 7b99241640dc0670cd632249944bd3aa74289398 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 8055d6b8e9cff42ceb40aecd38aa3e6d5a1d5a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 7dce2a0448f8e1ac6e6c4f3f99bd9320e3e5f4e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 912de9985681e290e4b5a39d76af92d8d62b1842 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 33e496e71c123c3bef63d9caa678bc7a31b079f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 7bca54ddad3a4963e77623a3cd01a5e714646061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..df2916f96ce1cd 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 780e9d8fe7a33e221b7d8eb04fe6df51299a5b0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 30a1ebb409ed49112925e9d3e8cc9717a7074784 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 44c5e8266589d11ed9536ff0d9e1483fd3976fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 611634ca4ea1d80a522c60730ca1d631e19a5ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From defa9ff286e2c89a8ef3221fa8f697cf7cb2c8c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 7c421dffc69e0f8f2baabbb0ac43132516cd4b3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 89a9af9b2d387cd555ed5d5820445fabc470fb77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 4fe5984e02582e8a0a7729acb9fd6a3c8b57958b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From bfa0b992c89518787235ab1269073b8a604e3209 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 9fbb9036717736f759c918cd38e9308e3d734777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From d659066051eef7979630693047eecfedbf6775f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 5a41d5352e543e830fba81971a4bae87ce25be57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 35e368dafa54c0218610c50bfb5147ee586032c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From fec030daac82e0b6fc54a03c559023f9e7e8905c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 159cfecf1a813750de3e6078271ad8d425bf9120 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 61e6198107d72239be5f197745aef9417a2e0557 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (19 preceding siblings ...)
2025-04-22 20:53 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-23 14:27 ` dkwo
2025-04-23 16:53 ` [PR PATCH] [Updated] " dkwo
` (33 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-23 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2824505494
Comment:
Hmm, `ERROR: SHA256 mismatch for 'devilutionx-src.tar.xz:'` but locally it is working..
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (20 preceding siblings ...)
2025-04-23 14:27 ` dkwo
@ 2025-04-23 16:53 ` dkwo
2025-04-23 19:03 ` dkwo
` (32 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-23 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 78049 bytes --]
From ca5dc3c85db3540ddd694522d63c2ccafcd7273f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From e921d7c1c0632da2e8f0d31002dd1d4d6cfef908 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From a98bdcfb069e1d1008c0a5d23b5003fd654c8a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 2291892367e984eed8d9819e1a5a4f82424ce16f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 20d1a4711daeda9dc904986dad146e32487fa575 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 0561cd2933e791788b50a6c937b2c8d5844ef5c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From f3d57cd86029f488903d41f166d7260526fe482b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From b8069d5759d171e1f8edd61b80b40a8249d9d6cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From dc5862289086286e9d436ec503c24a6db649d69c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From eb674c40de13b4cdc22db577f2d2ea1989200902 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..df2916f96ce1cd 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=ea948933eb5fbffb12d72743ef15b626e7004a88bd4f1415b26a9f45240f4a7e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 1bd99141e7a01e811cc795bb078dac926294fec5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From e19a3d292a3cd23dba4e0d81c0da7a1f9b21b90b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 303f72eec8a4804ea5e71047562826de577cc008 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From a6cf3640eacef808db568d17cc10c8729fe2ead0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 03d5f3542a201c6cade824518f8f13ca00bde3b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 4764fb61d1515e55072f93bc0bb8babe3c5fb01d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From ce05f0fa32952dd56ee0de296960142bcb4aef28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 090929595248da3e08f1906fb1c08a1e5567ad80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From c5067f2a1cd3df90110424806c2241f9260306ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From c0dd30f3fa050e529406dc4d815e01d697fd942c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From c73d94f8b657a24e39d682189f0d95473b4e72c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b7a33df201b58ae347bdb1c3700538588b0aefcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From adcc62b7b5704a55f115e1b9621c29bc404c1390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From e7238b2da6a86a280733a1eeb2cbc7688c3d30f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From d7a1ec8bb39c6ed15ed6cb7f940ece5c4983be7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From a07566cad4870441775c85bf0f918e8fbef07eeb Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (21 preceding siblings ...)
2025-04-23 16:53 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-23 19:03 ` dkwo
2025-04-23 21:04 ` dkwo
` (31 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-23 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 78049 bytes --]
From aa71fea84dc63bc405e3fca7809cebed8d23facb Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From a49b29bea2ae01a808f41d8b002498bc33221f7a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 626afccb7b0c9cf88a8e8d2e41412262b91a08a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: rebuild for fmt, fix checksum
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 4 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..5090ba49fde5b9 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=9
+revision=10
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
@@ -16,7 +16,7 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
From 394979f4525647c98f14265fbee1d28621fba7e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 574aa85d324d311305668459538414c66e87d090 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 3589d1e4c2c202e56cb46306a3cd78c8d5ade35c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From b684bf1c0db135f843da7cfaf232068b5b3d847d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From a180fbf752ad8da801e89382de647b36f2fc5c35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From ee523559a250e942ad1d7b3fbd26bc178174f3e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 165259f8e5565ed07cb4b0d21ff06879c8e36c57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From e364eab919806da471af29401590bb4ed25a2dea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 697f1df4575d9e7339b8be64fc4171d042a089eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From cc9901840da1c63050841b748893ec335d39d568 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From f96aa237333194e5a44dd58b2129ced9d261ff29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From a2d4e8caabb5a57c0d5097e03503482fd17704fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 79aab01ab40320260ab9bc892114dcb6d9164dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From fb106abacf3123eb6ae86255fd0870d351923efd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From c8fef1d50f860f0ae1b3b515ded0e575068116b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 52218b330a35b9fbf1fe19f871b75935e2827f6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 1e3992c24759628419dcd8be26a6d052db6bff9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 208a821f36e5533bcca66040f1e1e0a5e0fae18c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 8b59c758e5ef6454ca94591be3943964bc895251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From b2a3eee9fd944939d451c95210fe587a54c1872b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 3baf5bec7199a7c79de906b4c19472ff8993e930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 2717e8be865a963527f1ce8438e50b6fc062a09e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 768406ec06b21b34e6ba4128fd5f664837c8e934 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (22 preceding siblings ...)
2025-04-23 19:03 ` dkwo
@ 2025-04-23 21:04 ` dkwo
2025-04-23 21:04 ` dkwo
` (30 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-23 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2824505494
Comment:
Hmm, `ERROR: SHA256 mismatch for 'devilutionx-src.tar.xz:'` but locally it is working..
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (23 preceding siblings ...)
2025-04-23 21:04 ` dkwo
@ 2025-04-23 21:04 ` dkwo
2025-04-24 15:04 ` dkwo
` (29 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-23 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2822156472
Comment:
`devilutionX` has one test failure `205 - Timedemo.WarriorLevel1to2 (Failed)`.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (24 preceding siblings ...)
2025-04-23 21:04 ` dkwo
@ 2025-04-24 15:04 ` dkwo
2025-04-25 13:48 ` [PR PATCH] [Updated] " dkwo
` (28 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-24 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2827970679
Comment:
Note: `0ad` is also broken on master branch, with same error `../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]`. Perhaps related to gcc update?
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (25 preceding siblings ...)
2025-04-24 15:04 ` dkwo
@ 2025-04-25 13:48 ` dkwo
2025-04-25 18:48 ` dkwo
` (27 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-25 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 78008 bytes --]
From 7e59bbf06a8b259afc13ebe268dcf1a0b498a809 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/26] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From c28689797b544f9da0e33903fa7914ce5a684310 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/26] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 1bf056421731e81a798d59782e5a10400261790b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/26] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From 10d3d773e11bca151d06d6254f25be7bc987a33b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/26] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 0b093ea9952e2b95679c7c330d2b2a1857d17b41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/26] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 61dca16de5ad4e9c316b8b1ed6c89114b8a7c252 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/26] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 15577becdc9b180816ca08add76212ee52d2cca4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/26] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From f51f88211e16c0cb6cfe6e574aeaa0d4b718d581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/26] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 7b2c6a74d69c5fcdac9a8ee730c406bdcb8bbd74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/26] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 56abda584111b524fa05f2206b13d62d50f3a479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/26] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From c3e7f2df3a69d8048d2757e16314a59e11e620c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/26] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From bfc72ebb0871b503816bf22caf926b3bfdd1446d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/26] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From c0ee506a6255b67ad974948f086268d4ae512c88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/26] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 23862469cc30b76680b55505d949872ce9b2185c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/26] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 65704746d8ffde1828e80a9a575c1fa8872649b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/26] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 3ee97d64f7b92d300e68d6a635262c9c97ccca77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/26] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From c57e283a66f850a32f075d2dd50045154185b5be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/26] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 7e49fb9d3e26aecaa6b6ab89a93af5448281d293 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/26] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From fa2039a0750a204c9e9274a1ff79233ba7f9386c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/26] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 25dbb7b5c30f1496fa6839dd044fa856caa259db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/26] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 9c4a72c77d06573e0066fb07e9f0d8a2e3af4589 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/26] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 8b468ade1552fb1a78c04b58d5a5e5655ddf7aed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/26] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From b3975ad0e5ff6024f6f5fe3561c3705235e8150f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/26] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 94a403e91354866af6a06f4b7c26050bc6ce32c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/26] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 8642c8625a6584db5f1b0488b9eeca8f2ec192eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/26] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 7b765ce39570d18ee0c9e3b2c42882e125117ac2 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/26] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (26 preceding siblings ...)
2025-04-25 13:48 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-25 18:48 ` dkwo
2025-04-25 18:48 ` dkwo
` (26 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-25 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2831173359
Comment:
to do: fix i686 android-tools:
```
/usr/bin/cc -DBORINGSSL_DISPATCH_TEST -DBORINGSSL_IMPLEMENTATION -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I/builddir/android-tools-35.0.2/vendor/boringssl/include -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=i686 -O2 -ffile-prefix-map=/builddir/android-tools-35.0.2/build=. -ftrivial-auto-var-init=zero -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits -Wmissing-field-initializers -ggdb -Wall -fvisibility=hidden -fno-common -Wno-free-nonheap-object -Wimplicit-fallthrough -Wformat-signedness -Wmissing-prototypes -Wold-style-definition -Wstrict-prototypes -D_XOPEN_SOURCE=700 -std=gnu11 -Wno-attributes -MD -MT vendor/boringssl/CMakeFiles/fipsmodule.dir/crypto/fipsmodule/bcm.c.o -MF vendor/boringssl/CMakeFiles/fipsmodule.dir/crypto/fipsmodule/bcm.c.o.d -o vendor/boringssl/CMakeFiles/fipsmodule.dir/crypto/fipsmodule/bcm.c.o -c /builddir/android-tools-35.0.2/vendor/boringssl/crypto/fipsmodule/bcm.c
2025-04-25T17:27:08.5764580Z In file included from /builddir/android-tools-35.0.2/vendor/boringssl/crypto/fipsmodule/bcm.c:31:
2025-04-25T17:27:08.5766533Z /builddir/android-tools-35.0.2/vendor/boringssl/crypto/fipsmodule/../internal.h:259:2: error: #error "x86 assembly requires SSE2. Build with -msse2 (recommended), or disable assembly optimizations with -DOPENSSL_NO_ASM."
2025-04-25T17:27:08.5768130Z 259 | #error \
2025-04-25T17:27:08.5768613Z | ^~~~~
```
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (27 preceding siblings ...)
2025-04-25 18:48 ` dkwo
@ 2025-04-25 18:48 ` dkwo
2025-04-25 21:51 ` [PR PATCH] [Updated] " dkwo
` (25 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-25 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2827970679
Comment:
Note: `0ad` is also broken on master branch, with same error `../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]`. Perhaps related to gcc update?
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (28 preceding siblings ...)
2025-04-25 18:48 ` dkwo
@ 2025-04-25 21:51 ` dkwo
2025-04-26 22:14 ` dkwo
` (24 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-25 21:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 95963 bytes --]
From 2b527b15e65b698e5a5634b83205fb5662260aee Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/27] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0d8305d381bb1c..04f5963d2f1c1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From c4d3a3de59f3286bfb21c5d4adc3a1689529cd64 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/27] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 927d8678870893364929daccdfc4602d2f2135d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/27] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From 266d2acdbbb960c96afbc5d1041ddacc6a421c5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/27] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 5d0cfc78145c59fb324ddfec87804772f909be56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/27] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 2409ddadfaaddf6a307aaaf7f8ef805ff511f075 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/27] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 772560ea072e379600efa583e089fed03febd5e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/27] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From f48c719dae032f9d1399f48bb70d463b3839ec19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/27] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 444b9ec7fed5f3413e9232ea8ada9107e6df32a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/27] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 7b4830d7cdc002280bc4d2b057a3757365647923 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/27] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 1e138ab085641a3498c30a0a53cbf51881e63e70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/27] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 407d28b77acf786b8811f2b169d3f33c85174d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/27] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 3f2a5302ce89d550e537d68a52b5209199ad1ee6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/27] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 708298b7ad0a6c224af76ab38d4f8dce7fba48fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/27] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 38129b1a7bad1d046ac6671f98aecc90a9309832 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/27] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 04f5963d2f1c1a..599a62ea8579e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From a752c9bf75fdaeafded64a33498f63ce37db9a02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/27] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From b0b3a504878ace91e40c2280a0fa435b0fc3293a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/27] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From b6ebdb7257804876cb6cbea95b010e29d6fd5654 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/27] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 355660fa72a2ea46be4332e0a72a00538434fec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/27] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 5e9a9451c032fbfac3daa0d9402a43cb261c310b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/27] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From b5a46f470d4fa9cd18f11c7b69943c39c0201997 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/27] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 0c91e2af366828a45f99a48b7f38b8cba7022244 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/27] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 4459076c140717204f49cfb35c8cce73b2668ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/27] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From a34e6ce94d2373c29dd551aff83fbd1828cbfeed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/27] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 599a62ea8579e3..d5626266cddee0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From c345f46c5a37fc6c56a6f74de4dcc0093c47efe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/27] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 670284937221bf98d95010b00cabaa0ba2e6d7f3 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/27] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index d5626266cddee0..2f29317cf490b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From c4bb7fe1108127bc5c6cf3205b775a9fc784ff31 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/27] 0ad: update to 0.27 WIP
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 -------------------
srcpkgs/0ad/files/rust-target.patch | 11 ---
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ------
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----------
srcpkgs/0ad/patches/fmt-10.patch | 26 ------
srcpkgs/0ad/patches/no-check-root.patch | 15 ----
srcpkgs/0ad/patches/ppc-musl.patch | 14 ----
srcpkgs/0ad/patches/ppc64.patch | 28 -------
srcpkgs/0ad/patches/python-3.11.patch | 38 ---------
srcpkgs/0ad/template | 28 +++----
11 files changed, 14 insertions(+), 304 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
delete mode 100644 srcpkgs/0ad/files/rust-target.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
delete mode 100644 srcpkgs/0ad/patches/python-3.11.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
deleted file mode 100644
index 90c69691155e83..00000000000000
--- a/srcpkgs/0ad/files/rust-target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
-
- return None
-
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
-
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
deleted file mode 100644
index 6dd59715e01f6d..00000000000000
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
-+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
-+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..15887ba23e2b77 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,27 +1,22 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
@@ -38,10 +33,6 @@ post_patch() {
echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
- cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
}
do_configure() {
@@ -50,6 +41,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +63,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (29 preceding siblings ...)
2025-04-25 21:51 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-26 22:14 ` dkwo
2025-04-27 18:52 ` [PR PATCH] [Updated] " dkwo
` (23 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-26 22:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2831173359
Comment:
to do: fix i686 android-tools:
```
case "${XBPS_TARGET_MACHINE}" in
i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
esac
```
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (30 preceding siblings ...)
2025-04-26 22:14 ` dkwo
@ 2025-04-27 18:52 ` dkwo
2025-04-28 13:56 ` dkwo
` (22 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-27 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 98570 bytes --]
From 56429a3ba63dbca5aa3055a7fa2b220cf750f167 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/28] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a22a13c9dbd121..4160ea88748b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 05f13b527593f6a121c04d7fb049820072fef02a Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/28] android-tools: update to 35.0.2
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..6970f39a7e9b38 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 58c102d8510e5eeb6f7a9cd6b1b3742580187fb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/28] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From a87f782ead72a8fd43743c53142fdff51c7344ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/28] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 06c54fa35d331f92ff4e6940f1ecc815a50b55f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/28] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From ad26e1603794db463490c4e18079d93f7657f094 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/28] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 0f5adfe007fbf8c0c184c4e28c3ab1ea50c5d984 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/28] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 97f76f4e9cc490c112488893de9eaadf94f876e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/28] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 3ed2a218bbe4eac62f045671495c120277799834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/28] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 2753a2058086a9d826a962afc8f0c5b27508ffda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/28] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From d0ef70a28e20b22e848ae5c78580d6d87e42b4a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/28] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From abf274165af1eae1d533ae96b8c96623ba4e12be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/28] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From eece7ec3130206aec41b9292320152e0ea8054bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/28] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 25dc13c0e970665f2542d392dcdfd7bd85ef2142 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/28] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 8df27325ac5fdcdd9f83afdbaeedeb7dd8463d5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/28] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4160ea88748b81..cfcb65b7020ea0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 3a6d6d2123541c164a6439e2d4b865fbfaf0d0aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/28] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 3f3fe5cb26a1ad748b5775e061787bfb5053c009 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/28] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 477e9b0c4c45c04ed5eb913c8f76e0b5b90134d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/28] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 18ee9ce213f05bcbe87c144814b75e7a3494d601 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/28] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 8a5282aeb891c18adf7183bf41f7f245f128affb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/28] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 620237998e8f8946a0141e8dd246040bacdad8f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/28] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 9f3a349cee780850baaa5f925549e97f72421294 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/28] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 047738504c57808b0b250e2b1156d1c2c3b95032 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/28] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 40d2035f952335ea34f20944272ba5d30832184b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/28] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cfcb65b7020ea0..295885845af749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 614966e644879c83f70f9e316081b052895bd975 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/28] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 8bab83c7903d71ea7c4fa56dbb974202f65da347 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/28] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 295885845af749..9820b94d5a4413 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From aad17fc7bf23f8412a2f4f1986ad0a6626d6d1f7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/28] 0ad: update to 0.27 WIP
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/014-rust-target.patch | 28 +++++++
srcpkgs/0ad/files/python-3.11.patch | 81 -------------------
srcpkgs/0ad/files/rust-target.patch | 11 ---
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ------
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----------
srcpkgs/0ad/patches/fmt-10.patch | 26 ------
srcpkgs/0ad/patches/no-check-root.patch | 15 ----
srcpkgs/0ad/patches/ppc-musl.patch | 14 ----
srcpkgs/0ad/patches/ppc64.patch | 28 -------
srcpkgs/0ad/patches/python-3.11.patch | 42 ++--------
srcpkgs/0ad/template | 39 +++------
12 files changed, 49 insertions(+), 312 deletions(-)
create mode 100644 srcpkgs/0ad/files/014-rust-target.patch
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
delete mode 100644 srcpkgs/0ad/files/rust-target.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/014-rust-target.patch b/srcpkgs/0ad/files/014-rust-target.patch
new file mode 100644
index 00000000000000..4d8918a2a54c59
--- /dev/null
+++ b/srcpkgs/0ad/files/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
+
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
+
+ return None
+
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
deleted file mode 100644
index 90c69691155e83..00000000000000
--- a/srcpkgs/0ad/files/rust-target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
-
- return None
-
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
-
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
From 41af75f8fe464386c5af4a715664707873666484 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 27 Apr 2025 14:52:19 -0400
Subject: [PATCH 28/28] android-tools: fix i686
---
srcpkgs/android-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 6970f39a7e9b38..ad81a143e1d9cb 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -18,7 +18,7 @@ distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/a
checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
case "${XBPS_TARGET_MACHINE}" in
- i686*) CXXFLAGS="-msse2";;
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
esac
post_install() {
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (31 preceding siblings ...)
2025-04-27 18:52 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-28 13:56 ` dkwo
2025-04-28 14:02 ` [PR PATCH] [Updated] " dkwo
` (21 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-28 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2831173359
Comment:
to do: fix i686 android-tools:
```
case "${XBPS_TARGET_MACHINE}" in
i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
esac
```
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (32 preceding siblings ...)
2025-04-28 13:56 ` dkwo
@ 2025-04-28 14:02 ` dkwo
2025-04-28 18:47 ` dkwo
` (20 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-28 14:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 97312 bytes --]
From 3682a7d6abf43d5fd7ebcb96466de449fcca1d80 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/27] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a22a13c9dbd121..4160ea88748b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fd4b9462d419d4fff44e07ddc804a9fb691f4ce7 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/27] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d123a1c050c9da0cd672a5af5cb3ddd370f473a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/27] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From 9f13c8f3f4bf8ca408cfd992ba8bca4fe8145a5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/27] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 44c47d64ac4d8353b9970c6df59d24c0b784358f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/27] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e1d0f7c69395f7dec8b6543b7d298b0dceb68cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/27] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From d0a7d68f45a2ce7c8ac7bcc10d4d5b58de8f379d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/27] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 8a15f8e01adba9394ece036b66b7036a63aecf87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/27] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 383fae1b08ae1773a0f31a45f2fe3bf6faacb9a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/27] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 0cadc9b0584ba250c3631b3e93ecbf0bdca32f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/27] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 0ffd8a65a4caafa43af374dcc2274c7e32ff8a46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/27] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From b2edfeab612b597099ae66027341695aa18e1f23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/27] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 9e81b43186594fc40a17b9102d6e05f0e1272d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/27] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 7b81697769fa96803a5c7b9fd50f80d638030ea5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/27] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From f0f203a67843c5c558c2524dbb2b6fb1360d2de4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/27] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4160ea88748b81..cfcb65b7020ea0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From b76c78494d7d7866e77baca11787452eb4bbaabc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/27] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 60b9144881406587174bd27ed8e98da630079b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/27] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 1ae4fc3aafb312482ae1e1c202a6f894969185e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/27] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 1b1eccb2cd8eb06d8fded7bb676d8d8fcd94e0c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/27] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 1bf9f8ddde2730d2d6ee2332c4c6a11d9d51cc4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/27] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From af08cc88320578541cc25ecedef33bbf5bd4213a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/27] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 369efdf0958142c6939388e7b3dca7eab05c46ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/27] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 5128125f3f0a355edd86d9b2b4482e7a805f1304 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/27] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 7588afe5669ddab855ff24ed2836f3b5b29c48be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/27] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cfcb65b7020ea0..295885845af749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 8e21b71642f922b8720e933c101d948fb0b0ba15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/27] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 393dbf72ecbca205acb313edca91ad576a528241 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/27] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 295885845af749..9820b94d5a4413 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 52aacfb04c74daa0125df8def853db461fc6e31a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/27] 0ad: update to 0.27 (WIP)
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 -------------------
srcpkgs/0ad/files/rust-target.patch | 29 +++++--
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ------
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----------
srcpkgs/0ad/patches/fmt-10.patch | 26 ------
srcpkgs/0ad/patches/no-check-root.patch | 15 ----
srcpkgs/0ad/patches/ppc-musl.patch | 14 ----
srcpkgs/0ad/patches/ppc64.patch | 28 -------
srcpkgs/0ad/patches/python-3.11.patch | 42 ++--------
srcpkgs/0ad/template | 39 +++------
11 files changed, 44 insertions(+), 307 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
index 90c69691155e83..4d8918a2a54c59 100644
--- a/srcpkgs/0ad/files/rust-target.patch
+++ b/srcpkgs/0ad/files/rust-target.patch
@@ -1,11 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (33 preceding siblings ...)
2025-04-28 14:02 ` [PR PATCH] [Updated] " dkwo
@ 2025-04-28 18:47 ` dkwo
2025-04-30 18:13 ` dkwo
` (19 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-28 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 99530 bytes --]
From 3682a7d6abf43d5fd7ebcb96466de449fcca1d80 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/27] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a22a13c9dbd121..4160ea88748b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From fd4b9462d419d4fff44e07ddc804a9fb691f4ce7 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/27] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From d123a1c050c9da0cd672a5af5cb3ddd370f473a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/27] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From 9f13c8f3f4bf8ca408cfd992ba8bca4fe8145a5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/27] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 44c47d64ac4d8353b9970c6df59d24c0b784358f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/27] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From e1d0f7c69395f7dec8b6543b7d298b0dceb68cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/27] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From d0a7d68f45a2ce7c8ac7bcc10d4d5b58de8f379d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/27] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 8a15f8e01adba9394ece036b66b7036a63aecf87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/27] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 383fae1b08ae1773a0f31a45f2fe3bf6faacb9a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/27] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 0cadc9b0584ba250c3631b3e93ecbf0bdca32f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/27] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From 0ffd8a65a4caafa43af374dcc2274c7e32ff8a46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/27] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From b2edfeab612b597099ae66027341695aa18e1f23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/27] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 9e81b43186594fc40a17b9102d6e05f0e1272d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/27] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 7b81697769fa96803a5c7b9fd50f80d638030ea5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/27] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From f0f203a67843c5c558c2524dbb2b6fb1360d2de4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/27] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4160ea88748b81..cfcb65b7020ea0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From b76c78494d7d7866e77baca11787452eb4bbaabc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/27] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 60b9144881406587174bd27ed8e98da630079b34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/27] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 1ae4fc3aafb312482ae1e1c202a6f894969185e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/27] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 1b1eccb2cd8eb06d8fded7bb676d8d8fcd94e0c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/27] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 1bf9f8ddde2730d2d6ee2332c4c6a11d9d51cc4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/27] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From af08cc88320578541cc25ecedef33bbf5bd4213a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/27] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 369efdf0958142c6939388e7b3dca7eab05c46ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/27] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 5128125f3f0a355edd86d9b2b4482e7a805f1304 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/27] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 7588afe5669ddab855ff24ed2836f3b5b29c48be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/27] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cfcb65b7020ea0..295885845af749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 8e21b71642f922b8720e933c101d948fb0b0ba15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/27] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 393dbf72ecbca205acb313edca91ad576a528241 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/27] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 295885845af749..9820b94d5a4413 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From db3a53d7a7ce482e05b9a6c745f885e6fa8a2c7e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/27] 0ad: update to 0.27
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 -------------------
srcpkgs/0ad/files/rust-target.patch | 29 +++++--
...4aeca067d8fd1a830bfb317b633133bf151a.patch | 49 +++++++++++
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ------
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----------
srcpkgs/0ad/patches/fmt-10.patch | 26 ------
srcpkgs/0ad/patches/no-check-root.patch | 15 ----
srcpkgs/0ad/patches/ppc-musl.patch | 14 ----
srcpkgs/0ad/patches/ppc64.patch | 28 -------
srcpkgs/0ad/patches/python-3.11.patch | 42 ++--------
srcpkgs/0ad/template | 39 +++------
12 files changed, 93 insertions(+), 307 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
create mode 100644 srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
index 90c69691155e83..4d8918a2a54c59 100644
--- a/srcpkgs/0ad/files/rust-target.patch
+++ b/srcpkgs/0ad/files/rust-target.patch
@@ -1,11 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
new file mode 100644
index 00000000000000..c3a454a9ddbd5b
--- /dev/null
+++ b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
@@ -0,0 +1,49 @@
+From 2f944aeca067d8fd1a830bfb317b633133bf151a Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 15 Feb 2025 01:34:24 -0800
+Subject: [PATCH] Make sure mozjs patch FixFpNormIssue.diff applies cleanly on
+ i386
+
+---
+ libraries/source/spidermonkey/build.sh | 2 +-
+ libraries/source/spidermonkey/patches/FixFpNormIssue.diff | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index d3c21fe4ea..cb895eee85 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
+ # This should match the version in config/milestone.txt
+ FOLDER="mozjs-115.16.1"
+ # If same-version changes are needed, increment this.
+-LIB_VERSION="115.16.1+3"
++LIB_VERSION="115.16.1+4"
+ LIB_NAME="mozjs115"
+
+ fetch()
+diff --git a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+index ef4d4d96b6..02bf309cdb 100644
+--- a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
++++ b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+@@ -1,6 +1,6 @@
+ --- a/modules/fdlibm/src/math_private.h
+ +++ b/modules/fdlibm/src/math_private.h
+-@@ -30,8 +30,13 @@
++@@ -30,7 +30,11 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+@@ -10,10 +10,9 @@
+ typedef double __double_t;
+ +#endif
+ typedef __double_t double_t;
+-+typedef float __float_t;
++ typedef float __float_t;
+
+- /*
+- * The original fdlibm code used statements like:
++
+ @@ -630,6 +634,53 @@
+ return ((double)(x + 0x1.8p52) - 0x1.8p52);
+ }
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (34 preceding siblings ...)
2025-04-28 18:47 ` dkwo
@ 2025-04-30 18:13 ` dkwo
2025-05-02 23:22 ` dkwo
` (18 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-04-30 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 104269 bytes --]
From 6ad999a2d6647dff48c851d91802c309851ea3df Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/27] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a22a13c9dbd121..4160ea88748b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 466acde585397594f29229f61a7721d2013ac1d6 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/27] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From ed98ceecdce1c50c99b6cee39e04bfd29bbf268e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/27] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From f034c837e699332509df1221c2aed7c0922927a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/27] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 978a78ca7f0651437f03fa5a41c002452179c43d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/27] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 63ee1ed396916778c4b4af1a34e3092d605a61b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/27] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From bd4442738522e2db3495b9f9411e7fd8a9f595bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/27] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From b5657be70beaca03263eb2c7226750a4f933f55a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/27] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 2e9b22762f4ed47280e41d3a1fce7912cf14a1fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/27] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From d0931b5a9d9feb8617b0e7c2f263af8bca3bda47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/27] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From eef7f94506dfdcb9dff0617c1492932ddf180eba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/27] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 62c5829f0e5ba7d931a11e1e59a89ef7c80280ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/27] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 6f6afd6966ac1926e60c2da4a24acca7916a4ad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/27] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From dee7bb71f586dd7b42a965c84486c8261e0522a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/27] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 9f62eeefda3b6f26b20c3ee8a68eac04f89b7e2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/27] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4160ea88748b81..cfcb65b7020ea0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 71c0cd246570f96d2739d814efa19bacc8351b46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/27] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 7b02cf42ed80d0132222bceb2eee91f5005167ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/27] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 6b1774b3cbf143332c895fcc8489be8f5aff4c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/27] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 889304c4e4f83dc1fce09ef41eae8cc9903760d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/27] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 01f3238ac923d67e30340872307b1b3fd8e8aa08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/27] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 2932e18e1e6d60291383b897b29b8988b5231d4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/27] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 0ab0d7a3a37e97a56c264ae30b31163fef7f5608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/27] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 1b806a421227ebbef6f211db84d32fd9647da2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/27] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 17b4744f815ef4da81dc822aacabc3d6c7aff948 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/27] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cfcb65b7020ea0..295885845af749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From a100edc12eae910ef86da3c257038bef92327d4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/27] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 77c08eb83cad69517bdcd29754f02255b71fab0f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/27] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 295885845af749..9820b94d5a4413 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 1072452430cbcffaf5bb06cd189e6c9a02b5a715 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/27] 0ad: update to 0.27
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 ---------
srcpkgs/0ad/files/rust-target.patch | 29 ++-
...473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch | 165 ++++++++++++++++++
...4aeca067d8fd1a830bfb317b633133bf151a.patch | 49 ++++++
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ---
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----
srcpkgs/0ad/patches/fmt-10.patch | 26 ---
srcpkgs/0ad/patches/no-check-root.patch | 15 --
srcpkgs/0ad/patches/ppc-musl.patch | 14 --
srcpkgs/0ad/patches/ppc64.patch | 28 ---
srcpkgs/0ad/patches/python-3.11.patch | 42 +----
srcpkgs/0ad/template | 39 ++---
13 files changed, 258 insertions(+), 307 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
create mode 100644 srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
create mode 100644 srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
index 90c69691155e83..4d8918a2a54c59 100644
--- a/srcpkgs/0ad/files/rust-target.patch
+++ b/srcpkgs/0ad/files/rust-target.patch
@@ -1,11 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
new file mode 100644
index 00000000000000..262d4c2ef4a506
--- /dev/null
+++ b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
@@ -0,0 +1,165 @@
+From 2338473da151d3942a0d7b8dbd2bc6ce4bd709c9 Mon Sep 17 00:00:00 2001
+From: Martijn van Duren <martijn@openbsd.org>
+Date: Fri, 7 Feb 2025 16:10:37 +0000
+Subject: [PATCH] Make libraries/*/build.sh use "${TAR}" instead of tar
+ directly. This allows systems using a tar version not supporting all the
+ required flags to easily switch to gnu tar.
+
+---
+ libraries/source/cxxtest-4.4/build.sh | 4 +++-
+ libraries/source/fcollada/build.sh | 6 ++++--
+ libraries/source/nvtt/build.sh | 6 ++++--
+ libraries/source/premake-core/build.sh | 3 ++-
+ libraries/source/spidermonkey/build.sh | 4 +++-
+ libraries/source/spirv-reflect/build.sh | 4 +++-
+ 6 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/libraries/source/cxxtest-4.4/build.sh b/libraries/source/cxxtest-4.4/build.sh
+index 3243836ecb..fe953dd108 100755
+--- a/libraries/source/cxxtest-4.4/build.sh
++++ b/libraries/source/cxxtest-4.4/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=4.4
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "cxxtest-${PV}"
+-tar -xf "cxxtest-${PV}.tar.gz"
++"${TAR}" -xf "cxxtest-${PV}.tar.gz"
+
+ # patch
+ patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
+diff --git a/libraries/source/fcollada/build.sh b/libraries/source/fcollada/build.sh
+index 4ba98b9d2a..2e42ba4647 100755
+--- a/libraries/source/fcollada/build.sh
++++ b/libraries/source/fcollada/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf fcollada-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/fcollada@${PV} fcollada-${PV}
+- tar cJf fcollada-${PV}.tar.xz fcollada-${PV}
++ "${TAR}" cJf fcollada-${PV}.tar.xz fcollada-${PV}
+ rm -R fcollada-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf fcollada-${PV}
+-tar xf fcollada-${PV}.tar.xz
++"${TAR}" xf fcollada-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh
+index 47299730fe..8a00df89f3 100755
+--- a/libraries/source/nvtt/build.sh
++++ b/libraries/source/nvtt/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf nvtt-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/nvtt@${PV} nvtt-${PV}
+- tar cJf nvtt-${PV}.tar.xz nvtt-${PV}
++ "${TAR}" cJf nvtt-${PV}.tar.xz nvtt-${PV}
+ rm -R nvtt-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf nvtt-${PV}
+-tar xf nvtt-${PV}.tar.xz
++"${TAR}" xf nvtt-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/premake-core/build.sh b/libraries/source/premake-core/build.sh
+index 1433a57a50..f6d50d8e92 100755
+--- a/libraries/source/premake-core/build.sh
++++ b/libraries/source/premake-core/build.sh
+@@ -4,6 +4,7 @@ set -e
+ : "${OS:=$(uname -s || true)}"
+ : "${MAKE:=make}"
+ : "${JOBS:=-j1}"
++: "${TAR:=tar}"
+
+ cd "$(dirname "$0")"
+
+@@ -44,7 +45,7 @@ fi
+
+ # unpack
+ rm -Rf "premake-core-${PV}"
+-tar -xf "premake-core-${PV}.tar.gz"
++"${TAR}" -xf "premake-core-${PV}.tar.gz"
+
+ # patch
+ # ffcb7790f013bdceacc14ba5fda1c5cd107aac08
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index c0d2e36cd0..d3c21fe4ea 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ # This should match the version in config/milestone.txt
+@@ -47,7 +49,7 @@ fi
+
+ # unpack
+ rm -Rf "${FOLDER}"
+-tar xfJ "${FOLDER}.tar.xz"
++"${TAR}" xfJ "${FOLDER}.tar.xz"
+
+ # patch
+ (
+diff --git a/libraries/source/spirv-reflect/build.sh b/libraries/source/spirv-reflect/build.sh
+index c5169b5bfc..18874174c1 100755
+--- a/libraries/source/spirv-reflect/build.sh
++++ b/libraries/source/spirv-reflect/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=1.3.290.0
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "SPIRV-Reflect-vulkan-sdk-${PV}"
+-tar xf "vulkan-sdk-${PV}.tar.gz"
++"${TAR}" xf "vulkan-sdk-${PV}.tar.gz"
+
+ # configure
+ cmake -B build -S "SPIRV-Reflect-vulkan-sdk-${PV}" \
diff --git a/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
new file mode 100644
index 00000000000000..47cca10ea6017c
--- /dev/null
+++ b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
@@ -0,0 +1,49 @@
+From 2f944aeca067d8fd1a830bfb317b633133bf151a Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 15 Feb 2025 01:34:24 -0800
+Subject: [PATCH] Make sure mozjs patch FixFpNormIssue.diff applies cleanly on
+ i386
+
+---
+ libraries/source/spidermonkey/build.sh | 2 +-
+ libraries/source/spidermonkey/patches/FixFpNormIssue.diff | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index d3c21fe4ea..cb895eee85 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
+ # This should match the version in config/milestone.txt
+ FOLDER="mozjs-115.16.1"
+ # If same-version changes are needed, increment this.
+-LIB_VERSION="115.16.1+1"
++LIB_VERSION="115.16.1+4"
+ LIB_NAME="mozjs115"
+
+ fetch()
+diff --git a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+index ef4d4d96b6..02bf309cdb 100644
+--- a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
++++ b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+@@ -1,6 +1,6 @@
+ --- a/modules/fdlibm/src/math_private.h
+ +++ b/modules/fdlibm/src/math_private.h
+-@@ -30,8 +30,13 @@
++@@ -30,7 +30,11 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+@@ -10,10 +10,9 @@
+ typedef double __double_t;
+ +#endif
+ typedef __double_t double_t;
+-+typedef float __float_t;
++ typedef float __float_t;
+
+- /*
+- * The original fdlibm code used statements like:
++
+ @@ -630,6 +634,53 @@
+ return ((double)(x + 0x1.8p52) - 0x1.8p52);
+ }
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (35 preceding siblings ...)
2025-04-30 18:13 ` dkwo
@ 2025-05-02 23:22 ` dkwo
2025-06-10 20:10 ` zlice
` (17 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-05-02 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 110279 bytes --]
From f91ce9d573284681b7ca68a4d7a7c8de3776be56 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/35] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a22a13c9dbd121..4160ea88748b81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,7 +3624,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.31 libtls-4.0.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From c20800b08424c28a7dc3fbcb483549b83fdabcb9 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/35] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 8180f4a49f7e26ae07cf213ba3ab4f3aab40988d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/35] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From c84734a3fb4cd9717b497ede71f0963414ebb72a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/35] Bear: rebuild for fmt, drop patch
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 7bf5b93be17ca2..7f3f4486f13f74 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 656c371c6bc4b138362a1c17c70b1080e05e20b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/35] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 74f1c2cbd0c1f4c91bfa1bc78d3be8f7b157055d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/35] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 97b077c1c001a8ee36ea87a99aeb25a53ca344b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/35] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From aa58137a364583376d5c7176b9948b0f5b332250 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/35] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 862c0376c44c2e5b0e855d9b3b20a8dd5d400b1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/35] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 0baa848569a7e819cb3dd04396dc65266a1e040e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/35] devilutionX: update to 1.5.4, change license, disable
one test
205 - Timedemo.WarriorLevel1to2
---
srcpkgs/devilutionX/patches/disable_test.patch | 10 ++++++++++
srcpkgs/devilutionX/template | 11 ++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/devilutionX/patches/disable_test.patch
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
new file mode 100644
index 00000000000000..3f4c23ce7d838e
--- /dev/null
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+ scrollrt_test
+ stores_test
+ str_cat_test
+- timedemo_test
+ utf8_test
+ writehero_test
+ )
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..9a2e4f19a17af4 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=3
+version=1.5.4
+revision=1
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
gtest-devel fmt-devel zlib-devel"
short_desc="Diablo I engine for modern operating systems"
maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
homepage="https://github.com/diasurgical/devilutionX"
changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+checksum=c252a0e1f24668ceecd03aa45fc303d515eaf21674d244cfecc78048a2677c8e
+repository="nonfree"
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From eac1516f9261f486525295ae16f0b5c0964aa8be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/35] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 4bd7570991347d..dceb132e246a59 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From cbeea1cb8611aa84eac81bf970e647e5460eac3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/35] freecad: patch for fmt, add makedep
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 06d5f0fa09ad45..acada07433eaa8 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.0
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 29f0024a7b2004053ecb79308bbca1ad1d1ccb4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/35] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index ce97cd0ebf0850..665df441c9da3a 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.1
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 91fae73d52567102dde9da3a6607b2ff40616657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/35] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 6612e9cf2765ce..b2dcb92885aa09 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From cb2625900f9c0536a6ca8b42b8055af2cad5341f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/35] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4160ea88748b81..cfcb65b7020ea0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3317,28 +3317,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 55920e287875374864a2e2da0b6cd5617216fe9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/35] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From e9be628226feb260b4e5474f7a30f4836134d5bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/35] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index f7c26a1e3c1ec5..03dcbf386a5edd 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.1
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From c40087a4a30da47e1e5317637652fbcee29ae898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/35] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..bb7effc988d981 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=3
+revision=4
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 8921ae0ca5db6833c303f95bf38b95e8324d00c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/35] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1fb1c1762c3241..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.15
-revision=4
+version=0.24.3
+revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 0c353e4022842bceaf7579558eb8aca9fc7ec42a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/35] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 7ecef80f5e1d693a53f5ff25922e9222abb988fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/35] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From efea7c90206ca3997ed189c0f3b8714f4791d6f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/35] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From f078e5ef684adcc3c5f2fb8e97f3a7a8ef99ad54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/35] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From f5c28e69b20f1a61cb779e20d66e9270d4b706d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/35] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cfcb65b7020ea0..295885845af749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4208,7 +4208,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 48c9438c524bfd1a9ba0dd290b56c15426510118 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/35] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 822931d0f1cd02f6844c1e88f09225d39870bbf8 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/35] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index 295885845af749..9820b94d5a4413 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3342,116 +3342,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 3a98794b55fa47ec46e106a16a1c9ab49498b223 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/35] 0ad: update to 0.27
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 ---------
srcpkgs/0ad/files/rust-target.patch | 29 ++-
...473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch | 165 ++++++++++++++++++
...4aeca067d8fd1a830bfb317b633133bf151a.patch | 49 ++++++
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ---
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----
srcpkgs/0ad/patches/fmt-10.patch | 26 ---
srcpkgs/0ad/patches/no-check-root.patch | 15 --
srcpkgs/0ad/patches/ppc-musl.patch | 14 --
srcpkgs/0ad/patches/ppc64.patch | 28 ---
srcpkgs/0ad/patches/python-3.11.patch | 42 +----
srcpkgs/0ad/template | 39 ++---
13 files changed, 258 insertions(+), 307 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
create mode 100644 srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
create mode 100644 srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
index 90c69691155e83..4d8918a2a54c59 100644
--- a/srcpkgs/0ad/files/rust-target.patch
+++ b/srcpkgs/0ad/files/rust-target.patch
@@ -1,11 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
new file mode 100644
index 00000000000000..262d4c2ef4a506
--- /dev/null
+++ b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
@@ -0,0 +1,165 @@
+From 2338473da151d3942a0d7b8dbd2bc6ce4bd709c9 Mon Sep 17 00:00:00 2001
+From: Martijn van Duren <martijn@openbsd.org>
+Date: Fri, 7 Feb 2025 16:10:37 +0000
+Subject: [PATCH] Make libraries/*/build.sh use "${TAR}" instead of tar
+ directly. This allows systems using a tar version not supporting all the
+ required flags to easily switch to gnu tar.
+
+---
+ libraries/source/cxxtest-4.4/build.sh | 4 +++-
+ libraries/source/fcollada/build.sh | 6 ++++--
+ libraries/source/nvtt/build.sh | 6 ++++--
+ libraries/source/premake-core/build.sh | 3 ++-
+ libraries/source/spidermonkey/build.sh | 4 +++-
+ libraries/source/spirv-reflect/build.sh | 4 +++-
+ 6 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/libraries/source/cxxtest-4.4/build.sh b/libraries/source/cxxtest-4.4/build.sh
+index 3243836ecb..fe953dd108 100755
+--- a/libraries/source/cxxtest-4.4/build.sh
++++ b/libraries/source/cxxtest-4.4/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=4.4
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "cxxtest-${PV}"
+-tar -xf "cxxtest-${PV}.tar.gz"
++"${TAR}" -xf "cxxtest-${PV}.tar.gz"
+
+ # patch
+ patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
+diff --git a/libraries/source/fcollada/build.sh b/libraries/source/fcollada/build.sh
+index 4ba98b9d2a..2e42ba4647 100755
+--- a/libraries/source/fcollada/build.sh
++++ b/libraries/source/fcollada/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf fcollada-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/fcollada@${PV} fcollada-${PV}
+- tar cJf fcollada-${PV}.tar.xz fcollada-${PV}
++ "${TAR}" cJf fcollada-${PV}.tar.xz fcollada-${PV}
+ rm -R fcollada-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf fcollada-${PV}
+-tar xf fcollada-${PV}.tar.xz
++"${TAR}" xf fcollada-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh
+index 47299730fe..8a00df89f3 100755
+--- a/libraries/source/nvtt/build.sh
++++ b/libraries/source/nvtt/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf nvtt-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/nvtt@${PV} nvtt-${PV}
+- tar cJf nvtt-${PV}.tar.xz nvtt-${PV}
++ "${TAR}" cJf nvtt-${PV}.tar.xz nvtt-${PV}
+ rm -R nvtt-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf nvtt-${PV}
+-tar xf nvtt-${PV}.tar.xz
++"${TAR}" xf nvtt-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/premake-core/build.sh b/libraries/source/premake-core/build.sh
+index 1433a57a50..f6d50d8e92 100755
+--- a/libraries/source/premake-core/build.sh
++++ b/libraries/source/premake-core/build.sh
+@@ -4,6 +4,7 @@ set -e
+ : "${OS:=$(uname -s || true)}"
+ : "${MAKE:=make}"
+ : "${JOBS:=-j1}"
++: "${TAR:=tar}"
+
+ cd "$(dirname "$0")"
+
+@@ -44,7 +45,7 @@ fi
+
+ # unpack
+ rm -Rf "premake-core-${PV}"
+-tar -xf "premake-core-${PV}.tar.gz"
++"${TAR}" -xf "premake-core-${PV}.tar.gz"
+
+ # patch
+ # ffcb7790f013bdceacc14ba5fda1c5cd107aac08
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index c0d2e36cd0..d3c21fe4ea 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ # This should match the version in config/milestone.txt
+@@ -47,7 +49,7 @@ fi
+
+ # unpack
+ rm -Rf "${FOLDER}"
+-tar xfJ "${FOLDER}.tar.xz"
++"${TAR}" xfJ "${FOLDER}.tar.xz"
+
+ # patch
+ (
+diff --git a/libraries/source/spirv-reflect/build.sh b/libraries/source/spirv-reflect/build.sh
+index c5169b5bfc..18874174c1 100755
+--- a/libraries/source/spirv-reflect/build.sh
++++ b/libraries/source/spirv-reflect/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=1.3.290.0
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "SPIRV-Reflect-vulkan-sdk-${PV}"
+-tar xf "vulkan-sdk-${PV}.tar.gz"
++"${TAR}" xf "vulkan-sdk-${PV}.tar.gz"
+
+ # configure
+ cmake -B build -S "SPIRV-Reflect-vulkan-sdk-${PV}" \
diff --git a/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
new file mode 100644
index 00000000000000..47cca10ea6017c
--- /dev/null
+++ b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
@@ -0,0 +1,49 @@
+From 2f944aeca067d8fd1a830bfb317b633133bf151a Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 15 Feb 2025 01:34:24 -0800
+Subject: [PATCH] Make sure mozjs patch FixFpNormIssue.diff applies cleanly on
+ i386
+
+---
+ libraries/source/spidermonkey/build.sh | 2 +-
+ libraries/source/spidermonkey/patches/FixFpNormIssue.diff | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index d3c21fe4ea..cb895eee85 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
+ # This should match the version in config/milestone.txt
+ FOLDER="mozjs-115.16.1"
+ # If same-version changes are needed, increment this.
+-LIB_VERSION="115.16.1+1"
++LIB_VERSION="115.16.1+4"
+ LIB_NAME="mozjs115"
+
+ fetch()
+diff --git a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+index ef4d4d96b6..02bf309cdb 100644
+--- a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
++++ b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+@@ -1,6 +1,6 @@
+ --- a/modules/fdlibm/src/math_private.h
+ +++ b/modules/fdlibm/src/math_private.h
+-@@ -30,8 +30,13 @@
++@@ -30,7 +30,11 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+@@ -10,10 +10,9 @@
+ typedef double __double_t;
+ +#endif
+ typedef __double_t double_t;
+-+typedef float __float_t;
++ typedef float __float_t;
+
+- /*
+- * The original fdlibm code used statements like:
++
+ @@ -630,6 +634,53 @@
+ return ((double)(x + 0x1.8p52) - 0x1.8p52);
+ }
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
From 3ee8fee4ac10312fcfc442f0ad5840493a3b7b01 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:54:45 -0400
Subject: [PATCH 28/35] corectrl: rebuild for fmt
---
srcpkgs/corectrl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index b245a70f6bcc39..6837a79e48e5d4 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
# Template file for 'corectrl'
pkgname=corectrl
version=1.4.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF" # requires https://github.com/rollbear/trompeloeil which isn't packaged
hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake
From af19042a073e2291ff9743493fbc8038132f63a4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 29/35] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index eb5150c68fc31c..786f1599a08515 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=91.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From 07a4611ae7b8e31b5d222292b9edf3e5a3d031bf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 30/35] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From d8155e10274c6f30cd2754ffcb955a94fbb938a7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 31/35] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From d0f8af80abf9cabf8133e6ce7a45fc651890a7f5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 32/35] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 1512db5de8a3744848ad5c5928c220ae177315d3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 33/35] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From a4e6b2cb46b7081784c3262a80da2928fe16a4bf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 34/35] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index f9eb07eb5f654e..9849e18c0085ef 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From 7a01269ff32669564803032a95af3ff3ceb77068 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 19:21:55 -0400
Subject: [PATCH 35/35] 0ad: broken on musl
---
srcpkgs/0ad/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index e373cccfc0a2c4..69f27d453a3199 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -21,9 +21,13 @@ lib32disabled=yes
CXXFLAGS="-fpermissive"
export WX_CONFIG="wx-config-gtk3"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" libexecinfo-devel"
+ broken="need to apply a patch for libexec, but nvtt is now fetched"
+fi
+
post_patch() {
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
-
}
do_configure() {
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (36 preceding siblings ...)
2025-05-02 23:22 ` dkwo
@ 2025-06-10 20:10 ` zlice
2025-06-10 22:26 ` zlice
` (16 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: zlice @ 2025-06-10 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2960462604
Comment:
fyi - https://github.com/void-linux/void-packages/pull/55584 freecad 1.0.1 should have that patch, added the new dep. will push after the builds are done there, just wana know if something happened to break that i missed.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (37 preceding siblings ...)
2025-06-10 20:10 ` zlice
@ 2025-06-10 22:26 ` zlice
2025-06-11 15:38 ` dkwo
` (15 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: zlice @ 2025-06-10 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2960719136
Comment:
actually, after looking at it, i don't see any reference to quadmath in freecad
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (38 preceding siblings ...)
2025-06-10 22:26 ` zlice
@ 2025-06-11 15:38 ` dkwo
2025-06-16 13:29 ` [PR PATCH] [Updated] " dkwo
` (14 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-11 15:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2963312974
Comment:
if i remember right, it was failing to build either on aarch64 or x86_64 without it.
but if now it works fine, i'll just drop it.
i can rebase once your pr is merged.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (39 preceding siblings ...)
2025-06-11 15:38 ` dkwo
@ 2025-06-16 13:29 ` dkwo
2025-06-16 13:44 ` dkwo
` (13 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-16 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 108438 bytes --]
From 116d364baae6a18f4fc231e2589e8fc6638ae690 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/34] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 22e09f221236d5..47c73089775462 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.32 libtls-4.1.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From b673209fa4b64433da8eb4e5c7c2e3cf7328243f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/34] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From f5c3c88eb31e7df4377680b92e0821de9a498a17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/34] 0ad: fix checksum, mark broken
also broken on master branch
---
srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
srcpkgs/0ad/template | 3 ++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/0ad/patches/fmt-10.patch
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ break;
+
+ default:
+- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ break;
+ }
+
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ case js::Scalar::Uint8Clamped:
+ return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ default:
+- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ throw PSERROR_Serialize_InvalidScriptValue();
+ }
+ }
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..4cd008142a2d34 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -16,9 +16,10 @@ homepage="https://play0ad.com"
distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
+ a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
+broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
skip_extraction="1654457-virtualenv.patch"
From 2869d075701ca98c6ad03a8542042a45812a7650 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/34] Bear: rebuild for fmt
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fdc02b197280a6..cc0ce8d4d9252c 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.6
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From dea4dc1bd6be5fbffe98d8d1f32b79bf144a5f8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/34] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From 4fdf4631b6f997c88ace86a338cb5e35814a7421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/34] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 0ef630b1dc172aee239661199cd7db5268942c21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/34] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From ed65e68175ffcf33edc532c5c753f34742309914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 08/34] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 1066622d7c493296819a9a44a9cb1fa3e45bcac4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/34] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From f21313671d87676c37fa6eca4b36e445cae78433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/34] devilutionX: bump for fmt
---
srcpkgs/devilutionX/patches/disable_test.patch | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/srcpkgs/devilutionX/patches/disable_test.patch b/srcpkgs/devilutionX/patches/disable_test.patch
index b89421cd7aaa5a..d9289c35db85d8 100644
--- a/srcpkgs/devilutionX/patches/disable_test.patch
+++ b/srcpkgs/devilutionX/patches/disable_test.patch
@@ -1,8 +1,14 @@
+<<<<<<< HEAD
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b84cb2e..bcdcf51 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -38,7 +38,6 @@ set(tests
+=======
+--- a/test/CMakeLists.txt 2024-08-31 10:12:06.583374500 -0400
++++ b/test/CMakeLists.txt 2025-04-22 16:36:25.842136085 -0400
+@@ -38,7 +38,6 @@
+>>>>>>> 0baa848569a (devilutionX: update to 1.5.4, change license, disable one test)
scrollrt_test
stores_test
str_cat_test
From 4321ec677f5b3c63f3d711be22c8b2456c08dd79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/34] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 498a5cb404b3ff..cf442945ef8516 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From acb9b3ad445219cdfad15e5dc7776fec4c5eb379 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/34] freecad: bump for fmt
---
srcpkgs/freecad/patches/fmt.patch | 71 +++++++++++++++++++++++++++++++
srcpkgs/freecad/template | 4 +-
2 files changed, 73 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/freecad/patches/fmt.patch
diff --git a/srcpkgs/freecad/patches/fmt.patch b/srcpkgs/freecad/patches/fmt.patch
new file mode 100644
index 00000000000000..01135c2ff5910a
--- /dev/null
+++ b/srcpkgs/freecad/patches/fmt.patch
@@ -0,0 +1,71 @@
+From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@freecad.org>
+Date: Mon, 16 Dec 2024 10:56:43 +0100
+Subject: [PATCH] smesh: Fix build failure with vtk 9.4
+
+Fixes #18423
+---
+ .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+index e9895d615717..4e9d6dc05764 100644
+--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+@@ -32,6 +32,7 @@
+ #include <vtkDoubleArray.h>
+ #include <vtkIdTypeArray.h>
+ #include <vtkUnsignedCharArray.h>
++#include <vtkVersionMacros.h>
+
+ #include <list>
+ #include <climits>
+@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ }
+
+- if (this->FaceLocations)
++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
++ vtkIdTypeArray* thisFaces = GetFaces();
++ if (thisFaceLocations)
+ {
+ vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
+ newFaceLocations->Initialize();
+ newFaceLocations->Allocate(newTypes->GetSize());
+ vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
+ newFaces->Initialize();
+- newFaces->Allocate(this->Faces->GetSize());
++ newFaces->Allocate(thisFaces->GetSize());
+ for (int i = 0; i < oldCellSize; i++)
+ {
+ if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
+@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
+ {
+ newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
+- int oldFaceLoc = this->FaceLocations->GetValue(i);
+- int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
++ int oldFaceLoc = thisFaceLocations->GetValue(i);
++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nCellFaces);
+ for (int n=0; n<nCellFaces; n++)
+ {
+- int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(nptsInFace);
+ for (int k=0; k<nptsInFace; k++)
+ {
+- int oldpt = this->Faces->GetValue(oldFaceLoc++);
++ int oldpt = thisFaces->GetValue(oldFaceLoc++);
+ newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
+ }
+ }
+@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
+ }
+ else
+ {
+- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
+ }
+
+ newPoints->Delete();
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae89313c959879..68db74cbcf7702 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.1
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel libgomp-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From d369c20440cd6ca3b6ffdb9073c92cbd972f8e7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/34] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index f3d4e7d2e53e52..8df8d3002a2b70 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.3
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From ddea898cb31a6b2a05711e7d0b4c85576fb13f06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 14/34] gerbera: bump for fmt
---
srcpkgs/gerbera/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 3b92df3fa8281e..d253e10b57ec41 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,12 +1,12 @@
# Template file for 'gerbera'
pkgname=gerbera
version=2.5.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,6 +15,13 @@ homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
+<<<<<<< HEAD
+=======
+
+# libupnp uses large file support, so users must do that, too
+CXXFLAGS="-D_FILE_OFFSET_BITS=64"
+
+>>>>>>> 91fae73d525 (gerbera: update to 2.5.0)
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From cc1c9d2d7ef708685f792adb50a453ff693ed4d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 15/34] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 47c73089775462..ac292309e8daf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3319,28 +3319,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From eff8dc90eb2e80288338447499f3e2b1bb19e941 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/34] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 9fce1d9b047befe514f1300c95eaa81d84efeb04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/34] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 940841b8ecb58a..04a53271cf69c9 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 968be73c1197275435e7f211d1c612b282ab4442 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 18/34] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 6e60372455a9fe..989cdd48a86e85 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.2
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 8f293dbe404035ebb189cc0d20016dc7f30c8b9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 19/34] mpd: bump for fmt
---
srcpkgs/mpd/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ce27329db78b90..83062773a23e35 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.17
-revision=1
+version=0.24.3
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,11 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
+<<<<<<< HEAD
checksum=a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2
+=======
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
+>>>>>>> 8921ae0ca5d (mpd: update to 0.24.3)
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 6dc01776726a29cbeadd8a53bfdf18ea601ac1b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/34] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 4204cfe7425309fb4bc2407914acd7c9c8ba0484 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/34] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From 41b4f37321b433b15c542d991abb92441b79f089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/34] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 04688a2d5c857a28a2a6f10bbf92a0c4b4110509 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 23/34] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 8d845d1ccdfaa5f52719b58a661fb749a2f55798 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 24/34] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ac292309e8daf3..eecb23a5b97fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From e68d2f8bb247e8112dafe98af2c3d7a07f44a438 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 25/34] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 4e4180e0b62fa3f4688187607bb701abe9763e2b Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 26/34] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index eecb23a5b97fd7..4a96e68834221e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3344,116 +3344,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 9092bd667f5731c9f386c2cb962601c0bfc9d1e7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 25 Apr 2025 17:50:38 -0400
Subject: [PATCH 27/34] 0ad: update to 0.27
---
srcpkgs/0ad-data/template | 6 +-
srcpkgs/0ad/files/python-3.11.patch | 81 ---------
srcpkgs/0ad/files/rust-target.patch | 29 ++-
...473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch | 165 ++++++++++++++++++
...4aeca067d8fd1a830bfb317b633133bf151a.patch | 49 ++++++
srcpkgs/0ad/patches/build-fcollada-once.patch | 23 ---
srcpkgs/0ad/patches/fix-gcc13.patch | 48 -----
srcpkgs/0ad/patches/fmt-10.patch | 26 ---
srcpkgs/0ad/patches/no-check-root.patch | 15 --
srcpkgs/0ad/patches/ppc-musl.patch | 14 --
srcpkgs/0ad/patches/ppc64.patch | 28 ---
srcpkgs/0ad/patches/python-3.11.patch | 42 +----
srcpkgs/0ad/template | 39 ++---
13 files changed, 258 insertions(+), 307 deletions(-)
delete mode 100644 srcpkgs/0ad/files/python-3.11.patch
create mode 100644 srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
create mode 100644 srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
delete mode 100644 srcpkgs/0ad/patches/build-fcollada-once.patch
delete mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch
delete mode 100644 srcpkgs/0ad/patches/fmt-10.patch
delete mode 100644 srcpkgs/0ad/patches/no-check-root.patch
delete mode 100644 srcpkgs/0ad/patches/ppc-musl.patch
delete mode 100644 srcpkgs/0ad/patches/ppc64.patch
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 7e413e00cad954..2a74171c06f273 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,13 +1,13 @@
# Template file for '0ad-data'
pkgname=0ad-data
-version=0.0.26
+version=0.27.0
revision=1
short_desc="Historically-based real-time strategy game (data files)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+distfiles="https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"
+checksum=3e48855ab8e1ef81270338462c8270b015213f14f5e054aab92ad74d5ea59dea
nocross=yes
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/files/python-3.11.patch b/srcpkgs/0ad/files/python-3.11.patch
deleted file mode 100644
index 3cb99d542f12f8..00000000000000
--- a/srcpkgs/0ad/files/python-3.11.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95f1e91ef71d912be5f6dddb6fac68671d850fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 24 Jul 2022 11:11:01 +0200
-Subject: [PATCH] Python/Build: Use r instead of rU file read modes
-
-Fixes Python 3.11 build
----
- python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
- python/mozbuild/mozbuild/preprocessor.py | 6 +++---
- python/mozbuild/mozbuild/util.py | 4 +++-
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
-index 6fff0d1..de2bcf4 100644
---- a/python/mozbuild/mozbuild/action/process_define_files.py
-+++ b/python/mozbuild/mozbuild/action/process_define_files.py
-@@ -36,7 +36,7 @@ def process_define_file(output, input):
- not config.substs.get('JS_STANDALONE'):
- config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
-
-- with open(path, 'rU') as input:
-+ with open(path, 'r') as input:
- r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
- for l in input:
- m = r.match(l)
-diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
-index 0e3a750..66f5cf7 100644
---- a/python/mozbuild/mozbuild/preprocessor.py
-+++ b/python/mozbuild/mozbuild/preprocessor.py
-@@ -517,7 +517,7 @@ class Preprocessor:
-
- if args:
- for f in args:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- self.processFile(input=input, output=out)
- if depfile:
- mk = Makefile()
-@@ -807,7 +807,7 @@ class Preprocessor:
- args = self.applyFilters(args)
- if not os.path.isabs(args):
- args = os.path.join(self.curdir, args)
-- args = io.open(args, 'rU', encoding='utf-8')
-+ args = io.open(args, 'r', encoding='utf-8')
- except Preprocessor.Error:
- raise
- except Exception:
-@@ -862,7 +862,7 @@ def preprocess(includes=[sys.stdin], defines={},
- pp = Preprocessor(defines=defines,
- marker=marker)
- for f in includes:
-- with io.open(f, 'rU', encoding='utf-8') as input:
-+ with io.open(f, 'r', encoding='utf-8') as input:
- pp.processFile(input=input, output=output)
- return pp.includes
-
-diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
-index 044cf64..eb992ce 100644
---- a/python/mozbuild/mozbuild/util.py
-+++ b/python/mozbuild/mozbuild/util.py
-@@ -54,6 +54,8 @@ def exec_(object, globals=None, locals=None):
-
-
- def _open(path, mode):
-+ if mode == "rU":
-+ mode = "r"
- if 'b' in mode:
- return io.open(path, mode)
- return io.open(path, mode, encoding='utf-8', newline='\n')
-@@ -220,7 +222,7 @@ class FileAvoidWrite(BytesIO):
- still occur, as well as diff capture if requested.
- """
-
-- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
-+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
- BytesIO.__init__(self)
- self.name = filename
- assert type(capture_diff) == bool
---
-2.37.1
-
diff --git a/srcpkgs/0ad/files/rust-target.patch b/srcpkgs/0ad/files/rust-target.patch
index 90c69691155e83..4d8918a2a54c59 100644
--- a/srcpkgs/0ad/files/rust-target.patch
+++ b/srcpkgs/0ad/files/rust-target.patch
@@ -1,11 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Jan 23 21:13:38 2022 +0100
+
+ bypass rust triplet checks and just force ours
+
+diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
+index cd77d72b..0c03cab7 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
-@@ -352,7 +352,7 @@
+@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
+ data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+ return data
- return None
+-
++@imports("os")
+ def detect_rustc_target(
+ host_or_target, compiler_info, arm_target, rust_supported_targets
+ ):
+@@ -383,7 +383,7 @@ def detect_rustc_target(
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
+ return None
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(
+- rustc_target = find_candidate(candidates)
++ rustc_target = os.environ["RUST_TARGET"]
+
+ if rustc_target is None:
+ die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
new file mode 100644
index 00000000000000..262d4c2ef4a506
--- /dev/null
+++ b/srcpkgs/0ad/patches/2338473da151d3942a0d7b8dbd2bc6ce4bd709c9.patch
@@ -0,0 +1,165 @@
+From 2338473da151d3942a0d7b8dbd2bc6ce4bd709c9 Mon Sep 17 00:00:00 2001
+From: Martijn van Duren <martijn@openbsd.org>
+Date: Fri, 7 Feb 2025 16:10:37 +0000
+Subject: [PATCH] Make libraries/*/build.sh use "${TAR}" instead of tar
+ directly. This allows systems using a tar version not supporting all the
+ required flags to easily switch to gnu tar.
+
+---
+ libraries/source/cxxtest-4.4/build.sh | 4 +++-
+ libraries/source/fcollada/build.sh | 6 ++++--
+ libraries/source/nvtt/build.sh | 6 ++++--
+ libraries/source/premake-core/build.sh | 3 ++-
+ libraries/source/spidermonkey/build.sh | 4 +++-
+ libraries/source/spirv-reflect/build.sh | 4 +++-
+ 6 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/libraries/source/cxxtest-4.4/build.sh b/libraries/source/cxxtest-4.4/build.sh
+index 3243836ecb..fe953dd108 100755
+--- a/libraries/source/cxxtest-4.4/build.sh
++++ b/libraries/source/cxxtest-4.4/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=4.4
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "cxxtest-${PV}"
+-tar -xf "cxxtest-${PV}.tar.gz"
++"${TAR}" -xf "cxxtest-${PV}.tar.gz"
+
+ # patch
+ patch -d "cxxtest-${PV}" -p1 <patches/0001-Add-Debian-python3-patch.patch
+diff --git a/libraries/source/fcollada/build.sh b/libraries/source/fcollada/build.sh
+index 4ba98b9d2a..2e42ba4647 100755
+--- a/libraries/source/fcollada/build.sh
++++ b/libraries/source/fcollada/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf fcollada-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/fcollada@${PV} fcollada-${PV}
+- tar cJf fcollada-${PV}.tar.xz fcollada-${PV}
++ "${TAR}" cJf fcollada-${PV}.tar.xz fcollada-${PV}
+ rm -R fcollada-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf fcollada-${PV}
+-tar xf fcollada-${PV}.tar.xz
++"${TAR}" xf fcollada-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh
+index 47299730fe..8a00df89f3 100755
+--- a/libraries/source/nvtt/build.sh
++++ b/libraries/source/nvtt/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=28209
+@@ -10,7 +12,7 @@ fetch()
+ {
+ rm -Rf nvtt-${PV}
+ svn export https://svn.wildfiregames.com/public/source-libs/trunk/nvtt@${PV} nvtt-${PV}
+- tar cJf nvtt-${PV}.tar.xz nvtt-${PV}
++ "${TAR}" cJf nvtt-${PV}.tar.xz nvtt-${PV}
+ rm -R nvtt-${PV}
+ }
+
+@@ -42,7 +44,7 @@ fi
+
+ # unpack
+ rm -Rf nvtt-${PV}
+-tar xf nvtt-${PV}.tar.xz
++"${TAR}" xf nvtt-${PV}.tar.xz
+
+ # build
+ (
+diff --git a/libraries/source/premake-core/build.sh b/libraries/source/premake-core/build.sh
+index 1433a57a50..f6d50d8e92 100755
+--- a/libraries/source/premake-core/build.sh
++++ b/libraries/source/premake-core/build.sh
+@@ -4,6 +4,7 @@ set -e
+ : "${OS:=$(uname -s || true)}"
+ : "${MAKE:=make}"
+ : "${JOBS:=-j1}"
++: "${TAR:=tar}"
+
+ cd "$(dirname "$0")"
+
+@@ -44,7 +45,7 @@ fi
+
+ # unpack
+ rm -Rf "premake-core-${PV}"
+-tar -xf "premake-core-${PV}.tar.gz"
++"${TAR}" -xf "premake-core-${PV}.tar.gz"
+
+ # patch
+ # ffcb7790f013bdceacc14ba5fda1c5cd107aac08
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index c0d2e36cd0..d3c21fe4ea 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ # This should match the version in config/milestone.txt
+@@ -47,7 +49,7 @@ fi
+
+ # unpack
+ rm -Rf "${FOLDER}"
+-tar xfJ "${FOLDER}.tar.xz"
++"${TAR}" xfJ "${FOLDER}.tar.xz"
+
+ # patch
+ (
+diff --git a/libraries/source/spirv-reflect/build.sh b/libraries/source/spirv-reflect/build.sh
+index c5169b5bfc..18874174c1 100755
+--- a/libraries/source/spirv-reflect/build.sh
++++ b/libraries/source/spirv-reflect/build.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ set -e
+
++: "${TAR:=tar}"
++
+ cd "$(dirname "$0")"
+
+ PV=1.3.290.0
+@@ -40,7 +42,7 @@ fi
+
+ # unpack
+ rm -Rf "SPIRV-Reflect-vulkan-sdk-${PV}"
+-tar xf "vulkan-sdk-${PV}.tar.gz"
++"${TAR}" xf "vulkan-sdk-${PV}.tar.gz"
+
+ # configure
+ cmake -B build -S "SPIRV-Reflect-vulkan-sdk-${PV}" \
diff --git a/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
new file mode 100644
index 00000000000000..47cca10ea6017c
--- /dev/null
+++ b/srcpkgs/0ad/patches/2f944aeca067d8fd1a830bfb317b633133bf151a.patch
@@ -0,0 +1,49 @@
+From 2f944aeca067d8fd1a830bfb317b633133bf151a Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 15 Feb 2025 01:34:24 -0800
+Subject: [PATCH] Make sure mozjs patch FixFpNormIssue.diff applies cleanly on
+ i386
+
+---
+ libraries/source/spidermonkey/build.sh | 2 +-
+ libraries/source/spidermonkey/patches/FixFpNormIssue.diff | 7 +++----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/libraries/source/spidermonkey/build.sh b/libraries/source/spidermonkey/build.sh
+index d3c21fe4ea..cb895eee85 100755
+--- a/libraries/source/spidermonkey/build.sh
++++ b/libraries/source/spidermonkey/build.sh
+@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
+ # This should match the version in config/milestone.txt
+ FOLDER="mozjs-115.16.1"
+ # If same-version changes are needed, increment this.
+-LIB_VERSION="115.16.1+1"
++LIB_VERSION="115.16.1+4"
+ LIB_NAME="mozjs115"
+
+ fetch()
+diff --git a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+index ef4d4d96b6..02bf309cdb 100644
+--- a/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
++++ b/libraries/source/spidermonkey/patches/FixFpNormIssue.diff
+@@ -1,6 +1,6 @@
+ --- a/modules/fdlibm/src/math_private.h
+ +++ b/modules/fdlibm/src/math_private.h
+-@@ -30,8 +30,13 @@
++@@ -30,7 +30,11 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+@@ -10,10 +10,9 @@
+ typedef double __double_t;
+ +#endif
+ typedef __double_t double_t;
+-+typedef float __float_t;
++ typedef float __float_t;
+
+- /*
+- * The original fdlibm code used statements like:
++
+ @@ -630,6 +634,53 @@
+ return ((double)(x + 0x1.8p52) - 0x1.8p52);
+ }
diff --git a/srcpkgs/0ad/patches/build-fcollada-once.patch b/srcpkgs/0ad/patches/build-fcollada-once.patch
deleted file mode 100644
index b2a553d6a7c5c7..00000000000000
--- a/srcpkgs/0ad/patches/build-fcollada-once.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libraries/source/fcollada/src/Makefile
-===================================================================
---- a/libraries/source/fcollada/src/Makefile
-+++ b/libraries/source/fcollada/src/Makefile
-@@ -224,7 +224,7 @@ OBJECTS_RELEASE = $(addprefix output/rel
- OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o))
- OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST)
-
--all: output/libFColladaSD.a output/libFColladaSR.a install
-+all: output/libFColladaSR.a install
-
- output_dirs:
- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'
-@@ -244,8 +244,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS
- output/FColladaTest: $(OBJECTS_TEST) | output_dirs
- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS)
-
--install: output/libFColladaSD.a output/libFColladaSR.a
-- cp output/libFColladaSD.a ../lib/libFColladaSD.a
-+install: output/libFColladaSR.a
- cp output/libFColladaSR.a ../lib/libFColladaSR.a
-
- dfile = $(@:.o=.d)
diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch
deleted file mode 100644
index ad40bceffc7cbc..00000000000000
--- a/srcpkgs/0ad/patches/fix-gcc13.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001
-From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 13 May 2023 12:08:23 +0000
-Subject: [PATCH] Fix compilation with GCC 13.
-
-gcc-13 less often includes cstdint so one might need to include it manually if needed.
-
-The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint.
-
-Patch by: @sera
-Reviewed by: @phosit
-Fixes: #6800
-Differential Revision: https://code.wildfiregames.com/D4997
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797
----
- source/tools/atlas/GameInterface/Messages.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h
-index 2fa47809213..a486d93a687 100644
---- a/source/tools/atlas/GameInterface/Messages.h
-+++ b/source/tools/atlas/GameInterface/Messages.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2022 Wildfire Games.
-+/* Copyright (C) 2023 Wildfire Games.
- * This file is part of 0 A.D.
- *
- * 0 A.D. is free software: you can redistribute it and/or modify
-@@ -18,13 +18,15 @@
- #ifndef INCLUDED_MESSAGES
- #define INCLUDED_MESSAGES
-
-+#include <cstdint>
-+#include <string>
-+#include <vector>
-+
-+// Opens namespace AtlasMessage, closes it on second inclusion!
- #ifndef MESSAGES_SKIP_SETUP
- #include "MessagesSetup.h"
- #endif
-
--#include <vector>
--#include <string>
--
- // TODO: organisation, documentation, etc
-
- #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too)
diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
deleted file mode 100644
index ada783ac3c2239..00000000000000
--- a/srcpkgs/0ad/patches/fmt-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
-index 61126d8..8945175 100644
---- a/source/network/NetMessage.cpp
-+++ b/source/network/NetMessage.cpp
-@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
- break;
-
- default:
-- LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
-+ LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
- break;
- }
-
-diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
-index 6a0b4e4..7d30c5b 100644
---- a/source/simulation2/serialization/BinarySerializer.cpp
-+++ b/source/simulation2/serialization/BinarySerializer.cpp
-@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
- case js::Scalar::Uint8Clamped:
- return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
- default:
-- LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
-+ LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
- throw PSERROR_Serialize_InvalidScriptValue();
- }
- }
diff --git a/srcpkgs/0ad/patches/no-check-root.patch b/srcpkgs/0ad/patches/no-check-root.patch
deleted file mode 100644
index 633c33dc9c6e34..00000000000000
--- a/srcpkgs/0ad/patches/no-check-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: 0ad-0.0.26/build/workspaces/update-workspaces.sh
-===================================================================
---- 0ad-0.0.26.orig/build/workspaces/update-workspaces.sh
-+++ 0ad-0.0.26/build/workspaces/update-workspaces.sh
-@@ -1,10 +1,5 @@
- #!/bin/sh
-
--if [ "$(id -u)" = "0" ]; then
-- echo "Running as root will mess up file permissions. Aborting ..." 1>&2
-- exit 1
--fi
--
- die()
- {
- echo ERROR: $*
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
deleted file mode 100644
index a8b41175e76f06..00000000000000
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:38:49.764811556 +0100
-+++ b/libraries/source/nvtt/src/src/nvcore/Debug.cpp 2021-02-27 11:39:48.919032920 +0100
-@@ -40,6 +40,11 @@
- # include <signal.h>
- #endif
-
-+#if NV_OS_LINUX
-+# include <asm/ptrace.h> // struct pt_regs
-+#endif
-+
-+
- #if NV_OS_UNIX
- # include <unistd.h> // getpid
- #endif
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
deleted file mode 100644
index 93e90e139b4f57..00000000000000
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-+++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
-@@ -27,10 +27,7 @@
- #ifndef NV_SIMD_VECTOR_VE_H
- #define NV_SIMD_VECTOR_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nv {
-
-diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
-index 5a11858..e256c54 100644
---- a/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ b/libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -27,10 +27,7 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#ifndef __APPLE_ALTIVEC__
- #include <altivec.h>
--#undef bool
--#endif
-
- namespace nvsquish {
-
diff --git a/srcpkgs/0ad/patches/python-3.11.patch b/srcpkgs/0ad/patches/python-3.11.patch
index 6dd59715e01f6d..65633e0ed37461 100644
--- a/srcpkgs/0ad/patches/python-3.11.patch
+++ b/srcpkgs/0ad/patches/python-3.11.patch
@@ -1,38 +1,8 @@
-Index: 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-===================================================================
---- 0ad-0.0.26.orig/libraries/source/spidermonkey/patch.sh
-+++ 0ad-0.0.26/libraries/source/spidermonkey/patch.sh
-@@ -2,6 +2,24 @@
- # Apply patches if needed
- # This script gets called from build.sh.
-
-+unset GIT_DIR
-+HOME=/tmp
-+PATH=/usr/libexec/chroot-git:$PATH
-+GIT_CEILING_DIRECTORIES="$(cd .. && pwd)"
-+export GIT_CEILING_DIRECTORIES HOME
-+git config --global --add safe.directory "$PWD"
-+git config --global user.name 'Void Linux'
-+git config --global user.email 'none@voidlinux.org'
-+git init . -b for-build
-+git add . >/dev/null 2>&1
-+git commit -m needs-git-because-virtual-env-has-binaries-diff
+--- a/libraries/source/spidermonkey/patches/patch.sh 2025-01-28 14:57:29.000000000 -0500
++++ b/libraries/source/spidermonkey/patches/patch.sh 2025-04-26 18:49:19.964677487 -0400
+@@ -41,3 +41,5 @@
+ # Fix build with Python >=3.12.8 and Python >=3.13.1
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
+ patch -p1 <"${PATCHES}"/FixPython3.12.8.diff
+
-+git am --keep-cr ../1654457-virtualenv.patch
-+git am --keep-cr ../python-3.11.patch
+patch -p1 < ../rust-target.patch
-+
-+ sed -i -e 's/exec python3 /exec python3.11 /' js/src/configure*
-+
- # SM78 fails to create virtual envs on macs with python > 3.7
- # Unfortunately, 3.7 is mostly unavailable on ARM macs.
- # Therefore, replace the custom script with a more up-to-date version from pip
-@@ -26,7 +41,7 @@ else
- #
- # It is assumed that the updated version fetched for macOS systems
- # above does not have this problem.
-- patch -p1 < ../FixVirtualenvForPython310.diff
-+ : patch -p1 < ../FixVirtualenvForPython310.diff
- fi
-
- # Mozglue symbols need to be linked against static builds.
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 4cd008142a2d34..e373cccfc0a2c4 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,47 +1,29 @@
# Template file for '0ad'
pkgname=0ad
-version=0.0.26
-revision=9
+version=0.27.0
+revision=1
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
build_helper=rust
-hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang xz m4"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel freetype-devel llvm"
depends="${pkgname}-data"
short_desc="Historically-based real-time strategy game"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
+license="GPL-2.0-or-later, CC-BY-SA-3.0"
homepage="https://play0ad.com"
-distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz
- https://github.com/mozilla/gecko-dev/commit/74641307d32a59806b75cd2b8c7161aca50d5cb7.patch>1654457-virtualenv.patch"
-checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
- a1299ea0126f498d14e866f6a623b157700d96bbccf20b985527cf47b0f830fb"
+distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-unix-build.tar.gz"
+checksum=6fdec0e0defcd22a5dbbc2f77e94cf10603baa8cd081c876375a25545d4ca068
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-broken="../../contrib/libzip/mkstemp.c:76:15: error: implicit declaration of function 'getpid' [-Wimplicit-function-declaration]"
-
-skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
-# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
-LDFLAGS="-fuse-ld=bfd"
-
export WX_CONFIG="wx-config-gtk3"
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
-fi
-
post_patch() {
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
- libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
- fi
- cp ${FILESDIR}/python-3.11.patch libraries/source/spidermonkey/
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
- cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/1654457-virtualenv.patch \
- libraries/source/spidermonkey/
+
}
do_configure() {
@@ -50,6 +32,10 @@ do_configure() {
./clean-workspaces.sh
}
+pre_build() {
+ cd libraries && ./build-source-libs.sh
+}
+
do_build() {
export JOBS="${makejobs}"
cd ${wrksrc}/build/workspaces
@@ -68,5 +54,4 @@ do_install() {
vbin build/resources/${pkgname}.sh ${pkgname}
vinstall build/resources/${pkgname}.desktop 0644 usr/share/applications
vinstall build/resources/${pkgname}.png 0644 usr/share/pixmaps
- vlicense LICENSE.txt
}
From 0ab03e632a659403ded18c4a7fed3d580225f3da Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 28/34] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7a38065d92eaf9..9588f2b70f42d2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=92.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From 86bf11b0eb65204f09837a7d96ec43d6b072eca8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 29/34] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From 8ac6e7bf43998bac70ee1d06d3005ea80ade5983 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 30/34] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 4f6758b056ab776ffe2c28260d6c6d05859e3426 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 31/34] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 0681113e8b165e6f02c4ab5eb3ababeb5418d59d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 32/34] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From a0a26ac046f9413e06fe070ec3788edbe6cee640 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 33/34] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b8ceaf23decb39..884396fea05692 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.7
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From 44bf3a4776887cdb304018d405bf62cabbdd0818 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 19:21:55 -0400
Subject: [PATCH 34/34] 0ad: broken on musl
---
srcpkgs/0ad/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index e373cccfc0a2c4..69f27d453a3199 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -21,9 +21,13 @@ lib32disabled=yes
CXXFLAGS="-fpermissive"
export WX_CONFIG="wx-config-gtk3"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" libexecinfo-devel"
+ broken="need to apply a patch for libexec, but nvtt is now fetched"
+fi
+
post_patch() {
cp ${FILESDIR}/rust-target.patch libraries/source/spidermonkey/
-
}
do_configure() {
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (40 preceding siblings ...)
2025-06-16 13:29 ` [PR PATCH] [Updated] " dkwo
@ 2025-06-16 13:44 ` dkwo
2025-06-16 13:53 ` dkwo
` (12 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-16 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 74450 bytes --]
From 116d364baae6a18f4fc231e2589e8fc6638ae690 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/32] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 22e09f221236d5..47c73089775462 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.32 libtls-4.1.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From b673209fa4b64433da8eb4e5c7c2e3cf7328243f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/32] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 87e79e2412ae87045839adcc1a9832a4ba7b1989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/32] Bear: rebuild for fmt
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fdc02b197280a6..cc0ce8d4d9252c 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.6
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From e8b3b5921dcdc19b92184b5db12ed3ec3f35b08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/32] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From f96e8ef799ea34479dd81fb038dc1c479fe10a4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/32] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 0ea40b199de65414ca27b5e1efe34f91cf18b323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/32] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 029b5c4609aeba2532a8453e0a89e616642c6a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/32] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From ab4c9fde01a8bdd7e58f2a67df9c802ea168f1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 08/32] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 87305d02a9560481d89945d643c49a7da650c370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/32] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 498a5cb404b3ff..cf442945ef8516 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From ba3b33c9d5d6d9d30bb57cd40edb652fc00c8fda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/32] freecad: patch for fmt
---
srcpkgs/freecad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae89313c959879..68db74cbcf7702 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.1
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
build_style=cmake
@@ -19,7 +19,7 @@ makedepends="boost-devel boost-python3 libxerces-c-devel zlib-devel occt-devel v
hdf5-devel libgomp-devel libmed-devel eigen double-conversion-devel
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
- qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
+ qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel libquadmath-devel"
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
python3-pyside6"
short_desc="General purpose 3D CAD modeler"
From 1aed2adf8852e559a3f66b86bca572a89ee4655f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/32] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index f3d4e7d2e53e52..8df8d3002a2b70 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.3
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 8450739f45a71cde19aa21a66c740bbca6554ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/32] gerbera: bump for fmt
---
srcpkgs/gerbera/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 3b92df3fa8281e..873ef703465b2c 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=2.5.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
@@ -15,6 +15,7 @@ homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
+
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From ee3f2622261605b94f45a8bf535c8e101359ea68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/32] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 47c73089775462..ac292309e8daf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3319,28 +3319,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From b2c0a1ea982d00209b3175b1f8a86be26ad1165f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 14/32] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 818153e9bbaf12a5b89fc7240911268dbb3db798 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 15/32] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 940841b8ecb58a..04a53271cf69c9 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From d371070769e1bf5e32f55780ae441ad37ae1ffcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/32] kodi: rebuild for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 6e60372455a9fe..989cdd48a86e85 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.2
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 78d71f5c3a0c37f168e88363d4ad45fb93f2e113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/32] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ce27329db78b90..0b2a22a143ff80 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.17
+version=0.24.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
From 54f3016cb800aadd0a687e433f6e380ce2bb5d4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 18/32] mtxclient: rebuild for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 62b4ce59cec08ff4fbb936a2acb2addca1dafd37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 19/32] nheko: rebuild for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From efabfeba3231e7d508a3dd7e012c02b9c3f4a745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/32] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 4aeb8f764856bcb20a22080713af7fcd02ff8722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/32] paps: rebuild for fmt, patch
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 5fe411106c565637196abc8afd70e41a7b8bb671 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/32] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ac292309e8daf3..eecb23a5b97fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 2a1186e6accfde8b7dc994c6dadcfd10867ef518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 23/32] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 6e988f985dc1f1314828b4858fce8a30a4aeb2fe Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 24/32] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index eecb23a5b97fd7..4a96e68834221e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3344,116 +3344,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 2e36bcc5eb9b789499b61caf659b472bae2772df Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 25/32] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7a38065d92eaf9..9588f2b70f42d2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=92.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From f920ea4de167fc1ce85ab5a87f16b0a6b0094b48 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 26/32] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From 888d020e737dfb6c9ddb8f5d44b22669480a6ee2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 27/32] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 7abc2fda751cb7123e45f702613e54da241d529e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 28/32] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 4c8dcd690aa724915a5e9aa5542083d7c9e0005d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 29/32] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 71ac53e51035189ebe6d13144cfb698bb62e4d3c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 30/32] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b8ceaf23decb39..884396fea05692 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.7
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From 9ad5d0e96e8f29016f70628281c9bbaa5f10f72e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:34:32 -0400
Subject: [PATCH 31/32] 0ad: mark broken
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..ce12bd83359aaa 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -19,7 +19,7 @@ checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-
+broken="does not build on master"
skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
From 71dfedbd65fa7a4e1e0f6d485bde9085e002dd75 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:44:50 -0400
Subject: [PATCH 32/32] devilutionX: bump for fmt
---
srcpkgs/devilutionX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 9a2e4f19a17af4..14d70ff1a67e88 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (41 preceding siblings ...)
2025-06-16 13:44 ` dkwo
@ 2025-06-16 13:53 ` dkwo
2025-06-16 15:15 ` dkwo
` (11 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-16 13:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
cc @Johnnynator I had to add `fmt` to `android-tools`. Edit: adapted your prior PR, with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 73469 bytes --]
From 116d364baae6a18f4fc231e2589e8fc6638ae690 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/32] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 22e09f221236d5..47c73089775462 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.32 libtls-4.1.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From b673209fa4b64433da8eb4e5c7c2e3cf7328243f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/32] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From 87e79e2412ae87045839adcc1a9832a4ba7b1989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/32] Bear: rebuild for fmt
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fdc02b197280a6..cc0ce8d4d9252c 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.6
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From e8b3b5921dcdc19b92184b5db12ed3ec3f35b08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/32] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From f96e8ef799ea34479dd81fb038dc1c479fe10a4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/32] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 0ea40b199de65414ca27b5e1efe34f91cf18b323 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/32] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 029b5c4609aeba2532a8453e0a89e616642c6a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/32] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From ab4c9fde01a8bdd7e58f2a67df9c802ea168f1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 08/32] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 87305d02a9560481d89945d643c49a7da650c370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/32] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 498a5cb404b3ff..cf442945ef8516 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 289146f0394cc0794beba45dfdc1f2823031c203 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/32] freecad: bump for fmt
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae89313c959879..94976c4f34f7de 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.1
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
build_style=cmake
From c12b66b48f023675ff0e8703ed77c82c4dd80ff2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/32] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index f3d4e7d2e53e52..8df8d3002a2b70 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.3
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From cf4f5ebe8ef65336837340d5be3accb03e90b656 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/32] gerbera: bump for fmt
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 3b92df3fa8281e..ead68eb5917ab3 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=2.5.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
From dbdb360f7a64a335a9aa4c889bce68a213b0c457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/32] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 47c73089775462..ac292309e8daf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3319,28 +3319,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 6db87eab0b205ceaea8685e46279c551967c09bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 14/32] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From 9abe290e7fdfef83797bbd1ab18b256284cd45cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 15/32] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 940841b8ecb58a..04a53271cf69c9 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 092063cf72afb6d639dca9307dded9c1143f7e60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/32] kodi: patch for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 6e60372455a9fe..989cdd48a86e85 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.2
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From d88d4ee7cf94ee9953ab6e0a413626e327dced3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/32] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ce27329db78b90..0b2a22a143ff80 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.17
+version=0.24.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
From 3c21e4087f7b6c2f5654bdf192fcb5328b64afed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 18/32] mtxclient: patch for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From cbb11aeac5d24d4b337791029f80bc40528e6bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 19/32] nheko: patch for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From b513bb1d682988f27cdca7df0c73f409d6139dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/32] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 25b2ee09d375e71c544fe190b91f7ee4fa82a0c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/32] paps: patch for fmt
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 2dbe1d5e78deaf02390e388408c1a5d5a8c4707e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/32] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ac292309e8daf3..eecb23a5b97fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 1be543386c42302c97e6f20d1e628138ab963600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 23/32] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From c14febc7403f477a1cab79ff75a9654b337a1831 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 24/32] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index eecb23a5b97fd7..4a96e68834221e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3344,116 +3344,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 0d47bb3ed4ded4a73eb27378c6e8f213314cf259 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 25/32] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7a38065d92eaf9..9588f2b70f42d2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=92.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From 0862df370512052dbf58bc1797051317f0fd45bf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 26/32] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From 1aa9a1c9dbb0b7b37c8b9bfa097be72d7a5d02d7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 27/32] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 9ec9c58a7dca89bc9c01d1d67de3dd5dce25f8d4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 28/32] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 1dddfcd604fc78bd55850fcf0613f35f5926b206 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 29/32] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 738d5d35c940872a9ebadf1101cc9a14d44ddbe2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 30/32] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b8ceaf23decb39..884396fea05692 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.7
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From e23cca022042c82512d2231045dd0bef2ce0f4f4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:34:32 -0400
Subject: [PATCH 31/32] 0ad: mark broken
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..ce12bd83359aaa 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -19,7 +19,7 @@ checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-
+broken="does not build on master"
skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
From f1c46659ef6a86660c26cc1d4b6af71dd92c423b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:44:50 -0400
Subject: [PATCH 32/32] devilutionX: bump for fmt
---
srcpkgs/devilutionX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 9a2e4f19a17af4..14d70ff1a67e88 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (42 preceding siblings ...)
2025-06-16 13:53 ` dkwo
@ 2025-06-16 15:15 ` dkwo
2025-06-16 19:20 ` dkwo
` (10 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-16 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
- `0ad` is also broken on master branch, and tricky to fix.
cc @Johnnynator I had to add `fmt` to `android-tools`. Adapted your prior PR with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 73932 bytes --]
From 59d33d39acec9babf6902e2c489597061029c1de Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/32] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 22e09f221236d5..47c73089775462 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.32 libtls-4.1.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 69596740cf4005190f3e93d586f8010a215ae0a7 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/32] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From cdf646d6d1a1e124814d7a3b87f9caa1c95e4e0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/32] Bear: rebuild for fmt
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fdc02b197280a6..cc0ce8d4d9252c 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.6
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 46bc7da8c5aa1e1c1977f2ff3890220ac77bb6c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/32] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From b0341b62a96e0c395b541bdce1f16acea41dd62a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/32] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From c4660f32002c0e4b81c64539b33a14112d092542 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/32] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 816e3b7bc4e88c82c94f081390b8bd604e8465b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/32] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 2dc910b94f09599ff980a165f5f789dee0ae68d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 08/32] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 00b34dabc152997b09abc4c46567d0ae4d6a0343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/32] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 498a5cb404b3ff..cf442945ef8516 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 419a81fe636545c702b06898c00ac17c2e0201e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/32] freecad: bump for fmt
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae89313c959879..94976c4f34f7de 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.1
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
build_style=cmake
From 8a4999dbc6f727ce036ea44dd416496dae0ac005 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/32] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index f3d4e7d2e53e52..8df8d3002a2b70 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.3
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 6c3cb4151fac847a90572e46eca6e79795c3f689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/32] gerbera: bump for fmt
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 3b92df3fa8281e..ead68eb5917ab3 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=2.5.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
From 807dfdf0e5c86ebe338c04ca2ce6cb9c89ae0c8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/32] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 47c73089775462..ac292309e8daf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3319,28 +3319,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 26d8fab69e25040ddc0b18df95e6e2ccb31ea8bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 14/32] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From a112955145db0aeac8eb298f1f3739756c905d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 15/32] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 940841b8ecb58a..04a53271cf69c9 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 264813eb70e3c260f7ccad32c0943f6f0f81385e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/32] kodi: patch for fmt
---
srcpkgs/kodi/patches/pagesize.patch | 20 ++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/pagesize.patch
diff --git a/srcpkgs/kodi/patches/pagesize.patch b/srcpkgs/kodi/patches/pagesize.patch
new file mode 100644
index 00000000000000..71f9baf2720ba6
--- /dev/null
+++ b/srcpkgs/kodi/patches/pagesize.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/utils/UDMABufferObject.cpp 2024-04-06 04:29:22.000000000 +0200
++++ - 2024-09-07 20:00:02.010184618 +0200
+@@ -23,7 +23,7 @@
+ namespace
+ {
+
+-const auto PAGESIZE = getpagesize();
++const auto pagesize = getpagesize();
+
+ int RoundUp(int num, int factor)
+ {
+@@ -93,7 +93,7 @@
+ bool CUDMABufferObject::CreateBufferObject(uint64_t size)
+ {
+ // Must be rounded to the system page size
+- m_size = RoundUp(size, PAGESIZE);
++ m_size = RoundUp(size, pagesize);
+
+ m_memfd = memfd_create("kodi", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+ if (m_memfd < 0)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 6e60372455a9fe..989cdd48a86e85 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.2
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From e5185160a548c57b47d52fd518e21fd780524646 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/32] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ce27329db78b90..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.17
+version=0.24.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 5829a43d39a83adcaacfc0d54764edef7551e9df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 18/32] mtxclient: patch for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 8ec5d9bf7e8d98399a5dc954020238dda83b9171 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 19/32] nheko: patch for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From ced71cb37abfa9ade635e7c448eacdd440b75b92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/32] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 97736f73ebda4c181e4053da5fb0be840c3d17d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/32] paps: patch for fmt
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 42a04d90d43c25047e48a5f7aee4024b1a3c6dd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/32] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ac292309e8daf3..eecb23a5b97fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 1accd414d3199ddac120c3fe7da1ef6fa1766952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 23/32] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 6a7cca08dcc5688bf4c4ad2874abeb41f91f81c2 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 24/32] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index eecb23a5b97fd7..4a96e68834221e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3344,116 +3344,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From adef23830169b1baa0b3f95baaeddf1256296cda Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 25/32] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7a38065d92eaf9..9588f2b70f42d2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=92.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From a33cc4221cdbfe03766a811ea9938539d2fb384f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 26/32] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From c84fbfcbf5b8f9fb4abc734630e771fb628fb8f4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 27/32] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From d394b83b723cf1c8eef0693ae2d1eadd06b4eb72 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 28/32] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 0824a561ae00c003f1be52d2b1ea8766a46e3a19 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 29/32] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From 4aed58324484a9aac5909b4929d66d70b36407b0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 30/32] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b8ceaf23decb39..884396fea05692 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.7
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From 4f242f7b417f2ccdad7b0c355f7fcde515875a45 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:34:32 -0400
Subject: [PATCH 31/32] 0ad: mark broken
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..ce12bd83359aaa 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -19,7 +19,7 @@ checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-
+broken="does not build on master"
skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
From e913fd93a6204e65bee6fe3799b1fa9f8e1f6e21 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:44:50 -0400
Subject: [PATCH 32/32] devilutionX: bump for fmt
---
srcpkgs/devilutionX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 9a2e4f19a17af4..14d70ff1a67e88 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Updated] Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (43 preceding siblings ...)
2025-06-16 15:15 ` dkwo
@ 2025-06-16 19:20 ` dkwo
2025-06-17 18:02 ` [PR PATCH] [Closed]: " dkwo
` (9 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-16 19:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages android-tools
https://github.com/void-linux/void-packages/pull/55099
Android tools
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
- `0ad` is also broken on master branch, and tricky to fix.
cc @Johnnynator I had to add `fmt` to `android-tools`. Adapted your prior PR with changes.
A patch file from https://github.com/void-linux/void-packages/pull/55099.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-55099.patch --]
[-- Type: text/x-diff, Size: 73001 bytes --]
From 59d33d39acec9babf6902e2c489597061029c1de Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:17:16 -0400
Subject: [PATCH 01/32] fmt: update to 11.1.4
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 22e09f221236d5..47c73089775462 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libcotp.so.3 libcotp-3.0.0_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.9 fmt-9.0.0_1
+libfmt.so.11 fmt-11.1.4_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.32 libtls-4.1.0_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index c32298a35a90ff..b754ca0c878568 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=11.1.4
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="MIT WITH fmt-exception"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+checksum=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 69596740cf4005190f3e93d586f8010a215ae0a7 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH 02/32] android-tools: update to 35.0.2, fix i686
---
srcpkgs/android-tools/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5ae77..7137bcab81d340 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,11 +1,13 @@
# Template file for 'android-tools'
pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.2
+revision=1
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
-hostmakedepends="perl go protobuf pkg-config"
-makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
+# requires new changes in libusb that have not been released yet
+configure_args="-DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON"
+hostmakedepends="perl go protobuf pkg-config samurai"
+makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel fmt-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
depends="python3"
short_desc="Android platform tools (adb and fastboot)"
@@ -13,11 +15,13 @@ maintainer="John <me@johnnynator.dev>"
license="Apache-2.0, ISC, GPL-2.0-only, MIT"
homepage="https://developer.android.com/tools/help/adb.html"
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-msse2" CXXFLAGS="-msse2";;
+esac
post_install() {
- # zsh's built in works, while this one doesn't
- rm -f $DESTDIR/usr/share/zsh/site-functions/_adb
vlicense vendor/boringssl/LICENSE boringssl.LICENSE
vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
vsv adb
From cdf646d6d1a1e124814d7a3b87f9caa1c95e4e0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 03/32] Bear: rebuild for fmt
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fdc02b197280a6..cc0ce8d4d9252c 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.6
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 46bc7da8c5aa1e1c1977f2ff3890220ac77bb6c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 04/32] MangoHud: rebuild for fmt
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 7c11c0533e7448..0b3ead823abbe8 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.8.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled -Dmangoapp=true"
From b0341b62a96e0c395b541bdce1f16acea41dd62a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 05/32] Waybar: rebuild for fmt
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index abf52b9c11106b..7805ce4735cdea 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.12.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From c4660f32002c0e4b81c64539b33a14112d092542 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 06/32] cherrytree: rebuild for fmt
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index b83f0f40611459..9ac7662496779c 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.2.0
-revision=2
+revision=3
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From 816e3b7bc4e88c82c94f081390b8bd604e8465b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:08 +0200
Subject: [PATCH 07/32] coeurl: update to 0.3.1
---
srcpkgs/coeurl/patches/fix-build.diff | 11 -----------
srcpkgs/coeurl/template | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
deleted file mode 100644
index 6b3b33e6806a24..00000000000000
--- a/srcpkgs/coeurl/patches/fix-build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
-index f1510b4ba5..ec9710f9d7 100644
---- a/subprojects/curl.wrap
-+++ b/subprojects/curl.wrap
-@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
- source_filename = curl-7.77.0.tar.xz
- source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
-
--[provides]
-+[provide]
- dependency_names = libcurl
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..b73eb89978ab8d 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,6 +1,6 @@
# Template file for 'coeurl'
pkgname=coeurl
-version=0.3.0
+version=0.3.1
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://nheko.im/nheko-reborn/coeurl"
distfiles="https://nheko.im/nheko-reborn/coeurl/-/archive/v${version}/coeurl-v${version}.tar.gz"
-checksum=48b07482364edcbed03e352f6b8b07e327c331eaa45707ad58e62930fa361382
+checksum=6203654c2eec7a286388a6cfa8d8ea5698c57b7b8be235b2cc165f0b4c7bee0b
post_install() {
vlicense LICENSE
From 2dc910b94f09599ff980a165f5f789dee0ae68d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 08/32] cryfs: rebuild for fmt
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index bb2109c034e8cb..3e523766b129c1 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off
-DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
From 00b34dabc152997b09abc4c46567d0ae4d6a0343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 09/32] easyeffects: rebuild for fmt
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 498a5cb404b3ff..cf442945ef8516 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 419a81fe636545c702b06898c00ac17c2e0201e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 10/32] freecad: bump for fmt
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index ae89313c959879..94976c4f34f7de 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=1.0.1
-revision=2
+revision=3
_pycxx_ver=7.1.8
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
build_style=cmake
From 8a4999dbc6f727ce036ea44dd416496dae0ac005 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 11/32] furnace: rebuild for fmt
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index f3d4e7d2e53e52..8df8d3002a2b70 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.8.3
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_FREETYPE=ON
From 6c3cb4151fac847a90572e46eca6e79795c3f689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 12/32] gerbera: bump for fmt
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 3b92df3fa8281e..ead68eb5917ab3 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=2.5.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
From 807dfdf0e5c86ebe338c04ca2ce6cb9c89ae0c8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:09 +0200
Subject: [PATCH 13/32] gnuradio: update to 3.10.12
---
common/shlibs | 44 +++++++++++++++++++--------------------
srcpkgs/gnuradio/template | 6 +++---
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 47c73089775462..ac292309e8daf3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3319,28 +3319,28 @@ libopentime.so.17 OpenTimelineIO-0.17.0_1
libopentimelineio.so.17 OpenTimelineIO-0.17.0_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
-libgnuradio-runtime.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pmt.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-blocks.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-audio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fec.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-fft.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-filter.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-analog.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-digital.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-dtv.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-channels.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-trellis.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-video-sdl.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-vocoder.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-wavelet.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-uhd.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-network.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-soapy.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-qtgui.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-zeromq.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-iio.so.3.10.11 gnuradio-3.10.11.0_1
-libgnuradio-pdu.so.3.10.11 gnuradio-3.10.11.0_1
+libgnuradio-runtime.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pmt.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-blocks.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-audio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fec.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-fft.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-filter.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-analog.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-digital.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-dtv.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-channels.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-trellis.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-video-sdl.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-vocoder.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-wavelet.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-uhd.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-network.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-soapy.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-qtgui.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-zeromq.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-iio.so.3.10.12 gnuradio-3.10.12.0_1
+libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index f55184640187a9..6ccd7a1ea0bf89 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
-version=3.10.11.0
-revision=4
+version=3.10.12.0
+revision=1
build_style=cmake
build_helper="python3"
conf_files="/etc/gnuradio/conf.d/*"
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29
+checksum=fe78ad9f74c8ebf93d5c8ad6fa2c13236af330f3c67149d91a0647b3dc6f3958
python_version=3
if [ "$CROSS_BUILD" ]; then
From 26d8fab69e25040ddc0b18df95e6e2ccb31ea8bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 14/32] j4-dmenu-desktop: rebuild for fmt
---
srcpkgs/j4-dmenu-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 623a13c4d0554f..8f7af700c80281 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'j4-dmenu-desktop'
pkgname=j4-dmenu-desktop
version=3.2
-revision=1
+revision=2
build_style=meson
configure_args="-Denable-tests=false"
hostmakedepends="pkg-config"
From a112955145db0aeac8eb298f1f3739756c905d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 15/32] justbuild: rebuild for fmt
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 940841b8ecb58a..04a53271cf69c9 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.5.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 25c23da40ffa896024964f5ed124a14392abf1d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 16/32] kodi: bump for fmt
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 6e60372455a9fe..989cdd48a86e85 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.2
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 6831257aeea052b1fe87440ccb0a6f022ef82e39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:10 +0200
Subject: [PATCH 17/32] mpd: update to 0.24.3
---
srcpkgs/mpd/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index ce27329db78b90..e14018d257ed55 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,10 +1,10 @@
# Template file for 'mpd'
pkgname=mpd
-version=0.23.17
+version=0.24.3
revision=1
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
- -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
+ -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
-Dzzip=enabled -Dsmbclient=disabled -Dsystemd=disabled -Dqobuz=disabled
-Dchromaprint=disabled -Dsoxr=enabled -Dadplug=disabled
-Dfluidsynth=disabled -Dgme=disabled -Dwildmidi=disabled -Dsidplay=disabled
@@ -38,7 +38,7 @@ license="GPL-2.0-or-later"
homepage="https://www.musicpd.org/"
changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2
+checksum=4225680e068b2ad87e3c2de414ec3209758de93d671f89fa3bae90b70af478a2
LDFLAGS="-Wl,-z,stack-size=1048576"
system_accounts="mpd"
From 0cafe71abb8388795137f42af55f8713f9c2e116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 18/32] mtxclient: patch for fmt
---
...26c77123f805cff8b954909663eaed296558.patch | 46 +++++++++++++++++++
srcpkgs/mtxclient/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
diff --git a/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
new file mode 100644
index 00000000000000..6f82aa274c383b
--- /dev/null
+++ b/srcpkgs/mtxclient/patches/4a4726c77123f805cff8b954909663eaed296558.patch
@@ -0,0 +1,46 @@
+From 4a4726c77123f805cff8b954909663eaed296558 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:35:09 +0800
+Subject: [PATCH] Fix build with fmt 11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fmt 11 enforces that fmt::formatter<..>::format() should be const.
+otherwise the tree does not build:
+
+```
+/usr/include/fmt/base.h:1392:29: error: passing ‘const fmt::v11::formatter<std::optional<mtx::http::ClientError> >’ as ‘this’ argument discards qualifiers [-fpermissive]
+ 1392 | ctx.advance_to(cf.format(*static_cast<qualified_type*>(arg), ctx));
+ | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+so let's mark the `format()` with `const` specifier.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+---
+ include/mtxclient/http/errors.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/mtxclient/http/errors.hpp b/include/mtxclient/http/errors.hpp
+index 2d0e7a45..b99ff90e 100644
+--- a/include/mtxclient/http/errors.hpp
++++ b/include/mtxclient/http/errors.hpp
+@@ -87,7 +87,7 @@ struct fmt::formatter<mtx::http::ClientError>
+ // Formats the point p using the parsed format specification (presentation)
+ // stored in this formatter.
+ template<typename FormatContext>
+- auto format(const mtx::http::ClientError &e, FormatContext &ctx) -> decltype(ctx.out())
++ auto format(const mtx::http::ClientError &e, FormatContext &ctx) const -> decltype(ctx.out())
+ {
+ // ctx.out() is an output iterator to write to.
+ bool prepend_comma = false;
+@@ -132,7 +132,7 @@ struct fmt::formatter<std::optional<mtx::http::ClientError>> : formatter<mtx::ht
+ {
+ // parse is inherited from formatter<string_view>.
+ template<typename FormatContext>
+- auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx)
++ auto format(std::optional<mtx::http::ClientError> c, FormatContext &ctx) const
+ {
+ if (!c)
+ return fmt::format_to(ctx.out(), "(no error)");
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.10.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 368a804c8f0e6b7f6125e501d2c8f187f65df014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 19/32] nheko: patch for fmt
---
...8245275eeb0cfe4ed40bd62b97cebbce4861.patch | 48 +++++++++++++++++++
srcpkgs/nheko/template | 2 +-
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
diff --git a/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
new file mode 100644
index 00000000000000..65a3b87ed90682
--- /dev/null
+++ b/srcpkgs/nheko/patches/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch
@@ -0,0 +1,48 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp | 2 ++
+ src/Utils.cpp | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+
+ #include <set>
+
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+
+ #include "Cache.h"
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 9af55f3ec46d0e..6a30ef2eb0da67 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=3
+revision=4
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
From ed5f31ecb496dda1f8a96aa79fb3abb1048919f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 20/32] opendht: rebuild for fmt
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b18ada2e756011..f11babfddc8595 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
version=2.6.0.4
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From 2182007c3b0e37d14c191bf017ecd39ad4b26c7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 21/32] paps: patch for fmt
---
srcpkgs/paps/patches/glib282.patch | 45 ++++++++++++++++++++++++++++++
srcpkgs/paps/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paps/patches/glib282.patch
diff --git a/srcpkgs/paps/patches/glib282.patch b/srcpkgs/paps/patches/glib282.patch
new file mode 100644
index 00000000000000..6363bafdf41d33
--- /dev/null
+++ b/srcpkgs/paps/patches/glib282.patch
@@ -0,0 +1,45 @@
+From e9270aaac5e0b8018a6fad9a562ee48e7b2c3113 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 460daaaae5486d..71a802089a7c14 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,7 +1,7 @@
# Template file for 'paps'
pkgname=paps
version=0.8.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config cmake"
makedepends="fmt-devel freetype-devel pango-devel"
From 94d3f5872910cc3666e81ccedc1da44ee2af84f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 7 Sep 2024 16:22:11 +0200
Subject: [PATCH 22/32] spdlog: update to 1.15.2
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ac292309e8daf3..eecb23a5b97fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libwayland-client++.so.1 libwaylandpp-1.0.0_1
libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
libwayland-egl++.so.1 libwaylandpp-1.0.0_1
libwayland-client-extra++.so.1 libwaylandpp-1.0.0_1
-libspdlog.so.1.11 libspdlog-1.11.0_1
+libspdlog.so.1.15 libspdlog-1.15.2_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 045f86def2cc33..c068552fbc2cdf 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,6 +1,6 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.11.0
+version=1.15.2
revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
@@ -13,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
+checksum=7a80896357f3e8e920e85e92633b14ba0f229c506e6f978578bdc35ba09e9a5d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
+ hostmakedepends+=" catch2"
fi
libspdlog_package() {
From 7a67dc74ae0f9ae38f81d990a78df1b63393e750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 10 Sep 2024 22:45:12 +0200
Subject: [PATCH 23/32] imhex: rebuild for fmt
---
srcpkgs/imhex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index b10c948af3d79f..059b50da85b00f 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
version=1.35.4
-revision=2
+revision=3
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
From 548291949a000bc7f4cab2f6b6621d71e14f7d3f Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Sat, 19 Apr 2025 18:24:45 -0400
Subject: [PATCH 24/32] vtk: update to 9.4.2
---
common/shlibs | 220 ++++++-------
srcpkgs/vtk/patches/0001-stat64.patch | 390 -----------------------
srcpkgs/vtk/patches/0002-stat64.patch | 170 ----------
srcpkgs/vtk/patches/fmt-11.patch | 22 ++
srcpkgs/vtk/patches/vtkioss-unistd.patch | 26 --
srcpkgs/vtk/template | 7 +-
6 files changed, 136 insertions(+), 699 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/0001-stat64.patch
delete mode 100644 srcpkgs/vtk/patches/0002-stat64.patch
create mode 100644 srcpkgs/vtk/patches/fmt-11.patch
delete mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch
diff --git a/common/shlibs b/common/shlibs
index eecb23a5b97fd7..4a96e68834221e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3344,116 +3344,116 @@ libgnuradio-pdu.so.3.10.12 gnuradio-3.10.12.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
-libvtkCommonCore-9.3.so.1 vtk-9.3.0_1
-libvtksys-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMisc-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkCommonTransforms-9.3.so.1 vtk-9.3.0_1
-libvtkCommonMath-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLOD-9.3.so.1 vtk-9.3.0_1
-libvtkViewsInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkIOIOSS-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLabel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersPoints-9.3.so.1 vtk-9.3.0_1
-libvtkCommonExecutionModel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingHyperTreeGrid-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkCommonDataModel-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTopology-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSources-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolumeOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOOggTheora-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportGL2PS-9.3.so.1 vtk-9.3.0_1
-libvtkIOAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOCesium3DTiles-9.3.so.1 vtk-9.3.0_1
-libvtkIOSegY-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVtkJS-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersTexture-9.3.so.1 vtk-9.3.0_1
-libvtkIOVideo-9.3.so.1 vtk-9.3.0_1
-libvtkImagingSources-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStencil-9.3.so.1 vtk-9.3.0_1
-libvtkIOCGNSReader-9.3.so.1 vtk-9.3.0_1
-libvtkCommonComputationalGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkIOVeraOut-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionImage-9.3.so.1 vtk-9.3.0_1
-libvtkChartsCore-9.3.so.1 vtk-9.3.0_1
-libvtkImagingStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkImagingHybrid-9.3.so.1 vtk-9.3.0_1
-libvtkGeovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionWidgets-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersImaging-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersVerdict-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSMP-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingUI-9.3.so.1 vtk-9.3.0_1
-libvtkIOHDF-9.3.so.1 vtk-9.3.0_1
-libvtkCommonSystem-9.3.so.1 vtk-9.3.0_1
-libvtkImagingColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingSceneGraph-9.3.so.1 vtk-9.3.0_1
-libvtkParallelCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOInfovis-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkImagingFourier-9.3.so.1 vtk-9.3.0_1
-libvtkCommonColor-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingAnnotation-9.3.so.1 vtk-9.3.0_1
-libvtkIOSQL-9.3.so.1 vtk-9.3.0_1
-libvtkIOImage-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersExtraction-9.3.so.1 vtk-9.3.0_1
-libvtkIOGeometry-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersFlowPaths-9.3.so.1 vtk-9.3.0_1
-libvtkIOMovie-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingVolume-9.3.so.1 vtk-9.3.0_1
-libvtkIOEnSight-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistryOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersStatistics-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersSelection-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersModeling-9.3.so.1 vtk-9.3.0_1
-libvtkViewsCore-9.3.so.1 vtk-9.3.0_1
-libvtkIOMotionFX-9.3.so.1 vtk-9.3.0_1
-libvtkIOLSDyna-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallel-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingContextOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingImage-9.3.so.1 vtk-9.3.0_1
-libvtkIOXMLParser-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMorphological-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallel-9.3.so.1 vtk-9.3.0_1
-libvtkViewsContext2D-9.3.so.1 vtk-9.3.0_1
-libvtkIOImport-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingLICOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkIOAsynchronous-9.3.so.1 vtk-9.3.0_1
-libvtkIOTecplotTable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCityGML-9.3.so.1 vtk-9.3.0_1
-libvtkImagingMath-9.3.so.1 vtk-9.3.0_1
-libvtkIOParallelXML-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingGL2PSOpenGL2-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersGeneric-9.3.so.1 vtk-9.3.0_1
-libvtkIONetCDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingCore-9.3.so.1 vtk-9.3.0_1
-libvtkInfovisLayout-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersHyperTree-9.3.so.1 vtk-9.3.0_1
-libvtkIOExportPDF-9.3.so.1 vtk-9.3.0_1
-libvtkImagingGeneral-9.3.so.1 vtk-9.3.0_1
-libvtkIOXML-9.3.so.1 vtk-9.3.0_1
-libvtkIOChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkInteractionStyle-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersAMR-9.3.so.1 vtk-9.3.0_1
-libvtkIOMINC-9.3.so.1 vtk-9.3.0_1
-libvtkTestingRendering-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersParallelImaging-9.3.so.1 vtk-9.3.0_1
-libvtkDomainsChemistry-9.3.so.1 vtk-9.3.0_1
-libvtkIOExport-9.3.so.1 vtk-9.3.0_1
-libvtkIOCore-9.3.so.1 vtk-9.3.0_1
-libvtkFiltersProgrammable-9.3.so.1 vtk-9.3.0_1
-libvtkIOCONVERGECFD-9.3.so.1 vtk-9.3.0_1
-libvtkIOLegacy-9.3.so.1 vtk-9.3.0_1
-libvtkRenderingFreeType-9.3.so.1 vtk-9.3.0_1
-libvtkIOPLY-9.3.so.1 vtk-9.3.0_1
-libvtkIOExodus-9.3.so.1 vtk-9.3.0_1
-libvtkkissfft-9.3.so.1 vtk-9.3.0_1
+libvtkCommonCore-9.4.so.1 vtk-9.4.2_1
+libvtksys-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMisc-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkCommonTransforms-9.4.so.1 vtk-9.4.2_1
+libvtkCommonMath-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLOD-9.4.so.1 vtk-9.4.2_1
+libvtkViewsInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkIOIOSS-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLabel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersPoints-9.4.so.1 vtk-9.4.2_1
+libvtkCommonExecutionModel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingHyperTreeGrid-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkCommonDataModel-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTopology-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSources-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolumeOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOOggTheora-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportGL2PS-9.4.so.1 vtk-9.4.2_1
+libvtkIOAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOCesium3DTiles-9.4.so.1 vtk-9.4.2_1
+libvtkIOSegY-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVtkJS-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersTexture-9.4.so.1 vtk-9.4.2_1
+libvtkIOVideo-9.4.so.1 vtk-9.4.2_1
+libvtkImagingSources-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStencil-9.4.so.1 vtk-9.4.2_1
+libvtkIOCGNSReader-9.4.so.1 vtk-9.4.2_1
+libvtkCommonComputationalGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkIOVeraOut-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionImage-9.4.so.1 vtk-9.4.2_1
+libvtkChartsCore-9.4.so.1 vtk-9.4.2_1
+libvtkImagingStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkImagingHybrid-9.4.so.1 vtk-9.4.2_1
+libvtkGeovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionWidgets-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersImaging-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersVerdict-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSMP-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingUI-9.4.so.1 vtk-9.4.2_1
+libvtkIOHDF-9.4.so.1 vtk-9.4.2_1
+libvtkCommonSystem-9.4.so.1 vtk-9.4.2_1
+libvtkImagingColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingSceneGraph-9.4.so.1 vtk-9.4.2_1
+libvtkParallelCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOInfovis-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkImagingFourier-9.4.so.1 vtk-9.4.2_1
+libvtkCommonColor-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingAnnotation-9.4.so.1 vtk-9.4.2_1
+libvtkIOSQL-9.4.so.1 vtk-9.4.2_1
+libvtkIOImage-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersExtraction-9.4.so.1 vtk-9.4.2_1
+libvtkIOGeometry-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersFlowPaths-9.4.so.1 vtk-9.4.2_1
+libvtkIOMovie-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingVolume-9.4.so.1 vtk-9.4.2_1
+libvtkIOEnSight-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistryOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersStatistics-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersSelection-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersModeling-9.4.so.1 vtk-9.4.2_1
+libvtkViewsCore-9.4.so.1 vtk-9.4.2_1
+libvtkIOMotionFX-9.4.so.1 vtk-9.4.2_1
+libvtkIOLSDyna-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallel-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingContextOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingImage-9.4.so.1 vtk-9.4.2_1
+libvtkIOXMLParser-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMorphological-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallel-9.4.so.1 vtk-9.4.2_1
+libvtkViewsContext2D-9.4.so.1 vtk-9.4.2_1
+libvtkIOImport-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingLICOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkIOAsynchronous-9.4.so.1 vtk-9.4.2_1
+libvtkIOTecplotTable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCityGML-9.4.so.1 vtk-9.4.2_1
+libvtkImagingMath-9.4.so.1 vtk-9.4.2_1
+libvtkIOParallelXML-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingGL2PSOpenGL2-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersGeneric-9.4.so.1 vtk-9.4.2_1
+libvtkIONetCDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingCore-9.4.so.1 vtk-9.4.2_1
+libvtkInfovisLayout-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersHyperTree-9.4.so.1 vtk-9.4.2_1
+libvtkIOExportPDF-9.4.so.1 vtk-9.4.2_1
+libvtkImagingGeneral-9.4.so.1 vtk-9.4.2_1
+libvtkIOXML-9.4.so.1 vtk-9.4.2_1
+libvtkIOChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkInteractionStyle-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersAMR-9.4.so.1 vtk-9.4.2_1
+libvtkIOMINC-9.4.so.1 vtk-9.4.2_1
+libvtkTestingRendering-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersParallelImaging-9.4.so.1 vtk-9.4.2_1
+libvtkDomainsChemistry-9.4.so.1 vtk-9.4.2_1
+libvtkIOExport-9.4.so.1 vtk-9.4.2_1
+libvtkIOCore-9.4.so.1 vtk-9.4.2_1
+libvtkFiltersProgrammable-9.4.so.1 vtk-9.4.2_1
+libvtkIOCONVERGECFD-9.4.so.1 vtk-9.4.2_1
+libvtkIOLegacy-9.4.so.1 vtk-9.4.2_1
+libvtkRenderingFreeType-9.4.so.1 vtk-9.4.2_1
+libvtkIOPLY-9.4.so.1 vtk-9.4.2_1
+libvtkIOExodus-9.4.so.1 vtk-9.4.2_1
+libvtkkissfft-9.4.so.1 vtk-9.4.2_1
libvolume_key.so.1 volume_key-0.3.9_1
libxxhash.so.0 libxxHash-0.6.5_2
libcapnp_c.so.0 c-capnproto-0.3_1
diff --git a/srcpkgs/vtk/patches/0001-stat64.patch b/srcpkgs/vtk/patches/0001-stat64.patch
deleted file mode 100644
index aa673d2b6e9266..00000000000000
--- a/srcpkgs/vtk/patches/0001-stat64.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 748572894e96b1eab4089da912441ae1b588b2aa Mon Sep 17 00:00:00 2001
-From: Jaswant Panchumarti <jaswant.panchumarti@kitware.com>
-Date: Wed, 30 Aug 2023 15:24:16 -0400
-Subject: [PATCH] emsdk 3.1.45: get code to compile
-
-- closes vtk/vtk#19060.
-- disable IOExportGL2PS for WebAssembly.
-- handle stat64 vs stat for emscripten in LSDyna and Ensight readers.
----
- .../docs/advanced/build_wasm_emscripten.md | 10 +++
- .../release/dev/update-dawn-webgpu.md | 6 ++
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 8 ++
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 8 ++
- IO/ExportGL2PS/vtk.module | 2 +-
- IO/LSDyna/LSDynaFamily.cxx | 8 ++
- Rendering/WebGPU/vtkWGPUContext.cxx | 77 ++++++-------------
- Rendering/WebGPU/vtkWebGPUActor.cxx | 5 ++
- .../WebGPU/vtkWebGPUInternalsShaderModule.cxx | 2 +-
- Rendering/WebGPU/vtkWebGPURenderWindow.cxx | 38 ++++++---
- 10 files changed, 98 insertions(+), 66 deletions(-)
- create mode 100644 Documentation/release/dev/update-dawn-webgpu.md
-
-diff --git a/Documentation/docs/advanced/build_wasm_emscripten.md b/Documentation/docs/advanced/build_wasm_emscripten.md
-index ceb50ce1115..c58b1a269c3 100644
---- a/Documentation/docs/advanced/build_wasm_emscripten.md
-+++ b/Documentation/docs/advanced/build_wasm_emscripten.md
-@@ -54,6 +54,16 @@ For this guide, you will need the following:
- These instructions use a specific convention for the source, build and install directories that is appropriate when building VTK for wasm inside
- a docker container. Please replace these _root-directory_ paths if VTK is being built outside a docker container.
-
-+### Install emscripten ports (IMPORTANT!)
-+Emscripten uses SDL2 to connect user input events to the browser event subsystem. The SDL2 port
-+will need to be built if this is the first time you downloaded the EMSDK. The `embuilder` script
-+will be on the path if you installed and activated EMSDK as described in the prerequisites.
-+```bash
-+$ embuilder build sdl2
-+```
-+
-+### Build VTK
-+
- 1. Configure the project with CMake. `emcmake` tells CMake to use the `emscripten` toolchain for cross compilation.
-
- ```bash
-diff --git a/Documentation/release/dev/update-dawn-webgpu.md b/Documentation/release/dev/update-dawn-webgpu.md
-new file mode 100644
-index 00000000000..faa8f53bbbe
---- /dev/null
-+++ b/Documentation/release/dev/update-dawn-webgpu.md
-@@ -0,0 +1,6 @@
-+# Update Dawn/WebGPU API in the WebGPU backend
-+
-+- `WGPUShaderModuleWGSLDescriptor::source` has now been renamed to `WGPUShaderModuleWGSLDescriptor::code`.
-+- `SetDeviceLostCallback`(deprecated by webgpu) has been removed in favor of `WGPUDeviceDescriptor::deviceLostCallback` member.
-+- `dawn::native::GetAdapter` (deprecated by dawn) has now been renamed to `dawn::native::EnumerateAdapters`.
-+- `wgpu::RenderBundleEncoder::colorFormatsCount` (deprecated by webgpu) has now been renamed to `colorFormatCount`. However, emscripten still uses the version of webgpu which shipped with `colorFormatsCount`, so in webassembly, `colorFormatsCount` continues to be used. We will change this after emscripten updates it's webgpu headers.
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 2cd04c9755b..167e63efd41 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -31,6 +31,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index e3c81bd5e8c..c374f9879bf 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -37,6 +37,14 @@
- // The BSDs use stat().
- #define VTK_STAT_STRUCT struct stat
- #define VTK_STAT_FUNC stat
-+#elif defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
-+#define VTK_STAT_STRUCT struct stat64
-+#define VTK_STAT_FUNC stat64
-+#else
-+#define VTK_STAT_STRUCT struct stat
-+#define VTK_STAT_FUNC stat
-+#endif
- #else
- // here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
- // us on POSIX without resorting to using stat64.
-diff --git a/IO/ExportGL2PS/vtk.module b/IO/ExportGL2PS/vtk.module
-index d72b75b482e..97038c7fb17 100644
---- a/IO/ExportGL2PS/vtk.module
-+++ b/IO/ExportGL2PS/vtk.module
-@@ -3,7 +3,7 @@ NAME
- LIBRARY_NAME
- vtkIOExportGL2PS
- CONDITION
-- NOT ANDROID AND NOT APPLE_IOS AND NOT VTK_OPENGL_USE_GLES
-+ NOT ANDROID AND NOT APPLE_IOS AND NOT EMSCRIPTEN AND NOT VTK_OPENGL_USE_GLES
- IMPLEMENTABLE
- IMPLEMENTS
- VTK::IOExportGL2PS
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index 15755d06840..fdb914ab6fa 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -24,8 +24,16 @@ namespace
- #if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #ifndef _WIN32
-+#if defined __EMSCRIPTEN__
-+#if defined _LARGEFILE64_SOURCE
- #define USE_STAT_64
- #else
-+#define USE_STAT
-+#endif
-+#else
-+#define USE_STAT_64
-+#endif
-+#else
- #define USE_WIN_STAT_64
- #endif
- #else
-diff --git a/Rendering/WebGPU/vtkWGPUContext.cxx b/Rendering/WebGPU/vtkWGPUContext.cxx
-index d0400786707..b280022873a 100644
---- a/Rendering/WebGPU/vtkWGPUContext.cxx
-+++ b/Rendering/WebGPU/vtkWGPUContext.cxx
-@@ -73,7 +73,7 @@ static void WaitABit()
-
- }
- namespace vtkWGPUImpl = vtkWGPUEmscriptenImpl;
--#elif VTK_USE_DAWN_NATIVE
-+#elif VTK_USE_DAWN_WEBGPU
- #include <cstring>
- #include <dawn/dawn_proc.h>
- #include <dawn/native/DawnNative.h>
-@@ -88,11 +88,11 @@ static struct
- struct
- {
- DawnProcTable ProcTable;
-- std::unique_ptr<dawn_native::Instance> Instance = nullptr;
-+ std::unique_ptr<dawn::native::Instance> Instance = nullptr;
- } DawnNativeEntryPoint;
- struct
- {
-- dawn_native::Adapter Handle;
-+ dawn::native::Adapter Handle;
- wgpu::BackendType DawnBackendType;
- struct
- {
-@@ -113,10 +113,10 @@ static void Initialize()
- }
-
- // Set up the native procs for the global proctable
-- GPUContext.DawnNativeEntryPoint.ProcTable = dawn_native::GetProcs();
-+ GPUContext.DawnNativeEntryPoint.ProcTable = dawn::native::GetProcs();
- dawnProcSetProcs(&GPUContext.DawnNativeEntryPoint.ProcTable);
- GPUContext.DawnNativeEntryPoint.Instance =
-- std::unique_ptr<dawn_native::Instance>(new dawn_native::Instance());
-+ std::unique_ptr<dawn::native::Instance>(new dawn::native::Instance());
- GPUContext.DawnNativeEntryPoint.Instance->DiscoverDefaultAdapters();
- GPUContext.DawnNativeEntryPoint.Instance->EnableBackendValidation(true);
-
-@@ -125,16 +125,12 @@ static void Initialize()
- // are the preferred on their respective platforms, and Vulkan is preferred to
- // OpenGL
- GPUContext.Adapter.DawnBackendType =
--#if defined(VTK_DAWN_ENABLE_BACKEND_D3D12)
-+#if defined(_WIN32)
- wgpu::BackendType::D3D12;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_METAL)
-+#elif defined(__APPLE__)
- wgpu::BackendType::Metal;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_VULKAN)
-- wgpu::BackendType::Vulkan;
--#elif defined(VTK_DAWN_ENABLE_BACKEND_OPENGL)
-- wgpu::BackendType::OpenGL;
- #else
--#error
-+ wgpu::BackendType::Vulkan;
- #endif
- GPUContext.Adapter.Handle = nullptr;
- GPUContext.Initialized = true;
-@@ -159,48 +155,19 @@ static wgpu::Adapter RequestAdapter(const wgpu::RequestAdapterOptions& options)
- {
- Initialize();
-
-- // Search available adapters for a good match, in the
-- // following priority order
-- std::vector<wgpu::AdapterType> typePriority;
-- if (options.powerPreference == wgpu::PowerPreference::LowPower)
-- {
-- // low power
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
-- else if (options.powerPreference == wgpu::PowerPreference::HighPerformance)
-- {
-- // high performance
-- typePriority = std::vector<wgpu::AdapterType>{
-- wgpu::AdapterType::DiscreteGPU,
-- wgpu::AdapterType::IntegratedGPU,
-- wgpu::AdapterType::CPU,
-- };
-- }
--
-- std::vector<dawn_native::Adapter> adapters =
-- GPUContext.DawnNativeEntryPoint.Instance->GetAdapters();
-- for (auto reqType : typePriority)
-+ std::vector<dawn::native::Adapter> adapters =
-+ GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters(&options);
-+ for (const dawn::native::Adapter& adapter : adapters)
- {
-- for (const dawn_native::Adapter& adapter : adapters)
-- {
-- wgpu::AdapterProperties ap;
-- adapter.GetProperties(&ap);
-- if (ap.adapterType == reqType &&
-- (reqType == wgpu::AdapterType::CPU || ap.backendType == GPUContext.Adapter.DawnBackendType))
-- {
-- GPUContext.Adapter.Handle = adapter;
-- SetAdapterInfo(ap);
-- std::string msg = vtkfmt::format(
-- "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-- ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-- vtkWGPUContextLog(msg);
-- return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
-- }
-- }
-+ GPUContext.Adapter.Handle = adapter;
-+ wgpu::AdapterProperties ap;
-+ adapter.GetProperties(&ap);
-+ SetAdapterInfo(ap);
-+ std::string msg = vtkfmt::format(
-+ "Selected adapter {0} (device={1:#x} vendor={2:#x} type={3}/{4})", ap.name, ap.deviceID,
-+ ap.vendorID, GPUContext.Adapter.Info.TypeName, GPUContext.Adapter.Info.BackendName);
-+ vtkWGPUContextLog(msg);
-+ return wgpu::Adapter(GPUContext.Adapter.Handle.Get());
- }
-
- return nullptr;
-@@ -234,7 +201,7 @@ static void LogAvailableAdapters()
-
- std::stringstream msg;
- msg << "Available adapters:\n";
-- for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->GetAdapters())
-+ for (auto&& a : GPUContext.DawnNativeEntryPoint.Instance->EnumerateAdapters())
- {
- wgpu::AdapterProperties p;
- a.GetProperties(&p);
-@@ -297,7 +264,7 @@ static const char* AdapterTypeName(wgpu::AdapterType t)
- }
- }
- namespace vtkWGPUImpl = vtkWGPUDawnImpl;
--#endif // VTK_USE_DAWN_NATIVE
-+#endif // VTK_USE_DAWN_WEBGPU
-
- //------------------------------------------------------------------------------
- void vtkWGPUContext::LogAvailableAdapters()
-diff --git a/Rendering/WebGPU/vtkWebGPUActor.cxx b/Rendering/WebGPU/vtkWebGPUActor.cxx
-index 4121547120e..63aa4d5ede1 100644
---- a/Rendering/WebGPU/vtkWebGPUActor.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUActor.cxx
-@@ -79,7 +79,12 @@ wgpu::RenderBundle vtkWebGPUActor::RenderToBundle(vtkRenderer* ren, vtkMapper* m
- const int sampleCount = wgpuRenWin->GetMultiSamples() ? wgpuRenWin->GetMultiSamples() : 1;
-
- wgpu::RenderBundleEncoderDescriptor bundleEncDesc;
-+#if __EMSCRIPTEN__
-+ // FIXME: Update this after emscripten webgpu updates to colorFormatCount
- bundleEncDesc.colorFormatsCount = 1;
-+#else
-+ bundleEncDesc.colorFormatCount = 1;
-+#endif
- bundleEncDesc.colorFormats = &colorFormat;
- bundleEncDesc.depthStencilFormat = wgpuRenWin->GetDepthStencilFormat();
- bundleEncDesc.sampleCount = sampleCount;
-diff --git a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-index 2d0731ac253..705fb9b59ac 100644
---- a/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-+++ b/Rendering/WebGPU/vtkWebGPUInternalsShaderModule.cxx
-@@ -8,7 +8,7 @@ wgpu::ShaderModule vtkWebGPUInternalsShaderModule::CreateFromWGSL(
- const wgpu::Device& device, const std::string& source)
- {
- wgpu::ShaderModuleWGSLDescriptor wgslDesc;
-- wgslDesc.source = source.c_str();
-+ wgslDesc.code = source.c_str();
-
- wgpu::ShaderModuleDescriptor descriptor;
- descriptor.nextInChain = &wgslDesc;
-diff --git a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-index f0e824f0e54..95a7d7fd605 100644
---- a/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-+++ b/Rendering/WebGPU/vtkWebGPURenderWindow.cxx
-@@ -61,8 +61,9 @@ void device_lost_callback(WGPUDeviceLostReason reason, char const* message, void
- default:
- reason_type_lbl = "Unknown";
- }
-- vtkErrorWithObjectMacro(reinterpret_cast<vtkObject*>(self),
-- << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
-+ auto renWin = vtkRenderWindow::SafeDownCast(reinterpret_cast<vtkObject*>(self));
-+ vtkWarningWithObjectMacro(
-+ renWin, << "Device lost! Reason : " << message << " Reason Type: " << reason_type_lbl);
- }
-
- struct PixelReadDescriptor
-@@ -136,6 +137,8 @@ bool vtkWebGPURenderWindow::WGPUInit()
- this->Adapter = vtkWGPUContext::RequestAdapter(options);
- wgpu::DeviceDescriptor deviceDescriptor = {};
- deviceDescriptor.label = "vtkWebGPURenderWindow::WGPUInit";
-+ deviceDescriptor.deviceLostCallback = &device_lost_callback;
-+ deviceDescriptor.deviceLostUserdata = this;
- ///@{ TODO: Populate feature requests
- // ...
- ///@}
-@@ -150,7 +153,6 @@ bool vtkWebGPURenderWindow::WGPUInit()
- }
- // install error handler
- this->Device.SetUncapturedErrorCallback(&::print_wgpu_error, this);
-- this->Device.SetDeviceLostCallback(&::device_lost_callback, this);
- ///@}
- return true;
- }
-@@ -161,7 +163,6 @@ void vtkWebGPURenderWindow::WGPUFinalize()
- vtkDebugMacro(<< __func__ << " WGPUInitialized=" << this->WGPUInitialized);
- this->DestroyDepthStencilTexture();
- this->DestroySwapChain();
-- this->Device.SetDeviceLostCallback(nullptr, nullptr);
- this->Device = nullptr;
- }
-
-@@ -586,18 +587,35 @@ void vtkWebGPURenderWindow::ReadPixels()
- this->BufferMapReadContext.src = this->ColorAttachment.OffscreenBuffer;
- this->BufferMapReadContext.size = this->ColorAttachment.OffscreenBuffer.GetSize();
- this->BufferMapReadContext.dst = this->CachedPixelBytes;
-+ this->BufferMapReadContext.window = this;
-
- auto onBufferMapped = [](WGPUBufferMapAsyncStatus status, void* userdata) {
- auto ctx = reinterpret_cast<MappingContext*>(userdata);
- switch (status)
- {
-- case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ case WGPUBufferMapAsyncStatus_ValidationError:
-+ vtkErrorWithObjectMacro(ctx->window, << "Validation error occurred");
-+ break;
-+ case WGPUBufferMapAsyncStatus_Unknown:
-+ vtkErrorWithObjectMacro(ctx->window, << "Unknown error occurred");
-+ break;
- case WGPUBufferMapAsyncStatus_DeviceLost:
-- case WGPUBufferMapAsyncStatus_Error:
-+ vtkErrorWithObjectMacro(ctx->window, << "Device lost!");
-+ break;
-+ case WGPUBufferMapAsyncStatus_DestroyedBeforeCallback:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer destroyed before callback");
-+ break;
- case WGPUBufferMapAsyncStatus_UnmappedBeforeCallback:
-- case WGPUBufferMapAsyncStatus_Unknown:
-- default:
-- assert(false);
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer unmapped before callback");
-+ break;
-+ case WGPUBufferMapAsyncStatus_MappingAlreadyPending:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer already has a mapping pending completion");
-+ break;
-+ case WGPUBufferMapAsyncStatus_OffsetOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer offset out of range");
-+ break;
-+ case WGPUBufferMapAsyncStatus_SizeOutOfRange:
-+ vtkErrorWithObjectMacro(ctx->window, << "Buffer size out of range");
- break;
- case WGPUBufferMapAsyncStatus_Success:
- {
-@@ -611,6 +629,8 @@ void vtkWebGPURenderWindow::ReadPixels()
- std::copy(mapped, mapped + ctx->size, ctx->dst->GetPointer(0));
- }
- break;
-+ default:
-+ break;
- }
- ctx->src.Unmap();
- };
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/0002-stat64.patch b/srcpkgs/vtk/patches/0002-stat64.patch
deleted file mode 100644
index 01da6d55b01c56..00000000000000
--- a/srcpkgs/vtk/patches/0002-stat64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 0f4635e876560d00df58c809526435180d0b1912 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi@gmail.com>
-Date: Sun, 18 Aug 2024 09:24:26 -0600
-Subject: [PATCH] Prefer SystemTools::Stat over system stat/stat64
-
-This keeps all of the stat() calls in VTK centralized (except the
-ones implemented in ThirdParty). Note that kwsys no longer defines
-any LSF support macros since 2019, so this might impact the ability
-to use large files on some 32-bit platforms, but hopefully any
-platforms where this is a concern will honor _FILE_OFFSET_BITS=64
-like 32-bit glibc does.
----
- IO/EnSight/vtkEnSight6BinaryReader.cxx | 28 ++-----------
- IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 25 +-----------
- IO/LSDyna/LSDynaFamily.cxx | 48 +----------------------
- 3 files changed, 8 insertions(+), 93 deletions(-)
-
-diff --git a/IO/EnSight/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-index 167e63efd41..1f26a171c26 100644
---- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
-@@ -18,33 +18,13 @@
- #include "vtkUnstructuredGrid.h"
- #include "vtksys/Encoding.hxx"
- #include "vtksys/FStream.hxx"
-+#include "vtksys/SystemTools.hxx"
-
- #include <cctype>
- #include <string>
--#include <sys/stat.h>
--
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- vtkStandardNewMacro(vtkEnSight6BinaryReader);
-diff --git a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-index ff8cad7bd46..75c126a2b0c 100644
---- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-+++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
-@@ -26,31 +26,10 @@
- #include <map>
- #include <numeric>
- #include <string>
--#include <sys/stat.h>
- #include <vector>
-
--#if defined(_WIN32)
--#define VTK_STAT_STRUCT struct _stat64
--#define VTK_STAT_FUNC _stat64
--#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ || defined __NetBSD__ || \
-- defined __OpenBSD__
--// The BSDs use stat().
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#elif defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#else
--#define VTK_STAT_STRUCT struct stat
--#define VTK_STAT_FUNC stat
--#endif
--#else
--// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to help
--// us on POSIX without resorting to using stat64.
--#define VTK_STAT_STRUCT struct stat64
--#define VTK_STAT_FUNC stat64
--#endif
-+#define VTK_STAT_STRUCT vtksys::SystemTools::Stat_t
-+#define VTK_STAT_FUNC vtksys::SystemTools::Stat
-
- VTK_ABI_NAMESPACE_BEGIN
- class vtkEnSightGoldBinaryReader::vtkUtilities
-diff --git a/IO/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/LSDynaFamily.cxx
-index fdb914ab6fa..1574d97b281 100644
---- a/IO/LSDyna/LSDynaFamily.cxx
-+++ b/IO/LSDyna/LSDynaFamily.cxx
-@@ -18,44 +18,6 @@
- VTK_ABI_NAMESPACE_BEGIN
- namespace
- {
--// Decide which of 3 stat varieties to use: stat, stat64, __stat64
--// Usually stat uses 32 bit fields, and stat64 (with underscores in Windows) uses 64 bit fields.
--// But on the BSDs, stat uses 64 bit fields these days.
--#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) && \
-- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
--#ifndef _WIN32
--#if defined __EMSCRIPTEN__
--#if defined _LARGEFILE64_SOURCE
--#define USE_STAT_64
--#else
--#define USE_STAT
--#endif
--#else
--#define USE_STAT_64
--#endif
--#else
--#define USE_WIN_STAT_64
--#endif
--#else
--#define USE_STAT
--#endif
--
--#if defined(USE_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct stat64& s)
--{
-- return stat64(fname, &s);
--}
--#elif defined(USE_WIN_STAT_64)
--int LS_DYNA_STAT(const char* fname, struct __stat64& s)
--{
-- return __stat64(fname, &s);
--}
--#elif defined(USE_STAT)
--int LS_DYNA_STAT(const char* fname, struct stat& s)
--{
-- return stat(fname, &s);
--}
--#endif
-
- vtkLSDynaFile_t VTK_LSDYNA_OPENFILE(const char* fname)
- {
-@@ -205,18 +167,12 @@ int LSDynaFamily::ScanDatabaseDirectory()
- int adaptLevel = 0;
- int tryAdapt = 0; // don't try an adaptive step unless we have one good file at the current level.
- bool adapted = true; // true when advancing over a mesh adaptation.
--#if defined(USE_WIN_STAT_64)
-- struct __stat64 st;
--#elif defined(USE_STAT_64)
-- struct stat64 st;
--#elif defined(USE_STAT)
-- struct stat st;
--#endif
-+ vtksys::SystemTools::Stat_t st;
- while (tryAdapt >= 0)
- {
- tmpFile = vtkLSGetFamilyFileName(
- this->DatabaseDirectory.c_str(), this->DatabaseBaseName, adaptLevel, filenum);
-- if (LS_DYNA_STAT(tmpFile.c_str(), st) == 0)
-+ if (vtksys::SystemTools::Stat(tmpFile.c_str(), &st) == 0)
- {
- if (adapted)
- {
---
-GitLab
-
diff --git a/srcpkgs/vtk/patches/fmt-11.patch b/srcpkgs/vtk/patches/fmt-11.patch
new file mode 100644
index 00000000000000..f5ac7d535bd315
--- /dev/null
+++ b/srcpkgs/vtk/patches/fmt-11.patch
@@ -0,0 +1,22 @@
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:28.388237205 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_Field.C 2024-12-24 11:47:41.611772181 +0100
+@@ -12,6 +12,7 @@
+ #include <cstdint>
+ #include "vtk_fmt.h"
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <iostream>
+ #include <string>
+ #include <vector>
+diff -ru VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C
+--- VTK-9.4.0.orig/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:47:28.394903974 +0100
++++ VTK-9.4.0/ThirdParty/ioss/vtkioss/Ioss_VariableType.C 2024-12-24 11:55:41.185009270 +0100
+@@ -19,6 +19,7 @@
+ #include VTK_FMT(fmt/core.h)
+ #include VTK_FMT(fmt/format.h)
+ #include VTK_FMT(fmt/ostream.h)
++#include VTK_FMT(fmt/ranges.h)
+ #include <map>
+ #include <sstream>
+ #include <string>
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
deleted file mode 100644
index d07abb59fe5edd..00000000000000
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Build fails on musl-based Linux distributions
-https://github.com/sandialabs/seacas/pull/348
-
-diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-index ca5f15de..99c2bbdd 100644
---- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-+++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
-@@ -26,7 +26,7 @@
- #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
- #endif
- #else
--#include <sys/unistd.h>
-+#include <unistd.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <sys/param.h>
- #include <sys/mount.h>
-@@ -35,9 +35,6 @@
-
- #include <cstdio>
- #include <sys/stat.h>
--#ifndef _MSC_VER
--#include <unistd.h>
--#endif
-
- namespace {
- bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 6964c221b92f8f..1c638df843ee2d 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.3.1
-revision=3
+version=9.4.2
+revision=1
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
# Build only the core modules plus python bindings for now
@@ -9,6 +9,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_USE_EXTERNAL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_token=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
@@ -27,7 +28,7 @@ maintainer="Piraty <mail@piraty.dev>"
license="BSD-3-Clause"
homepage="https://www.vtk.org"
distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8
+checksum=36c98e0da96bb12a30fe53708097aa9492e7b66d5c3b366e1c8dc251e2856a02
nocross="It seems to need vtk compile tools for the host"
case "$XBPS_TARGET_MACHINE" in
From 95aaceb7697377a565e1b2f22996a59f2f176281 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:55:32 -0400
Subject: [PATCH 25/32] mkvtoolnix: rebuild for fmt
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7a38065d92eaf9..9588f2b70f42d2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=92.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="qmake6"
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
From 09724914f594d70c382e84383ddcd6d37c451111 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:56:28 -0400
Subject: [PATCH 26/32] python3-syndom: rebuild for fmt
---
srcpkgs/python3-syndom/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template
index 906c6a17c086ad..9d8a1dddbf8038 100644
--- a/srcpkgs/python3-syndom/template
+++ b/srcpkgs/python3-syndom/template
@@ -1,7 +1,7 @@
# Template file for 'python3-syndom'
pkgname=python3-syndom
version=1.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From b6bf9f8f6933a1e7859c3a2df2abffa616fdb46e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 27/32] gnuradio-nrsc5: rebuild for fmt
---
srcpkgs/gnuradio-nrsc5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 16fb6544429e6d..7711161c5a8bfd 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
-revision=9
+revision=10
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 144d74500604baab6f7975d5ce5ba0141700d3ce Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 28/32] gnuradio-osmosdr: rebuild for fmt
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index d74e46572b7977..7f359da85ff485 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=8
+revision=9
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From c729dee4728dae7cdcb3f7205a0fd09fdab98b8b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 29/32] gnuradio-rds: rebuild for fmt
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index d4aafd94f0ab68..90d55fef3ab47f 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=13
+revision=14
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
From f08e5373ae4b58c8ef1f378eecc5c08f16b4e938 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 2 May 2025 18:58:15 -0400
Subject: [PATCH 30/32] gqrx: rebuild for fmt
---
srcpkgs/gqrx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index b8ceaf23decb39..884396fea05692 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.7
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
From e11c3f388e64594dfe12cf5136d59e9087109890 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:34:32 -0400
Subject: [PATCH 31/32] 0ad: mark broken
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ae29ee78b02335..ce12bd83359aaa 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -19,7 +19,7 @@ checksum="2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
f18fa3adae7acb07a49148354b6804028e6c9d7344991622fb7c00f638173e03"
nocross="uses bundled third-party libraries that do not cross-compile"
lib32disabled=yes
-
+broken="does not build on master"
skip_extraction="1654457-virtualenv.patch"
CXXFLAGS="-fpermissive"
From 2ccf515ad8a6247e4a833b99cc19ccb5d00f6a4e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 16 Jun 2025 09:44:50 -0400
Subject: [PATCH 32/32] devilutionX: bump for fmt
---
srcpkgs/devilutionX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 9a2e4f19a17af4..14d70ff1a67e88 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
version=1.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [PR PATCH] [Closed]: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (44 preceding siblings ...)
2025-06-16 19:20 ` dkwo
@ 2025-06-17 18:02 ` dkwo
2025-06-17 18:02 ` dkwo
` (8 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-17 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
There's a closed pull request on the void-packages repository
Android tools
https://github.com/void-linux/void-packages/pull/55099
Description:
- I tested the changes in this PR: yes.
- built and used `android-tools` on `x86_64-glibc`, built everything (except for `kodi`, `freecad`) natively on `aarc64-glibc`.
- `0ad` is also broken on master branch, and tricky to fix.
cc @Johnnynator I had to add `fmt` to `android-tools`. Adapted your prior PR with changes.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (45 preceding siblings ...)
2025-06-17 18:02 ` [PR PATCH] [Closed]: " dkwo
@ 2025-06-17 18:02 ` dkwo
2025-06-17 20:44 ` JkktBkkt
` (7 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-17 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2981322475
Comment:
More things breaking due to `fmt`, such as kodi, easyeffects. closing for now.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (46 preceding siblings ...)
2025-06-17 18:02 ` dkwo
@ 2025-06-17 20:44 ` JkktBkkt
2025-06-18 1:02 ` dkwo
` (6 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-06-17 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2981781069
Comment:
Due to the amount of packages, I haven't tried submitting a pr, but am pretty sure easyeffects specifically has been working with it normally, and I don't think I applied any patches for it
And they seem to be targeting v11 in flatpak: <https://github.com/wwmm/easyeffects/blob/78bb2b837939c7c66961e5641cde1180a1f2849e/util/flatpak/easyeffects-modules.json#L267>
On June 17, 2025 6:02:45 p.m. UTC, dkwo ***@***.***> wrote:
>dkwo left a comment (void-linux/void-packages#55099)
>
>More things breaking due to `fmt`, such as kodi, easyeffects. closing for now.
>
>--
>Reply to this email directly or view it on GitHub:
>https://github.com/void-linux/void-packages/pull/55099#issuecomment-2981322475
>You are receiving this because you are subscribed to this thread.
>
>Message ID: ***@***.***>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (47 preceding siblings ...)
2025-06-17 20:44 ` JkktBkkt
@ 2025-06-18 1:02 ` dkwo
2025-06-19 14:28 ` JkktBkkt
` (5 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-18 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2982271409
Comment:
I missed there is a PR to update `easyeffects`, maybe with that this one could work.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (48 preceding siblings ...)
2025-06-18 1:02 ` dkwo
@ 2025-06-19 14:28 ` JkktBkkt
2025-06-19 17:36 ` dkwo
` (4 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-06-19 14:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2988298431
Comment:
> I missed there is a PR to update `easyeffects`, maybe with that this one could work.
kodi might work with new fmt, even though they build v10 if enabled internal, there are packages using v11 in other distros. I remember seeing some error with it mentioning that spdlog needs to be updated as well, is that not enough?
I was going to look into this but got stuck with something else. Hopefully will be able to in the next few days
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (49 preceding siblings ...)
2025-06-19 14:28 ` JkktBkkt
@ 2025-06-19 17:36 ` dkwo
2025-06-24 22:40 ` JkktBkkt
` (3 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: dkwo @ 2025-06-19 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-2988780641
Comment:
`spdlog` is also updated here. @JkktBkkt Feel free to take over this: you may want to rebase `mpd`, look at the pr for `easyeffects`; then only `kodi` and `0ad` should be left (the first may be a simple fix as you suggest).
The only package I care about is `android-tools`, so ping me in case you want me to re-test that.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (50 preceding siblings ...)
2025-06-19 17:36 ` dkwo
@ 2025-06-24 22:40 ` JkktBkkt
2025-06-24 22:41 ` JkktBkkt
` (2 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-06-24 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 650 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-3002075227
Comment:
Progress update: I've updated, built and ran (only for a second though, didn't bother testing further) 0ad on x86_64 to version 0.27.0 (not 0.27.1 which is a RC since a few days ago and would make us able to drop a few patches). I am, however, using a bit.. unconventional structuring due to the reliance of the upstream project on submodules
The diff for both 0ad and 0ad-data can be seen here for now: https://0x0.st/8laD.patch and building it with older fmt may be possible, though I haven't tried it.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (51 preceding siblings ...)
2025-06-24 22:40 ` JkktBkkt
@ 2025-06-24 22:41 ` JkktBkkt
2025-07-04 3:15 ` JkktBkkt
2025-07-04 3:15 ` JkktBkkt
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-06-24 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 654 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-3002075227
Comment:
Progress update: I've updated, built and ran (only for a second though, didn't bother testing further) `0ad` on `x86_64` to version 0.27.0 (not 0.27.1 which is a RC since a few days ago and would make us able to drop a few patches). I am, however, using a bit.. unconventional structuring due to the reliance of the upstream project on submodules
The diff for both 0ad and 0ad-data can be seen here for now: https://0x0.st/8laD.patch and building it with older fmt may be possible, though I haven't tried it.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (52 preceding siblings ...)
2025-06-24 22:41 ` JkktBkkt
@ 2025-07-04 3:15 ` JkktBkkt
2025-07-04 3:15 ` JkktBkkt
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-07-04 3:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 866 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-3002075227
Comment:
Progress update: I've updated, built and ran (only for a second though, didn't bother testing further) `0ad` on `x86_64` to version 0.27.0 (not 0.27.1 which is a RC since a few days ago and would make us able to drop a few patches). I am, however, using a bit.. unconventional structuring due to the reliance of the upstream project on submodules
The diff for both 0ad and 0ad-data can be seen here for now: https://0x0.st/8laD.patch and building it with older fmt may be possible, though I haven't tried it.
Edit: As of 4th of July, this is still in progress. On x86_64 glibc everything builds, tests run, etc. Am looking into other archs, and hoping for 0ad merge which I've decided to separate out into another PR.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: Android tools
2025-04-17 22:09 [PR PATCH] Android tools dkwo
` (53 preceding siblings ...)
2025-07-04 3:15 ` JkktBkkt
@ 2025-07-04 3:15 ` JkktBkkt
54 siblings, 0 replies; 56+ messages in thread
From: JkktBkkt @ 2025-07-04 3:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
New comment by JkktBkkt on void-packages repository
https://github.com/void-linux/void-packages/pull/55099#issuecomment-3002075227
Comment:
Progress update: I've updated, built and ran (only for a second though, didn't bother testing further) `0ad` on `x86_64` to version 0.27.0 (not 0.27.1 which is a RC since a few days ago and would make us able to drop a few patches). I am, however, using a bit.. unconventional structuring due to the reliance of the upstream project on submodules
The diff for both 0ad and 0ad-data can be seen here for now: https://0x0.st/8laD.patch and building it with older fmt may be possible, though I haven't tried it.
Edit: As of 4th of July, this is still in progress. On x86_64 glibc everything builds, tests run, etc. Am looking into other archs, and hoping for 0ad pull to happen soon, which I've decided to separate out into another PR.
^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2025-07-04 3:15 UTC | newest]
Thread overview: 56+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-17 22:09 [PR PATCH] Android tools dkwo
2025-04-17 22:21 ` [PR PATCH] [Updated] " dkwo
2025-04-19 21:47 ` dkwo
2025-04-19 21:57 ` dkwo
2025-04-19 22:17 ` dkwo
2025-04-19 22:25 ` dkwo
2025-04-19 22:35 ` dkwo
2025-04-19 23:09 ` dkwo
2025-04-19 23:46 ` dkwo
2025-04-20 14:50 ` dkwo
2025-04-20 18:30 ` dkwo
2025-04-20 19:01 ` dkwo
2025-04-20 23:28 ` dkwo
2025-04-20 23:53 ` dkwo
2025-04-21 17:00 ` dkwo
2025-04-21 21:18 ` dkwo
2025-04-22 1:15 ` dkwo
2025-04-22 15:01 ` dkwo
2025-04-22 18:32 ` dkwo
2025-04-22 20:24 ` dkwo
2025-04-22 20:53 ` [PR PATCH] [Updated] " dkwo
2025-04-23 14:27 ` dkwo
2025-04-23 16:53 ` [PR PATCH] [Updated] " dkwo
2025-04-23 19:03 ` dkwo
2025-04-23 21:04 ` dkwo
2025-04-23 21:04 ` dkwo
2025-04-24 15:04 ` dkwo
2025-04-25 13:48 ` [PR PATCH] [Updated] " dkwo
2025-04-25 18:48 ` dkwo
2025-04-25 18:48 ` dkwo
2025-04-25 21:51 ` [PR PATCH] [Updated] " dkwo
2025-04-26 22:14 ` dkwo
2025-04-27 18:52 ` [PR PATCH] [Updated] " dkwo
2025-04-28 13:56 ` dkwo
2025-04-28 14:02 ` [PR PATCH] [Updated] " dkwo
2025-04-28 18:47 ` dkwo
2025-04-30 18:13 ` dkwo
2025-05-02 23:22 ` dkwo
2025-06-10 20:10 ` zlice
2025-06-10 22:26 ` zlice
2025-06-11 15:38 ` dkwo
2025-06-16 13:29 ` [PR PATCH] [Updated] " dkwo
2025-06-16 13:44 ` dkwo
2025-06-16 13:53 ` dkwo
2025-06-16 15:15 ` dkwo
2025-06-16 19:20 ` dkwo
2025-06-17 18:02 ` [PR PATCH] [Closed]: " dkwo
2025-06-17 18:02 ` dkwo
2025-06-17 20:44 ` JkktBkkt
2025-06-18 1:02 ` dkwo
2025-06-19 14:28 ` JkktBkkt
2025-06-19 17:36 ` dkwo
2025-06-24 22:40 ` JkktBkkt
2025-06-24 22:41 ` JkktBkkt
2025-07-04 3:15 ` JkktBkkt
2025-07-04 3:15 ` JkktBkkt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).