From 2e3b3a940318ce484e925338b3a9cbf137ddea69 Mon Sep 17 00:00:00 2001 From: chrysos349 Date: Tue, 23 Jul 2024 02:14:27 +0300 Subject: [PATCH] dolphin-emu: update to 2409 --- .../patches/0001-Add-musl-fix.patch | 39 ----- srcpkgs/dolphin-emu/patches/ipproto.patch | 13 -- srcpkgs/dolphin-emu/template | 143 +++++++++--------- 3 files changed, 75 insertions(+), 120 deletions(-) delete mode 100644 srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch delete mode 100644 srcpkgs/dolphin-emu/patches/ipproto.patch diff --git a/srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch b/srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch deleted file mode 100644 index 995d7e27fa7..00000000000 --- a/srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3a08670281daa82c75a96a6076f00d42280cb309 Mon Sep 17 00:00:00 2001 -From: AnErrupTion -Date: Fri, 7 Jul 2023 18:31:59 +0200 -Subject: [PATCH] Add musl fix - ---- - Source/Core/Common/Network.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp -index a5e56b74d2..3e1d47b279 100644 ---- a/Source/Core/Common/Network.cpp -+++ b/Source/Core/Common/Network.cpp -@@ -18,6 +18,13 @@ - - #include - -+#define _GNU_SOURCE -+#include -+#ifndef __USE_GNU -+ #define __MUSL__ -+#endif -+#undef _GNU_SOURCE -+ - #include "Common/BitUtils.h" - #include "Common/Random.h" - #include "Common/StringUtil.h" -@@ -563,7 +570,7 @@ const char* DecodeNetworkError(s32 error_code) - sizeof(buffer), nullptr); - return buffer; - #elif defined(IS_BSD_STRERROR) || \ -- ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) -+ ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || defined(__MUSL__) - strerror_r(error_code, buffer, sizeof(buffer)); - return buffer; - #else --- -2.41.0 - diff --git a/srcpkgs/dolphin-emu/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch deleted file mode 100644 index c2f9e81dc33..00000000000 --- a/srcpkgs/dolphin-emu/patches/ipproto.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.h 2023-05-11 17:02:30.000000000 -0400 -+++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.h 2024-06-04 09:24:19.476262345 -0400 -@@ -20,8 +20,10 @@ - constexpr u16 TCP_FLAG_FIN = 0x1; - constexpr u16 TCP_FLAG_RST = 0x4; - -+#if not defined(__GLIBC__) and (defined(__aarch64__) || defined(__arm64__) || defined(__x86_64__) ) - constexpr u16 IP_PROTOCOL = 0x800; - constexpr u16 ARP_PROTOCOL = 0x806; -+#endif - - constexpr u8 MAX_TCP_BUFFER = 4; - constexpr u16 MAX_UDP_LENGTH = 1500; diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 7992e3ab44b..fbaddea209d 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,60 +1,76 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu -version=5.0.19368 -revision=5 -_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107 -_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9 -_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48 -_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e -_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778 -_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd +version=2409 +revision=1 +_cubeb_commit=54217bca3f3e0cd53c073690a23dd25d83557909 +_fmt_commit=e69e5f977d458f2650bb346dadf2ad30c5320281 +_googletest_commit=58d77fa8070e8cec2dc1ed015d66b454c8d78850 _implot_commit=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d -_libspng_commit=e5c1fc470fceaca08b8c30dc40768c28b82b9e12 -_rcheevos_commit=3af1e2fc5188d6e932ee379942f4049ea877e648 -_vma_commit=d9a2e4641ba4808e803ff555be132f280366ab47 -_spirv_cross_commit=b8e742c91ba47eb3238c939ee11ec9ba2ba247bf -#Version/hash pair can be found at https://dolphin-emu.org/download/ +_libspng_commit=dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9 +_mgba_commit=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 +_minizip_ng_commit=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70 +_rcheevos_commit=d54cf8f1059cebc90a6f5ecdf03df69259f22054 +_sanitizers_cmake_commit=aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a +_spirv_cross_commit=50b4d5389b6a06f86fb63a2848e1a7da6d9755ca +_tinygltf_commit=c5641f2c22d117da7971504591a8f6a41ece488b +_vma_commit=009ecd192c1289c7529bff248a16cfe896254816 +_zlib_ng_commit=ce01b1e41da298334f8214389cc9369540a7560f archs="x86_64* aarch64* ppc64le* i686" -create_wrksrc=yes build_style=cmake -configure_args="-DUSE_SHARED_ENET=ON - -DDOLPHIN_WC_DESCRIBE=${version%.*}-${version##*.} - -DDOLPHIN_WC_REVISION=$_dolphin_commit - -DDOLPHIN_WC_BRANCH=master" -hostmakedepends="pkg-config qt6-tools qt6-base gettext-devel" -makedepends=" - zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel - SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg6-devel libgomp-devel libcurl-devel - portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel - mbedtls2-devel SFML-devel libenet-devel liblzma-devel pugixml-devel" +configure_args="-DDISTRIBUTOR=voidlinux.org -DENABLE_ANALYTICS=OFF + -DENABLE_AUTOUPDATE=OFF -DUSE_DISCORD_PRESENCE=OFF" +hostmakedepends="gettext pkg-config python3 qt6-base qt6-tools" +makedepends="SDL2-devel SFML-devel alsa-lib-devel ffmpeg6-devel glew-devel + hidapi-devel libbluetooth-devel libcurl-devel libenet-devel libevdev-devel + libgomp-devel liblz4-devel liblzma-devel libopenal-devel libusb-devel lzo-devel + mbedtls2-devel miniupnpc-devel portaudio-devel pugixml-devel pulseaudio-devel + qt6-base-devel qt6-svg-devel soundtouch-devel xxHash-devel zlib-devel" depends="desktop-file-utils" short_desc="Gamecube / Wii / Triforce emulator" maintainer="Henry Naguski " license="GPL-2.0-or-later" -homepage="http://dolphin-emu.org" -distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz - https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz - https://github.com/google/googletest/archive/${_googletest_commit}.tar.gz - https://github.com/zlib-ng/zlib-ng/archive/${_zlib_ng_commit}.tar.gz - https://github.com/mozilla/cubeb/archive/${_cubeb_commit}.tar.gz +homepage="https://dolphin-emu.org" +distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz + https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${_vma_commit}.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/${_spirv_cross_commit}.tar.gz + https://github.com/RetroAchievements/rcheevos/archive/${_rcheevos_commit}.tar.gz https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz https://github.com/epezent/implot/archive/${_implot_commit}.tar.gz + https://github.com/fmtlib/fmt/archive/${_fmt_commit}.tar.gz + https://github.com/google/googletest/archive/${_googletest_commit}.tar.gz + https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz + https://github.com/mozilla/cubeb/archive/${_cubeb_commit}.tar.gz https://github.com/randy408/libspng/archive/${_libspng_commit}.tar.gz - https://github.com/RetroAchievements/rcheevos/archive/${_rcheevos_commit}.tar.gz - https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${_vma_commit}.tar.gz - https://github.com/KhronosGroup/SPIRV-Cross/archive/${_spirv_cross_commit}.tar.gz" -checksum="ef9af8103ec35808a6250b7eadda1a33877719ffb2aad2d65571843e7ae0f69a - 9fed790727c64dd113b32445061a890d33bf12d237aacef533d818a0721534f0 - 92c9f67f20c6cc71589408d6d7d25e8c82df045b432da5993b51837e637b93fa - d151f75cb7f3d26b3901ab6962dbe2469a49980e52dd48f8571f057ee2c07c1b - 9326a22d41b30b6d613c248a8ea2eb56c5ffc76a7080b0127165682fd8eba13e - 19d511a3a4ddc872c89ab62c070dd8d1fcc733e6ea4655f5876a60237cd556ba + https://github.com/syoyo/tinygltf/archive/${_tinygltf_commit}.tar.gz + https://github.com/zlib-ng/minizip-ng/archive/${_minizip_ng_commit}.tar.gz + https://github.com/zlib-ng/zlib-ng/archive/${_zlib_ng_commit}.tar.gz" +checksum="291723727a3021d381facc47567ad03cad192310c5d59dd37c076ab3e3bd8158 + 5ed5125086a92666f1698df907a29f54f11197c382996094b556a1b22186ecaf + ed27481a78470fe9905cdfec8fd2ebb6c8f68a17377c2879527c2fcb2a01751c + bf8e6e9afa865c51ab796c8329df206297b329f008ef0c1308c642480fb2d289 + 9f5b073625375322236a94ce8d2d803cdedad321c91e63845f487b9ebfb2c433 af51940ae6482c0e96ffb4309982fa309f9aa383cd8f980081681010c8c3a835 - e3094cf323d7b5c3a69210c2a8d97725b8ec2867aa83007b864c2c468e63b468 - 2350d4479a9ca725a269eee5c1aeccf3e54ea2cf7bf9dd82bd0f07c59f96f5bd - 5e12a559454dfdf46a7935f33c759f2e2fb2f59539aeec8779d5f32375c91c4b - 6f65717f6b4b4cf1a5f37bcc60708b6a78f6ae316d460107ad57b8b15f7a2b42" -nopie=yes + 1723f27eed50e751037f49dcdf73e33b17658f1178ea1c1f829a30bb02335745 + c6ab3b6b33f51ef7465921f8f8c10c15d7cbc510761a15a18ad85babf6d73278 + 07e73f02198affccf83cc9740d377b78ba27866b0d654a5e55cafae69d1dfa1c + a795511bf56183ff7bad8fb2d2836ca5bb158e12ddd519caced62946ffa69c83 + 2486cf203f8a201448ebd34949bc7f73038781a9099e205e55f1907fa91931bc + 6352803f1ed18d479ea93abf96ac75c0222a21403be22840bde1072ee5935dfa + 1ef4831d653c78439baa68f6f5d9b9dba54411ad89b1695031c4ecffaf4ff103 + 64a6d355d2d5c9449fc047e5bb0ca32875fc385061dfaf1df3aa791577b7ff5e" +skip_extraction="${_cubeb_commit}.tar.gz + ${_fmt_commit}.tar.gz + ${_googletest_commit}.tar.gz + ${_implot_commit}.tar.gz + ${_libspng_commit}.tar.gz + ${_mgba_commit}.tar.gz + ${_minizip_ng_commit}.tar.gz + ${_rcheevos_commit}.tar.gz + ${_sanitizers_cmake_commit}.tar.gz + ${_spirv_cross_commit}.tar.gz + ${_tinygltf_commit}.tar.gz + ${_vma_commit}.tar.gz + ${_zlib_ng_commit}.tar.gz" case "$XBPS_TARGET_MACHINE" in i686*) CFLAGS=-msse2 ;; @@ -66,31 +82,22 @@ case "$XBPS_TARGET_MACHINE" in esac post_extract() { - mv dolphin-${_dolphin_commit}/* . - rmdir Externals/mGBA/mgba - rmdir Externals/cubeb/cubeb - rmdir Externals/gtest - rmdir Externals/zlib-ng/zlib-ng - rmdir Externals/implot/implot - rmdir Externals/libspng/libspng - rmdir Externals/rcheevos/rcheevos - rmdir Externals/VulkanMemoryAllocator - rmdir Externals/spirv_cross/SPIRV-Cross - mv mgba-${_mgba_commit} Externals/mGBA/mgba - mv cubeb-${_cubeb_commit} Externals/cubeb/cubeb - cp -r googletest-${_googletest_commit} Externals/gtest - mv zlib-ng-${_zlib_ng_commit} Externals/zlib-ng/zlib-ng - mv implot-${_implot_commit} Externals/implot/implot - mv libspng-${_libspng_commit} Externals/libspng/libspng - mv rcheevos-${_rcheevos_commit} Externals/rcheevos/rcheevos - mv VulkanMemoryAllocator-${_vma_commit} Externals/VulkanMemoryAllocator - mv SPIRV-Cross-${_spirv_cross_commit} Externals/spirv_cross/SPIRV-Cross - rmdir Externals/cubeb/cubeb/googletest - rmdir Externals/cubeb/cubeb/cmake/sanitizers-cmake - mv googletest-${_googletest_commit} Externals/cubeb/cubeb/googletest - mv sanitizers-cmake-${_sanitizers_cmake_commit} Externals/cubeb/cubeb/cmake/sanitizers-cmake + vsrcextract -C Externals/VulkanMemoryAllocator ${_vma_commit}.tar.gz + vsrcextract -C Externals/cubeb/cubeb ${_cubeb_commit}.tar.gz + vsrcextract -C Externals/cubeb/cubeb/cmake/sanitizers-cmake ${_sanitizers_cmake_commit}.tar.gz + vsrcextract -C Externals/fmt/fmt ${_fmt_commit}.tar.gz + vsrcextract -C Externals/gtest ${_googletest_commit}.tar.gz + vsrcextract -C Externals/implot/implot ${_implot_commit}.tar.gz + vsrcextract -C Externals/libspng/libspng ${_libspng_commit}.tar.gz + vsrcextract -C Externals/mGBA/mgba ${_mgba_commit}.tar.gz + vsrcextract -C Externals/minizip-ng/minizip-ng ${_minizip_ng_commit}.tar.gz + vsrcextract -C Externals/rcheevos/rcheevos ${_rcheevos_commit}.tar.gz + vsrcextract -C Externals/spirv_cross/SPIRV-Cross ${_spirv_cross_commit}.tar.gz + vsrcextract -C Externals/tinygltf/tinygltf ${_tinygltf_commit}.tar.gz + vsrcextract -C Externals/zlib-ng/zlib-ng ${_zlib_ng_commit}.tar.gz + cp -r Externals/gtest/* Externals/cubeb/cubeb/googletest } post_install() { - rm -f ${DESTDIR}/usr/lib/*.a + vinstall Data/51-usb-device.rules 644 usr/lib/udev/rules.d }