From: Calandracas606 <Calandracas606@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
Date: Fri, 05 Jul 2024 19:49:39 +0200 [thread overview]
Message-ID: <20240705174939.7982729095@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50183@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
There is an updated pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183
[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
Build status (x86_64-glibc):
- [x] spdlog
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/50183.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 44396 bytes --]
From 01883342959a57d9b8a97bfa20d8185be80ad849 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] fmt: update to 10.2.1.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7c13e616340dc9..dd199382a26e15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3621,7 +3621,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.10 fmt-10.2.1_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.29 libtls-3.9.1_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 8b94c6dc51f1a3..db5be1ebc5dcc3 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=9.1.0
+version=10.2.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,10 +10,10 @@ license="BSD-2-Clause"
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=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
post_install() {
- vlicense LICENSE.rst LICENSE
+ vlicense LICENSE
}
fmt-devel_package() {
From 6d73e552e8a3f9db767ed2eb161b89aadb8d2464 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 dd199382a26e15..f0410d029d12bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_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 a49cbe1dce675b8b281c9da4ec3fd396c923f0b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.
---
common/shlibs | 8 +--
srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
srcpkgs/libwaylandpp/template | 4 +-
3 files changed, 63 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch
diff --git a/common/shlibs b/common/shlibs
index f0410d029d12bf..f53a79ccebaa8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,10 +4202,10 @@ libec.so.10 eclib-20220621_1
libsymmetrica.so.2 symmetrica-3.0.1_1
libLfunction.so.1 lcalc-2.0.4_1
liblrcalc.so.2 lrcalc-2.1_1
-libwayland-client++.so.0 libwaylandpp-0.2.8_1
-libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
-libwayland-egl++.so.0 libwaylandpp-0.2.8_1
-libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+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.14 libspdlog-1.14.1_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+ [ 2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+ scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+ 378 | uint32_t width = 0;
+ | ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+ wayland_hpp << "#pragma once" << std::endl
+ << std::endl
+ << "#include <array>" << std::endl
++ << "#include <cstdint>" << std::endl
+ << "#include <functional>" << std::endl
+ << "#include <memory>" << std::endl
+ << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+ wayland_server_hpp << "#pragma once" << std::endl
+ << std::endl
+ << "#include <array>" << std::endl
++ << "#include <cstdint>" << std::endl
+ << "#include <functional>" << std::endl
+ << "#include <memory>" << std::endl
+ << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
# Template file for 'libwaylandpp'
pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/NilsBrause/waylandpp"
distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
if [ "$CROSS_BUILD" ]; then
From c6c99ce87a10290c78df183ad5bcda4d6bdc23b1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10
---
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 fd77f678dce5d496d3c6e99c00d2073eab1c8961 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] Bear: rebuild for fmt-10
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 23d24214daa389..e2aa7f2401fe08 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.3
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 81edd7fe83ad5ab3ff5bef2eda5a678b0e5c9e16 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] MangoHud: rebuild for fmt-10
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 9e5796a3ffe40f..11502f57bcba8a 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.7.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled"
From 574fa2ec6f17476e6c3d50e8ea3662e76c723a6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] Waybar: rebuild for fmt-10
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.10.3
-revision=1
+revision=2
build_style=meson
configure_args="-Dlibudev=enabled -Dman-pages=enabled
-Dsystemd=disabled -Drfkill=enabled
From 18e45f2c1b536141f2e9c6f48b63692245c38dc7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] cherrytree: rebuild for fmt-10
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index cf8793176d8b9a..d5c78cb8b8358d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=1.1.3
-revision=1
+revision=2
build_style=cmake
# Tests are built during the normal build process and require access to X server
configure_args="-DBUILD_TESTING=OFF"
From d03ae8daa05025aa0c4fddbb138b33a61882e051 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] coeurl: rebuild for fmt-10
---
srcpkgs/coeurl/patches/fmt-10.patch | 33 +++++++++++++++++++++++++++++
srcpkgs/coeurl/template | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/coeurl/patches/fmt-10.patch
diff --git a/srcpkgs/coeurl/patches/fmt-10.patch b/srcpkgs/coeurl/patches/fmt-10.patch
new file mode 100644
index 00000000000000..afc1762b2b32ec
--- /dev/null
+++ b/srcpkgs/coeurl/patches/fmt-10.patch
@@ -0,0 +1,33 @@
+From 831e2ee8e9cf08ea1ee9736cde8370f9d0312abc Mon Sep 17 00:00:00 2001
+From: Nicolas Werner <nicolas.werner@hotmail.de>
+Date: Wed, 28 Jun 2023 13:01:58 +0200
+Subject: [PATCH] Fix build with fmt10
+
+---
+ lib/client.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/client.cpp b/lib/client.cpp
+index 624f046..3666623 100644
+--- a/lib/client.cpp
++++ b/lib/client.cpp
+@@ -6,6 +6,7 @@
+ #include <thread>
+
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> Client::log = spdlog::null_logger_mt("coeurl_null");
+@@ -347,7 +348,7 @@ void Client::remove_request(Request *r) {
+ long http_code;
+ curl_easy_getinfo(req->easy, CURLINFO_RESPONSE_CODE, &http_code);
+
+- Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, req->curl_error, req->error, http_code);
++ Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, coeurl::to_string(req->curl_error), req->error, http_code);
+
+ if (req->on_complete_)
+ req->on_complete_(*req.get());
+--
+GitLab
+
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index fc0175da3c486c..7b66be703c7a50 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.3.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config"
makedepends="spdlog libevent-devel libcurl-devel"
From da82af820aedc1d8ddb14fcce19ce7819dc33746 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] cryfs: rebuild for fmt-10
---
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 f07cfc545a8b1c39f4ca3748be037e4ebed05be1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] devilutionX: rebuild for fmt-10
---
srcpkgs/devilutionX/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index ad911b48f8631c..6c253537baf770 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
+revision=4
build_style=cmake
configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
hostmakedepends="pkg-config"
From c06dc27da400d987bc8f96e89b6ecd3b1e6d2c6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] easyeffects: rebuild for fmt-10
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 83563265ea9226..a2b4c85358753a 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.5
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
From 82f11b0a9a9dd99eb082c8ae7f09049fa6a299ab Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] furnace: rebuild for fmt-10
---
srcpkgs/furnace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template
index da55f262777fcd..3411ca5dfbeae2 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
# Template file for 'furnace'
pkgname=furnace
version=0.6.5
-revision=1
+revision=2
_adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8"
build_style=cmake
configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_LIBSNDFILE=ON -DSYSTEM_PORTAUDIO=ON -DSYSTEM_RTMIDI=ON
From 538eec2f1cfd3bc041b2fdbfc18e6ef5be8a0b33 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] gerbera: rebuild for fmt-10
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index ae14f35c767c03..2dc0ac0ce03b55 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From c19090eec3238681feac56f99a74e107639a20c2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] gnuradio: rebuild for fmt-10
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 58127cedd3ddc6..0ecf804c22c072 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.8.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 9a52d90bb5f2fac24e7fc5a2aef85e4c20171122 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] justbuild: rebuild for fmt-10
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.3.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 b67ce8d64aa721cc4ea4d85ede21a5a1b7c51f4a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10
---
srcpkgs/kodi/patches/cstdint.patch | 98 +++++++++++++++++++++++++++
srcpkgs/kodi/patches/fmt-10.patch | 104 +++++++++++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
3 files changed, 203 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/cstdint.patch
create mode 100644 srcpkgs/kodi/patches/fmt-10.patch
diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+
++#include <cstdint>
+ #include <string>
+
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <array>
+
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+
+ #include "WinSystemWayland.h"
+
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+
+ #pragma once
+
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/windows/GUIWindowHome.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
+index c42e073c48ced..abc6cfc94d5a0 100644
+--- a/xbmc/windows/GUIWindowHome.cpp
++++ b/xbmc/windows/GUIWindowHome.cpp
+@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag,
+ {
+ int ra_flag = 0;
+
+- CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message);
++ CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}",
++ AnnouncementFlagToString(flag), sender, message);
+
+ // we are only interested in library changes
+ if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0)
+
+From e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:24:02 -0700
+Subject: [PATCH 3/4] CLog: allow using fmt::enums::format_as for explicit enum
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/utils/log.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index 9fc4aae36813e..adf46905a86c6 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -46,6 +46,10 @@ class dist_sink;
+ } // namespace sinks
+ } // namespace spdlog
+
++#if FMT_VERSION >= 100000
++using fmt::enums::format_as;
++#endif
++
+ class CLog : public ISettingsHandler, public ISettingCallback
+ {
+ public:
+
+From 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:24:34 -0700
+Subject: [PATCH 4/4] CLog: add formatter for std::atomic for explicit atomic
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ xbmc/utils/log.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index adf46905a86c6..1c42c888cb655 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -48,6 +48,14 @@ class dist_sink;
+
+ #if FMT_VERSION >= 100000
+ using fmt::enums::format_as;
++
++namespace fmt
++{
++template<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+ // password entry and re-entry succeeded, write out the lock data
+ share->m_iHasLock = LOCK_STATE_LOCKED;
+ CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+- strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++ strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+ CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+ CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+ CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+ std::string strNewPW;
+ std::string strNewLockMode;
+ if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+- strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++ strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+ else
+ return false;
+ // password ReSet and re-entry succeeded, write out the lock data
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d37a5918cd6758..79fc3007db0d8d 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=9
+revision=10
_codename="Matrix"
build_style=cmake
configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF
From fb1a38164e651915660f9d4487fe9c3a47469415 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] mkvtoolnix: rebuild for fmt-10
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index f0a54058327a68..7a3e21ed5d0b54 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=85.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 ca4180e5cd5f040e11c55483f0dc285a66251efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] mpd: rebuild for fmt-10
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b8e2bd4c1b59c8..dc346997a9097e 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.15
-revision=2
+revision=3
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 8be53063656f6669497ccf97ac5cb1c42e0fd4db Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] mtxclient: rebuild for fmt-10
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 ad59d91ce0a874070c0521d1786a48bb88e16f72 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] nheko: rebuild for fmt-10
---
srcpkgs/nheko/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f9c7044b609174..50abcd64443e32 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,10 +1,10 @@
# Template file for 'nheko'
pkgname=nheko
version=0.12.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
-makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
+makedepends="qt6-base-private-devel qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
xcb-util-wm-devel re2-devel KDSingleApplication"
From 7ce75e95b27428a4d60cff5e7297d9ebc88680b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] opendht: rebuild for fmt-10
---
srcpkgs/opendht/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index b8f141f7a61e6e..b18ada2e756011 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=1
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
From f669607379a9ad8ca136dd5bbb7cad14098f202d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] paps: rebuild for fmt-10
---
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 8619a3997d7158ef347df3de30d7fd3d168d208d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] python3-syndom: rebuild for fmt-10
---
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 2d1e037ddf3124..906c6a17c086ad 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=1
+revision=2
build_style=meson
hostmakedepends="pkg-config python3-pybind11"
makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11"
From 59e7f069107165910bb489aaa66163f2ce8e50ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.
---
srcpkgs/imhex/patches/cross.patch | 15 +++++++++++++++
srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
srcpkgs/imhex/template | 13 +++++++------
3 files changed, 44 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/imhex/patches/cross.patch
create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch
diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date: Tue May 28 10:48:10 2024 -0400
+
+ fix built on musl
+
+ musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+ passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+ }
+ #endif
+
+- #ifdef BLKGETSIZE64
++ #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+ int blkdev_get_size(int fd, u64 *bytes) {
+ if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+ return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,7 +1,7 @@
# Template file for 'imhex'
pkgname=imhex
-version=1.30.1
-revision=3
+version=1.33.2
+revision=1
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
-DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
short_desc="Hex editor for reverse engineers and programmers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
changelog="https://github.com/WerWolv/ImHex/releases"
distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
patch_args="-Np1 -d $build_wrksrc"
+python_version=3
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
broken="uses i128"
From c6353c9f9a5d39dc168f6ad7f97e66b22aeaec0b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 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.1.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg-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=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From b6e7af2e01d248e3ddfd41beb6031b1beda3c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.
---
srcpkgs/devilutionX/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
# Template file for 'devilutionX'
pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+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
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
post_install() {
- vlicense LICENSE
+ vlicense LICENSE.md
}
From acced2e369d0c70a27da7d049c7f3cecb861f1a5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.
---
srcpkgs/vtk/patches/gcc13.patch | 13 -------------
srcpkgs/vtk/patches/vtkioss-unistd.patch | 6 +++---
srcpkgs/vtk/template | 7 ++++---
3 files changed, 7 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/vtk/patches/gcc13.patch
diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include 2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h 2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
-
- #include <array> // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
-
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
#else
-#include <sys/unistd.h>
+#include <unistd.h>
- #endif
-
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
@@ -35,9 +35,6 @@
#include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
-version=9.2.6
-revision=3
+version=9.3.0
+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
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
-DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
-DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
# vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,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=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
next prev parent reply other threads:[~2024-07-05 17:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 22:39 [PR PATCH] " Calandracas606
2024-05-04 4:24 ` [PR PATCH] [Updated] " Calandracas606
2024-05-05 2:42 ` sgn
2024-05-05 3:00 ` sgn
2024-05-05 4:02 ` [PR PATCH] [Updated] " Calandracas606
2024-05-05 4:03 ` Calandracas606
2024-05-05 16:40 ` [PR PATCH] [Updated] " Calandracas606
2024-05-05 17:09 ` Calandracas606
2024-05-05 17:11 ` Calandracas606
2024-05-05 23:08 ` Calandracas606
2024-05-14 11:26 ` [PR PATCH] [Updated] " Calandracas606
2024-05-28 14:58 ` Calandracas606
2024-05-28 15:00 ` Calandracas606
2024-05-28 19:18 ` meator
2024-05-28 19:37 ` [PR PATCH] [Updated] " Calandracas606
2024-05-28 19:38 ` Calandracas606
2024-05-28 19:48 ` [PR PATCH] [Updated] " Calandracas606
2024-05-28 22:03 ` Calandracas606
2024-05-28 22:36 ` Calandracas606
2024-05-28 22:39 ` Calandracas606
2024-06-13 23:34 ` [PR PATCH] [Updated] " Calandracas606
2024-07-05 16:08 ` [PR PATCH] [Updated] [WIP] " Calandracas606
2024-07-05 17:49 ` Calandracas606 [this message]
2024-07-05 17:52 ` Calandracas606
2024-07-09 13:22 ` [PR PATCH] [Updated] " Calandracas606
2024-07-09 13:42 ` Calandracas606
2024-07-17 13:56 ` Calandracas606
2024-07-18 15:37 ` Calandracas606
2024-07-25 3:56 ` Calandracas606
2024-07-26 18:14 ` Calandracas606
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240705174939.7982729095@inbox.vuxu.org \
--to=calandracas606@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).