* [PR PATCH] dolphin-emu: update to 2407, refactor template
@ 2024-07-08 12:00 chrysos349
2024-07-10 2:13 ` Vinfall
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: chrysos349 @ 2024-07-08 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 556 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/51146
dolphin-emu: update to 2407, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 13499 bytes --]
From 5d56709d4f9e416ac6a40a2cbcbb4048ef907f87 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/2] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From 4519b956bdae1336b249b9f5d357583ae8edafb0 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:55 +0300
Subject: [PATCH 2/2] dolphin-emu: update to 2407
---
.../patches/0001-Add-musl-fix.patch | 39 -----
srcpkgs/dolphin-emu/patches/gcc13.patch | 12 ++
srcpkgs/dolphin-emu/template | 143 +++++++++---------
3 files changed, 87 insertions(+), 107 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch
create mode 100644 srcpkgs/dolphin-emu/patches/gcc13.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 995d7e27fa75bf..00000000000000
--- 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/patches/gcc13.patch b/srcpkgs/dolphin-emu/patches/gcc13.patch
new file mode 100644
index 00000000000000..1f5aae72bae2f7
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/gcc13.patch
@@ -0,0 +1,12 @@
+diff --git a/Source/Core/UICommon/DiscordPresence.h b/Source/Core/UICommon/DiscordPresence.h
+index 67da5fd..3a6b9b0 100644
+--- a/Source/Core/UICommon/DiscordPresence.h
++++ b/Source/Core/UICommon/DiscordPresence.h
+@@ -3,6 +3,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <functional>
+ #include <string>
+
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 862d3ae964eec4..a25fbb9c36c89e 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=3
-_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
-_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
-_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
-_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e
-_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778
-_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd
+version=2407
+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 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"
+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 ffmpeg-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
+ mbedtls-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 <henry@nilsu.org>"
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="b313a4eb9d4f6eb7369c9d1d93414a304799246d3f0e4f946c235a4ac71043db
+ 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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
@ 2024-07-10 2:13 ` Vinfall
2024-07-23 1:16 ` Vinfall
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Vinfall @ 2024-07-10 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2219345838
Comment:
Just wanna say this works perfectly on my machine👍🏼
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
2024-07-10 2:13 ` Vinfall
@ 2024-07-23 1:16 ` Vinfall
2024-07-23 9:56 ` [PR PATCH] [Updated] " chrysos349
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Vinfall @ 2024-07-23 1:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2244070542
Comment:
You probably need to rebase on master now that #51368 (i.e. https://github.com/void-linux/void-packages/pull/51368/commits/70a5b415d210f3104912160272b1f21df45f15e2) is merged.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
2024-07-10 2:13 ` Vinfall
2024-07-23 1:16 ` Vinfall
@ 2024-07-23 9:56 ` chrysos349
2024-07-24 4:05 ` Hnaguski
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-07-23 9:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There is an updated 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/51146
dolphin-emu: update to 2407, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 14562 bytes --]
From edb8ba83e368edcf9fab745ca0453af7de8e3a0c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/2] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From 478df5d70172e675d079d3bcf70f96f1f89045d5 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 23 Jul 2024 02:14:27 +0300
Subject: [PATCH 2/2] dolphin-emu: update to 2407
---
.../patches/0001-Add-musl-fix.patch | 39 -----
.../{musl-cstdint.patch => gcc13.patch} | 7 +-
srcpkgs/dolphin-emu/patches/ipproto.patch | 13 --
srcpkgs/dolphin-emu/template | 143 +++++++++---------
4 files changed, 80 insertions(+), 122 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch
rename srcpkgs/dolphin-emu/patches/{musl-cstdint.patch => gcc13.patch} (58%)
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 995d7e27fa75bf..00000000000000
--- 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/patches/musl-cstdint.patch b/srcpkgs/dolphin-emu/patches/gcc13.patch
similarity index 58%
rename from srcpkgs/dolphin-emu/patches/musl-cstdint.patch
rename to srcpkgs/dolphin-emu/patches/gcc13.patch
index 805fee3546b966..1f5aae72bae2f7 100644
--- a/srcpkgs/dolphin-emu/patches/musl-cstdint.patch
+++ b/srcpkgs/dolphin-emu/patches/gcc13.patch
@@ -1,9 +1,12 @@
+diff --git a/Source/Core/UICommon/DiscordPresence.h b/Source/Core/UICommon/DiscordPresence.h
+index 67da5fd..3a6b9b0 100644
--- a/Source/Core/UICommon/DiscordPresence.h
+++ b/Source/Core/UICommon/DiscordPresence.h
@@ -3,6 +3,7 @@
-
+
#pragma once
-
+
+#include <cstdint>
#include <functional>
#include <string>
+
diff --git a/srcpkgs/dolphin-emu/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch
deleted file mode 100644
index c2f9e81dc33312..00000000000000
--- 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 c4a6ad40162834..7e3ae7a8b2613d 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=4
-_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
-_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
-_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
-_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e
-_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778
-_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd
+version=2407
+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
- mbedtls-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
+ mbedtls-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 <henry@nilsu.org>"
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="b313a4eb9d4f6eb7369c9d1d93414a304799246d3f0e4f946c235a4ac71043db
+ 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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (2 preceding siblings ...)
2024-07-23 9:56 ` [PR PATCH] [Updated] " chrysos349
@ 2024-07-24 4:05 ` Hnaguski
2024-08-12 0:34 ` zlice
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Hnaguski @ 2024-07-24 4:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by Hnaguski on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2246821890
Comment:
Looks good to me, thanks for updating
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (3 preceding siblings ...)
2024-07-24 4:05 ` Hnaguski
@ 2024-08-12 0:34 ` zlice
2024-08-14 11:44 ` [PR PATCH] [Updated] " chrysos349
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: zlice @ 2024-08-12 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2282952537
Comment:
seems to work for me too
but why the patch whitespace v-v
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (4 preceding siblings ...)
2024-08-12 0:34 ` zlice
@ 2024-08-14 11:44 ` chrysos349
2024-08-14 12:13 ` chrysos349
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-08-14 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There is an updated 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/51146
dolphin-emu: update to 2407, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 14467 bytes --]
From 9a4b8ef2dd85b3af38fa08f9cd9860449df251d8 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/2] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From 0037b6dc73dac4f75db33edd13616494433fae8e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 23 Jul 2024 02:14:27 +0300
Subject: [PATCH 2/2] dolphin-emu: update to 2407
---
.../patches/0001-Add-musl-fix.patch | 39 -----
.../{musl-cstdint.patch => gcc13.patch} | 2 +
srcpkgs/dolphin-emu/patches/ipproto.patch | 13 --
srcpkgs/dolphin-emu/template | 143 +++++++++---------
4 files changed, 77 insertions(+), 120 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/0001-Add-musl-fix.patch
rename srcpkgs/dolphin-emu/patches/{musl-cstdint.patch => gcc13.patch} (59%)
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 995d7e27fa75bf..00000000000000
--- 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/patches/musl-cstdint.patch b/srcpkgs/dolphin-emu/patches/gcc13.patch
similarity index 59%
rename from srcpkgs/dolphin-emu/patches/musl-cstdint.patch
rename to srcpkgs/dolphin-emu/patches/gcc13.patch
index 805fee3546b966..65cd62466e978b 100644
--- a/srcpkgs/dolphin-emu/patches/musl-cstdint.patch
+++ b/srcpkgs/dolphin-emu/patches/gcc13.patch
@@ -1,3 +1,5 @@
+diff --git a/Source/Core/UICommon/DiscordPresence.h b/Source/Core/UICommon/DiscordPresence.h
+index 67da5fd..3a6b9b0 100644
--- a/Source/Core/UICommon/DiscordPresence.h
+++ b/Source/Core/UICommon/DiscordPresence.h
@@ -3,6 +3,7 @@
diff --git a/srcpkgs/dolphin-emu/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch
deleted file mode 100644
index c2f9e81dc33312..00000000000000
--- 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 c4a6ad40162834..7e3ae7a8b2613d 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=4
-_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
-_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
-_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
-_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e
-_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778
-_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd
+version=2407
+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
- mbedtls-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
+ mbedtls-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 <henry@nilsu.org>"
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="b313a4eb9d4f6eb7369c9d1d93414a304799246d3f0e4f946c235a4ac71043db
+ 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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (5 preceding siblings ...)
2024-08-14 11:44 ` [PR PATCH] [Updated] " chrysos349
@ 2024-08-14 12:13 ` chrysos349
2024-09-05 7:41 ` Vinfall
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-08-14 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There is an updated 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/51146
dolphin-emu: update to 2407, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 13709 bytes --]
From 9a4b8ef2dd85b3af38fa08f9cd9860449df251d8 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/2] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From df70e41f25eef1de745529ffc631be68914e0572 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 23 Jul 2024 02:14:27 +0300
Subject: [PATCH 2/2] dolphin-emu: update to 2407
---
.../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 995d7e27fa75bf..00000000000000
--- 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/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch
deleted file mode 100644
index c2f9e81dc33312..00000000000000
--- 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 c4a6ad40162834..7e3ae7a8b2613d 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=4
-_dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107
-_mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9
-_googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48
-_zlib_ng_commit=cf89cf35037f152ce7adfeca864656de5d33ea1e
-_cubeb_commit=27d2a102b0b75d9e49d43bc1ea516233fb87d778
-_sanitizers_cmake_commit=c3dc841af4dbf44669e65b82cb68a575864326bd
+version=2407
+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
- mbedtls-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
+ mbedtls-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 <henry@nilsu.org>"
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="b313a4eb9d4f6eb7369c9d1d93414a304799246d3f0e4f946c235a4ac71043db
+ 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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (6 preceding siblings ...)
2024-08-14 12:13 ` chrysos349
@ 2024-09-05 7:41 ` Vinfall
2024-09-05 16:17 ` [PR PATCH] [Updated] " chrysos349
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Vinfall @ 2024-09-05 7:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2330829856
Comment:
Hmmm, [2409 released with RetroAchievements support](https://dolphin-emu.org/blog/2024/09/04/dolphin-progress-report-release-2407-2409/), yet 2407 update is still not merged :(
Tried to update but eventually gave up as the submodule commits are very confusing to me.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] dolphin-emu: update to 2407, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (7 preceding siblings ...)
2024-09-05 7:41 ` Vinfall
@ 2024-09-05 16:17 ` chrysos349
2024-09-26 17:57 ` dolphin-emu: update to 2409, " classabbyamp
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-09-05 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There is an updated 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/51146
dolphin-emu: update to 2407, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 14800 bytes --]
From fe78647fd22f2d649a59e5c22d22ac107beb42fa Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/3] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From bd9496dd03262df4b59890d2e6129c62b44a99d2 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 5 Sep 2024 19:14:42 +0300
Subject: [PATCH 2/3] SDL2: update to 2.30.7
---
srcpkgs/SDL2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 656cf7523be1b4..e7b19fdee97c69 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
# Template file for 'SDL2'
pkgname=SDL2
-version=2.30.4
+version=2.30.7
revision=1
build_style=cmake
configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
@@ -15,7 +15,7 @@ license="Zlib"
homepage="https://www.libsdl.org/"
changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26
+checksum=2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694
# Package build options
build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
From ed69b87de9c5e4d752c3e823125914b3b95e650e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 23 Jul 2024 02:14:27 +0300
Subject: [PATCH 3/3] 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 995d7e27fa75bf..00000000000000
--- 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/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch
deleted file mode 100644
index c2f9e81dc33312..00000000000000
--- 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 c4a6ad40162834..675e868ff31ab1 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=4
-_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
- mbedtls-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
+ mbedtls-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 <henry@nilsu.org>"
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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2409, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (8 preceding siblings ...)
2024-09-05 16:17 ` [PR PATCH] [Updated] " chrysos349
@ 2024-09-26 17:57 ` classabbyamp
2024-09-26 18:35 ` [PR PATCH] [Updated] " chrysos349
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2024-09-26 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2377598824
Comment:
rebase please
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] dolphin-emu: update to 2409, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (9 preceding siblings ...)
2024-09-26 17:57 ` dolphin-emu: update to 2409, " classabbyamp
@ 2024-09-26 18:35 ` chrysos349
2024-09-26 19:07 ` chrysos349
2024-09-27 3:01 ` [PR PATCH] [Merged]: " classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-09-26 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There is an updated 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/51146
dolphin-emu: update to 2409, refactor template
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
A patch file from https://github.com/void-linux/void-packages/pull/51146.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-51146.patch --]
[-- Type: text/x-diff, Size: 14802 bytes --]
From 4098d76f8b7c1e8c69e44ad26266555fb372d7a7 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 5 Jul 2024 12:04:39 +0300
Subject: [PATCH 1/3] libenet: update to 1.3.18
---
srcpkgs/libenet/template | 11 ++++++++---
srcpkgs/libenet/update | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
delete mode 100644 srcpkgs/libenet/update
diff --git a/srcpkgs/libenet/template b/srcpkgs/libenet/template
index 596076961a7e9a..379fe2cfebce42 100644
--- a/srcpkgs/libenet/template
+++ b/srcpkgs/libenet/template
@@ -1,15 +1,20 @@
# Template file for 'libenet'
pkgname=libenet
-version=1.3.17
+version=1.3.18
revision=1
build_style=gnu-configure
+hostmakedepends="automake libtool"
short_desc="Reliable UDP networking library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://enet.bespin.org"
changelog="https://raw.githubusercontent.com/lsalzman/enet/master/ChangeLog"
-distfiles="http://enet.bespin.org/download/enet-${version}.tar.gz"
-checksum=a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc
+distfiles="https://github.com/lsalzman/enet/archive/v${version}.tar.gz"
+checksum=28603c895f9ed24a846478180ee72c7376b39b4bb1287b73877e5eae7d96b0dd
+
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/libenet/update b/srcpkgs/libenet/update
deleted file mode 100644
index b045078128576a..00000000000000
--- a/srcpkgs/libenet/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/lsalzman/enet/tags"
-pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'
From b83e461673dd6868dda04dafce7a5fd8366811f7 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Thu, 5 Sep 2024 19:14:42 +0300
Subject: [PATCH 2/3] SDL2: update to 2.30.7
---
srcpkgs/SDL2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 656cf7523be1b4..e7b19fdee97c69 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
# Template file for 'SDL2'
pkgname=SDL2
-version=2.30.4
+version=2.30.7
revision=1
build_style=cmake
configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
@@ -15,7 +15,7 @@ license="Zlib"
homepage="https://www.libsdl.org/"
changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26
+checksum=2508c80438cd5ff3bbeb8fe36b8f3ce7805018ff30303010b61b03bb83ab9694
# Package build options
build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
From 6298e09454797aca009d90160643998123e17522 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Tue, 23 Jul 2024 02:14:27 +0300
Subject: [PATCH 3/3] 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 995d7e27fa75bf..00000000000000
--- 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/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch
deleted file mode 100644
index c2f9e81dc33312..00000000000000
--- 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 7992e3ab44b0e1..fbaddea209d987 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 <henry@nilsu.org>"
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
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: dolphin-emu: update to 2409, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (10 preceding siblings ...)
2024-09-26 18:35 ` [PR PATCH] [Updated] " chrysos349
@ 2024-09-26 19:07 ` chrysos349
2024-09-27 3:01 ` [PR PATCH] [Merged]: " classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: chrysos349 @ 2024-09-26 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/51146#issuecomment-2377726572
Comment:
@classabbyamp done
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: dolphin-emu: update to 2409, refactor template
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
` (11 preceding siblings ...)
2024-09-26 19:07 ` chrysos349
@ 2024-09-27 3:01 ` classabbyamp
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2024-09-27 3:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There's a merged pull request on the void-packages repository
dolphin-emu: update to 2409, refactor template
https://github.com/void-linux/void-packages/pull/51146
Description:
@Hnaguski
this app was last updated a year ago.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64)
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-09-27 3:01 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-08 12:00 [PR PATCH] dolphin-emu: update to 2407, refactor template chrysos349
2024-07-10 2:13 ` Vinfall
2024-07-23 1:16 ` Vinfall
2024-07-23 9:56 ` [PR PATCH] [Updated] " chrysos349
2024-07-24 4:05 ` Hnaguski
2024-08-12 0:34 ` zlice
2024-08-14 11:44 ` [PR PATCH] [Updated] " chrysos349
2024-08-14 12:13 ` chrysos349
2024-09-05 7:41 ` Vinfall
2024-09-05 16:17 ` [PR PATCH] [Updated] " chrysos349
2024-09-26 17:57 ` dolphin-emu: update to 2409, " classabbyamp
2024-09-26 18:35 ` [PR PATCH] [Updated] " chrysos349
2024-09-26 19:07 ` chrysos349
2024-09-27 3:01 ` [PR PATCH] [Merged]: " classabbyamp
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).