From 30fcc3a6007e7b76b42b6313c5487e8174d28d5d Mon Sep 17 00:00:00 2001 From: zlice Date: Sun, 21 Jul 2024 23:12:38 -0400 Subject: [PATCH] dolphin-emu: revbump for ffmpeg6 Closes: #51368 [via git-merge-pr] --- srcpkgs/dolphin-emu/patches/ipproto.patch | 13 +++++++++++++ srcpkgs/dolphin-emu/patches/musl-cstdint.patch | 9 +++++++++ srcpkgs/dolphin-emu/template | 4 ++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dolphin-emu/patches/ipproto.patch create mode 100644 srcpkgs/dolphin-emu/patches/musl-cstdint.patch diff --git a/srcpkgs/dolphin-emu/patches/ipproto.patch b/srcpkgs/dolphin-emu/patches/ipproto.patch new file mode 100644 index 00000000000..c2f9e81dc33 --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/ipproto.patch @@ -0,0 +1,13 @@ +--- 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/patches/musl-cstdint.patch b/srcpkgs/dolphin-emu/patches/musl-cstdint.patch new file mode 100644 index 00000000000..805fee3546b --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/musl-cstdint.patch @@ -0,0 +1,9 @@ +--- a/Source/Core/UICommon/DiscordPresence.h ++++ b/Source/Core/UICommon/DiscordPresence.h +@@ -3,6 +3,7 @@ + + #pragma once + ++#include + #include + #include diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 862d3ae964e..c4a6ad40162 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,7 +1,7 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu version=5.0.19368 -revision=3 +revision=4 _dolphin_commit=dadbeb4bae7e7fa23af2b46e0add4143094dc107 _mgba_commit=44e074a15e9651481f7f652ac006a7c9d58cbeb9 _googletest_commit=be03d00f5f0cc3a997d1a368bee8a1fe93651f48 @@ -24,7 +24,7 @@ configure_args="-DUSE_SHARED_ENET=ON 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 + 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" depends="desktop-file-utils"