* [PR PATCH] dolphin-emu: update to 5.0.20347
@ 2024-01-26 23:25 chrysos349
2024-04-26 1:45 ` github-actions
0 siblings, 1 reply; 2+ messages in thread
From: chrysos349 @ 2024-01-26 23:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages dolphin-emu
https://github.com/void-linux/void-packages/pull/48390
dolphin-emu: update to 5.0.20347
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- aarch64 x
A patch file from https://github.com/void-linux/void-packages/pull/48390.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-48390.patch --]
[-- Type: text/x-diff, Size: 7090 bytes --]
From b8190350484c816a5090ed65ea084942f3b541fa Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 27 Jan 2024 02:22:26 +0300
Subject: [PATCH] dolphin-emu: update to 5.0.20347
---
.../patches/0001-Add-musl-fix.patch | 39 ------------
srcpkgs/dolphin-emu/template | 59 +++++++++++--------
2 files changed, 35 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.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 995d7e27fa75b..0000000000000
--- 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 <anerruption@disroot.org>
-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 <fmt/format.h>
-
-+#define _GNU_SOURCE
-+#include <features.h>
-+#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/template b/srcpkgs/dolphin-emu/template
index 862d3ae964eec..0ce38cd018537 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,32 +1,37 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
-version=5.0.19368
-revision=3
-_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
-_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
-_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
-_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e
+version=5.0.20347
+revision=1
+_dolphin_commit=dc0814ae4622313d513468bdc377ee9c031de199
+_mgba_commit=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51
+_googletest_commit=58d77fa8070e8cec2dc1ed015d66b454c8d78850
+_zlib_ng_commit=ce01b1e41da298334f8214389cc9369540a7560f
_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778
_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd
_implot_commit=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d
-_libspng_commit=e5c1fc470fceaca08b8c30dc40768c28b82b9e12
-_rcheevos_commit=3af1e2fc5188d6e932ee379942f4049ea877e648
-_vma_commit=d9a2e4641ba4808e803ff555be132f280366ab47
-_spirv_cross_commit=b8e742c91ba47eb3238c939ee11ec9ba2ba247bf
+_libspng_commit=dc5b1032c08efac68ad30170f7ccbf0aa8dd55c9
+_rcheevos_commit=d9e990e6d13527532b7e2bb23164a1f3b7f33bb5
+_vma_commit=498e20dfd1343d99b9115201034bb0219801cdec
+_spirv_cross_commit=50b4d5389b6a06f86fb63a2848e1a7da6d9755ca
+_fmt_commit=f5e54359df4c26b6230fc61d38aa294581393084
#Version/hash pair can be found at https://dolphin-emu.org/download/
archs="x86_64* aarch64* ppc64le* i686"
-create_wrksrc=yes
build_style=cmake
-configure_args="-DUSE_SHARED_ENET=ON
+configure_args="
-DDOLPHIN_WC_DESCRIBE=${version%.*}-${version##*.}
-DDOLPHIN_WC_REVISION=$_dolphin_commit
- -DDOLPHIN_WC_BRANCH=master"
-hostmakedepends="pkg-config qt6-tools qt6-base gettext-devel"
+ -DDOLPHIN_WC_BRANCH=master
+ -DDISTRIBUTOR=voidlinux.org
+ -DENABLE_ANALYTICS=OFF
+ -DUSE_DISCORD_PRESENCE=OFF
+ -DUSE_RETRO_ACHIEVEMENTS=OFF"
+hostmakedepends="pkg-config qt6-tools qt6-base gettext python3"
makedepends="
zlib-devel glew-devel libusb-devel qt6-base-devel miniupnpc-devel libevdev-devel
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
- mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
+ mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel qt6-svg-devel
+ liblz4-devel"
depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Henry Naguski <henry@nilsu.org>"
@@ -42,18 +47,20 @@ distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar
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
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/${_spirv_cross_commit}.tar.gz
+ https://github.com/fmtlib/fmt/archive/${_fmt_commit}.tar.gz"
+checksum="232195245dd096e84cb34e1df745fa741c2043effae3a2b97a4f6aa3541ea5c3
+ 07e73f02198affccf83cc9740d377b78ba27866b0d654a5e55cafae69d1dfa1c
+ c6ab3b6b33f51ef7465921f8f8c10c15d7cbc510761a15a18ad85babf6d73278
+ 64a6d355d2d5c9449fc047e5bb0ca32875fc385061dfaf1df3aa791577b7ff5e
9326a22d41b30b6d613c248a8ea2eb56c5ffc76a7080b0127165682fd8eba13e
19d511a3a4ddc872c89ab62c070dd8d1fcc733e6ea4655f5876a60237cd556ba
af51940ae6482c0e96ffb4309982fa309f9aa383cd8f980081681010c8c3a835
- e3094cf323d7b5c3a69210c2a8d97725b8ec2867aa83007b864c2c468e63b468
- 2350d4479a9ca725a269eee5c1aeccf3e54ea2cf7bf9dd82bd0f07c59f96f5bd
- 5e12a559454dfdf46a7935f33c759f2e2fb2f59539aeec8779d5f32375c91c4b
- 6f65717f6b4b4cf1a5f37bcc60708b6a78f6ae316d460107ad57b8b15f7a2b42"
+ 2486cf203f8a201448ebd34949bc7f73038781a9099e205e55f1907fa91931bc
+ dc165d4e7ce7b2b36169d94cc3291012e4b1fdf6a49b6b1d33c5126b289c888f
+ 4cb34c92b57d132d3200aa8c9b7f758e963eaeb31b6127d6edd0cd0902dc177e
+ ed27481a78470fe9905cdfec8fd2ebb6c8f68a17377c2879527c2fcb2a01751c
+ ff9d0525ee224e400aed21a6a858fe5a6b155ee1ca1bd2577742497941d99550"
nopie=yes
case "$XBPS_TARGET_MACHINE" in
@@ -89,8 +96,12 @@ post_extract() {
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
+ rmdir Externals/fmt/fmt
+ mv fmt-${_fmt_commit} Externals/fmt/fmt
}
post_install() {
rm -f ${DESTDIR}/usr/lib/*.a
+ vmkdir usr/lib/udev/rules.d
+ vcopy Data/51-usb-device.rules usr/lib/udev/rules.d
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: dolphin-emu: update to 5.0.20347
2024-01-26 23:25 [PR PATCH] dolphin-emu: update to 5.0.20347 chrysos349
@ 2024-04-26 1:45 ` github-actions
0 siblings, 0 replies; 2+ messages in thread
From: github-actions @ 2024-04-26 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/48390#issuecomment-2078483419
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-26 1:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-26 23:25 [PR PATCH] dolphin-emu: update to 5.0.20347 chrysos349
2024-04-26 1:45 ` github-actions
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).