commit: 9f563549e572a79568bafadd582fda95cd9db608
Author: Pavel Sobolev <contact <AT> paveloom <DOT> dev>
AuthorDate: Tue Aug 19 19:44:34 2025 +0000
Commit: Pavel Sobolev <contact <AT> paveloom <DOT> dev>
CommitDate: Tue Aug 19 20:25:31 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f563549
games-emulation/azahar: add 2123, drop 2122.1
Signed-off-by: Pavel Sobolev <contact <AT> paveloom.dev>
games-emulation/azahar/Manifest | 2 +-
.../{azahar-2122.1.ebuild => azahar-2123.ebuild} | 10 +++++++---
...r-2122.1-don-t-search-for-the-zstd-package.patch | 21 ---------------------
...st-asio-io_service-to-boost-asio-io_contex.patch | 17 -----------------
.../files/azahar-2123-don-t-build-spirv-tools.patch | 19 +++++++++++++++++++
...-the-zstd_seekable.h-header-from-externals.patch | 18 ++++++++++++++++++
6 files changed, 45 insertions(+), 42 deletions(-)
diff --git a/games-emulation/azahar/Manifest b/games-emulation/azahar/Manifest
index ab1f26e660..368f620b38 100644
--- a/games-emulation/azahar/Manifest
+++ b/games-emulation/azahar/Manifest
@@ -1 +1 @@
-DIST azahar-2122.1.tar.xz 38057480 BLAKE2B
4a2545a1c4e8e0cf4473dce6b8c211c3c0e720dadbc48a03c9da22f99109d57a5461626fbc719e11277787e831a3e3e075ad4954810c3fd1d6270d62215f1888
SHA512
150455aaf3382f76e52b07ebcbb792bc9526047b488de979e2172de134a7e1a5b0eceb0a240b56821306937b17ea1953e61dd6cf6a3b758a234ca665820b1626
+DIST azahar-2123.tar.xz 40429880 BLAKE2B
b9ab6f651f334dee999bc9acd01b520ceacd7385b5792da4e4a1a8289f95658f44642e97ea2f35e050b29a2a17ef90a60ded40d7f1e4edeae4de1b3c19371582
SHA512
703488c39e9688fea7ae0e0cecfe500a6974f109edc7333c1a635aa7c19a9068035907498acd8523d053159b53d85c73d715f0ed11584f3a6398df127cd0baca
diff --git a/games-emulation/azahar/azahar-2122.1.ebuild
b/games-emulation/azahar/azahar-2123.ebuild
similarity index 91%
rename from games-emulation/azahar/azahar-2122.1.ebuild
rename to games-emulation/azahar/azahar-2123.ebuild
index 81dd2a91de..ea052c9a1d 100644
--- a/games-emulation/azahar/azahar-2122.1.ebuild
+++ b/games-emulation/azahar/azahar-2123.ebuild
@@ -18,7 +18,6 @@ IUSE="cpu_flags_x86_sse4_2 test"
RESTRICT="!test? ( test )"
RDEPEND="
- app-arch/zstd
dev-cpp/nlohmann_json
dev-cpp/robin-map
dev-libs/boost:=
@@ -45,6 +44,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
+ dev-util/spirv-headers
dev-util/vulkan-headers
media-libs/VulkanMemoryAllocator
amd64? ( dev-libs/xbyak )
@@ -55,15 +55,15 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-2122.1-don-t-search-for-the-zstd-package.patch"
"${FILESDIR}/${PN}-2122.1-explicitly-require-the-tsl-robin-map-package.patch"
"${FILESDIR}/${PN}-2122.1-import-some-of-the-symbols-from-spv.patch"
"${FILESDIR}/${PN}-2122.1-link-to-Catch2-only-when-tests-are-enabled.patch"
"${FILESDIR}/${PN}-2122.1-rename-AV_OPT_TYPE_CHANNEL_LAYOUT-to-AV_OPT_TYPE_CHL.patch"
-
"${FILESDIR}/${PN}-2122.1-rename-boost-asio-io_service-to-boost-asio-io_contex.patch"
"${FILESDIR}/${PN}-2122.1-use-the-system-faad2-library.patch"
"${FILESDIR}/${PN}-2122.1-use-the-system-sirit-library.patch"
"${FILESDIR}/${PN}-2122.1-use-the-system-teakra-library.patch"
+ "${FILESDIR}/${PN}-2123-don-t-build-spirv-tools.patch"
+
"${FILESDIR}/${PN}-2123-use-the-zstd_seekable.h-header-from-externals.patch"
)
# [directory]=license
@@ -78,6 +78,7 @@ declare -A KEEP_BUNDLED=(
# Reasons to keep are in `src_configure`
[httplib]=MIT
[lodepng]=ZLIB
+ [zstd]="GPL-2"
)
add_bundled_licenses() {
@@ -121,6 +122,9 @@ src_configure() {
# Lodepng is designed to be bundled
-DDISABLE_SYSTEM_LODEPNG=yes
+ # Upstream depends on
`zstd/contrib/seekable_format/zstd_seekable.h`
+ -DDISABLE_SYSTEM_ZSTD=yes
+
-Wno-dev
)
diff --git
a/games-emulation/azahar/files/azahar-2122.1-don-t-search-for-the-zstd-package.patch
b/games-emulation/azahar/files/azahar-2122.1-don-t-search-for-the-zstd-package.patch
deleted file mode 100644
index 14ad1c92be..0000000000
---
a/games-emulation/azahar/files/azahar-2122.1-don-t-search-for-the-zstd-package.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pavel Sobolev <[email protected]>
-Subject: [PATCH] Don't search for the `zstd` package.
-
-Signed-off-by: Pavel Sobolev <[email protected]>
-
---- a/externals/CMakeLists.txt
-+++ b/externals/CMakeLists.txt
-@@ -205,12 +205,7 @@ endif()
-
- # Zstandard
- if(USE_SYSTEM_ZSTD)
-- find_package(zstd REQUIRED)
-- add_library(zstd INTERFACE)
-- if(TARGET zstd::libzstd_shared)
-- message(STATUS "Found system Zstandard")
-- endif()
-- target_link_libraries(zstd INTERFACE zstd::libzstd_shared)
-+ add_library(zstd SHARED IMPORTED)
- else()
- set(ZSTD_LEGACY_SUPPORT OFF)
- set(ZSTD_BUILD_PROGRAMS OFF)
diff --git
a/games-emulation/azahar/files/azahar-2122.1-rename-boost-asio-io_service-to-boost-asio-io_contex.patch
b/games-emulation/azahar/files/azahar-2122.1-rename-boost-asio-io_service-to-boost-asio-io_contex.patch
deleted file mode 100644
index bb3f6dc603..0000000000
---
a/games-emulation/azahar/files/azahar-2122.1-rename-boost-asio-io_service-to-boost-asio-io_contex.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Pavel Sobolev <[email protected]>
-Subject: [PATCH] Rename `boost::asio::io_service` to `boost::asio::io_context`.
-
-This makes it compile with newer versions of Boost.
-
-Signed-off-by: Pavel Sobolev <[email protected]>
-
---- a/src/input_common/udp/client.cpp
-+++ b/src/input_common/udp/client.cpp
-@@ -108,7 +108,7 @@ private:
- }
-
- SocketCallback callback;
-- boost::asio::io_service io_service;
-+ boost::asio::io_context io_service;
- boost::asio::basic_waitable_timer<clock> timer;
- udp::socket socket;
diff --git
a/games-emulation/azahar/files/azahar-2123-don-t-build-spirv-tools.patch
b/games-emulation/azahar/files/azahar-2123-don-t-build-spirv-tools.patch
new file mode 100644
index 0000000000..0e5ddc5f64
--- /dev/null
+++ b/games-emulation/azahar/files/azahar-2123-don-t-build-spirv-tools.patch
@@ -0,0 +1,19 @@
+From: Pavel Sobolev <[email protected]>
+Subject: [PATCH] Don't build `spirv-tools`.
+
+Signed-off-by: Pavel Sobolev <[email protected]>
+
+--- a/externals/CMakeLists.txt
++++ b/externals/CMakeLists.txt
+@@ -412,11 +412,6 @@ if (ENABLE_VULKAN)
+ add_subdirectory(spirv-headers EXCLUDE_FROM_ALL)
+ endif()
+
+- # spirv-tools
+- # TODO: Implement USE_SYSTEM_SPIRV_TOOLS -OS
+- set(SPIRV_SKIP_EXECUTABLES ON)
+- add_subdirectory(spirv-tools EXCLUDE_FROM_ALL)
+-
+ # glslang
+ if(USE_SYSTEM_GLSLANG)
+ find_package(glslang REQUIRED)
diff --git
a/games-emulation/azahar/files/azahar-2123-use-the-zstd_seekable.h-header-from-externals.patch
b/games-emulation/azahar/files/azahar-2123-use-the-zstd_seekable.h-header-from-externals.patch
new file mode 100644
index 0000000000..1f94bbbb5e
--- /dev/null
+++
b/games-emulation/azahar/files/azahar-2123-use-the-zstd_seekable.h-header-from-externals.patch
@@ -0,0 +1,18 @@
+From: Pavel Sobolev <[email protected]>
+Subject: [PATCH] Use the `zstd_seekable.h` header from `externals`.
+
+Upstream-PR: https://github.com/azahar-emu/azahar/pull/1305
+
+Signed-off-by: Pavel Sobolev <[email protected]>
+
+--- a/src/common/zstd_compression.cpp
++++ b/src/common/zstd_compression.cpp
+@@ -13,7 +13,7 @@
+ #include <mutex>
+ #include <sstream>
+ #include <zstd.h>
+-#include <zstd/contrib/seekable_format/zstd_seekable.h>
++#include <zstd_seekable.h>
+
+ #include <boost/serialization/base_object.hpp>
+ #include <boost/serialization/unique_ptr.hpp>
