Skip to content

Commit

Permalink
dolphin-emu: revbump for ffmpeg6
Browse files Browse the repository at this point in the history
Closes: void-linux#51368 [via git-merge-pr]
  • Loading branch information
zlice authored and maciozo committed Jul 23, 2024
1 parent f081e31 commit 9fdd2dc
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
13 changes: 13 additions & 0 deletions srcpkgs/dolphin-emu/patches/ipproto.patch
Original file line number Diff line number Diff line change
@@ -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;
9 changes: 9 additions & 0 deletions srcpkgs/dolphin-emu/patches/musl-cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--- a/Source/Core/UICommon/DiscordPresence.h
+++ b/Source/Core/UICommon/DiscordPresence.h
@@ -3,6 +3,7 @@

#pragma once

+#include <cstdint>
#include <functional>
#include <string>
4 changes: 2 additions & 2 deletions srcpkgs/dolphin-emu/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down

0 comments on commit 9fdd2dc

Please sign in to comment.