games-emulation/azahar: add 2124, drop 2123.4.1

Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
This commit is contained in:
Pavel Sobolev
2026-01-17 21:25:24 +03:00
parent 7d5d775ae5
commit 475e294349
4 changed files with 39 additions and 24 deletions

View File

@@ -1,2 +1 @@
DIST azahar-2123.3-fix-build-with-qt-6.10.patch 1096 BLAKE2B a9fabc08b2e1ee55b95e26c312b0ef140e2b91975f0e2989d14fbc61c9a2ee0de2aebe41209d91ba79efe25d3da51df14bb5be956940dcd6692814b06b5ae05b SHA512 b6252e52a12c017c80e73b22c4cce9f36160a7b6f2f07acdb09d26e14f4b37332c795b0d969eb6b6c315a5d0e557eee65c7a56043536a0ebbd2948e9a2b3b322
DIST azahar-2123.4.1.tar.xz 40289260 BLAKE2B cbf1857da46dda1b10c6df46e6ccd06b0fbc895380c25d3c18676199d85169857af61a0a4c9dee9e344b8db856aabb776b1a8ac9b85c48718e0c77369624b0d4 SHA512 13d2727c8d7fe6c18b83c09448650ebefa41c38e67371d4a9871227ab9855b13a65e38150cc907d8f054844967b529ea79c8997d4f28aac27148fc12ac69e638
DIST azahar-2124.tar.xz 40952872 BLAKE2B 5528dd5be42d3dab601f2abe0220bbf98153a653d9a8126eb2257841a1d9370f729a7f7e8fb934879922ecc35ee53781cd619cf772dfa051b7e6728e1ca16efc SHA512 88f7e417cb505f54414ed362df14512375eb12c1e5f5c0dc79821f4fa26e70a1133831a11f16ad6d5bfe05d17409f593c9f63b3a2d99efcd0c4b13063c5c0797

View File

@@ -9,8 +9,6 @@ DESCRIPTION="An open-source 3DS emulator project based on Citra"
HOMEPAGE="https://azahar-emu.org"
SRC_URI="
https://github.com/azahar-emu/azahar/releases/download/${PV}/azahar-unified-source-${PV}.tar.xz -> ${P}.tar.xz
https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch ->
${PN}-2123.3-fix-build-with-qt-6.10.patch
"
S="${WORKDIR}/azahar-unified-source-${PV}"
@@ -34,6 +32,7 @@ RDEPEND="
dev-libs/openssl:=
dev-libs/sirit
dev-libs/teakra
dev-libs/xxhash
dev-qt/qtbase:6[concurrent,dbus,widgets]
dev-qt/qtmultimedia:6
dev-util/glslang
@@ -59,7 +58,6 @@ BDEPEND="
"
PATCHES=(
"${DISTDIR}/${PN}-2123.3-fix-build-with-qt-6.10.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"
@@ -67,9 +65,9 @@ PATCHES=(
"${FILESDIR}/${PN}-2122.1-use-the-system-faad2-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"
"${FILESDIR}/${PN}-2123.1-use-the-system-oaknut-library.patch"
"${FILESDIR}/${PN}-2123.2-use-the-system-sirit-library.patch"
"${FILESDIR}/${PN}-2124-use-the-system-xxhash-library.patch"
)
# [directory]=license

View File

@@ -1,18 +0,0 @@
From: Pavel Sobolev <contact@paveloom.dev>
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 <contact@paveloom.dev>
--- 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>

View File

@@ -0,0 +1,36 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Use the system `xxhash` library.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -490,16 +490,4 @@ if (ENABLE_VULKAN)
endif()
endif()
-set(XXHASH_BUILD_XXHSUM OFF)
-add_subdirectory(xxHash/cmake_unofficial EXCLUDE_FROM_ALL)
-target_compile_definitions(xxhash PRIVATE XXH_FORCE_MEMORY_ACCESS=2)
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
- target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_SSE2)
- message(STATUS "Enabling SSE2 for xxHash")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|armv8")
- target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_NEON)
- message(STATUS "Enabling NEON for xxHash")
-else()
- target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_SCALAR)
- message(STATUS "Disabling SIMD for xxHash")
-endif()
\ No newline at end of file
+add_library(xxhash SHARED IMPORTED)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -217,4 +217,4 @@ if (SSE42_COMPILE_OPTION)
target_compile_options(citra_common PRIVATE ${SSE42_COMPILE_OPTION})
endif()
-target_link_libraries(citra_common PUBLIC xxHash::xxhash)
\ No newline at end of file
+target_link_libraries(citra_common PUBLIC xxhash)