snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

dolphin-emu: update to 5.0.13178. 

This moves to their beta releases, which are recommende for distribution
use.

Added by ericonr:
- Fix cross and use system's libenet.

Closes #25625.
This commit is contained in:
Andrew Benson 2020-06-30 16:19:50 -05:00 committed by Andrew Benson
parent 54f05e5865
commit bb9777cc38
6 changed files with 13 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
View File

@ -1,47 +0,0 @@
Origin: https://github.com/dolphin-emu/dolphin/commit/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
Subject: [PATCH] intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK,
which are reserved
---
--- Source/Core/Common/x64CPUDetect.cpp 2016-06-24 10:09:07.000000000 +0200
+++ - 2018-08-19 19:43:35.737800299 +0200
@@ -41,15 +41,27 @@
return __cpuidex(info, function_id, 0);
}
-#define _XCR_XFEATURE_ENABLED_MASK 0
-static u64 _xgetbv(u32 index)
+#endif // ifndef _WIN32
+
+#ifdef _WIN32
+
+static u64 xgetbv(u32 index)
+{
+ return _xgetbv(index);
+}
+constexpr u32 XCR_XFEATURE_ENABLED_MASK = _XCR_XFEATURE_ENABLED_MASK;
+
+#else
+
+static u64 xgetbv(u32 index)
{
u32 eax, edx;
__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
return ((u64)edx << 32) | eax;
}
+constexpr u32 XCR_XFEATURE_ENABLED_MASK = 0;
+#endif // ifdef _WIN32
-#endif // ifndef _WIN32
CPUInfo cpu_info;
@@ -134,7 +146,7 @@
// - XGETBV result has the XCR bit set.
if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
{
- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
+ if ((xgetbv(XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
{
bAVX = true;
if ((cpu_id[2] >> 12) & 1)

10
srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
View File

@ -1,10 +0,0 @@
--- Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2016-06-24 10:09:07.000000000 +0200
+++ Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h 2016-09-22 19:31:59.015774803 +0200
@@ -5,6 +5,7 @@
#pragma once
#include <string>
+#include <mbedtls/platform.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/entropy.h>
#include <mbedtls/net.h>

22
srcpkgs/dolphin-emu/patches/musl.patch
View File

@ -1,22 +0,0 @@
--- Source/PCH/pch.h.orig 2016-06-26 08:53:16.021952803 +0200
+++ Source/PCH/pch.h 2016-06-26 08:54:20.662712317 +0200
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <deque>
#include <errno.h>
-#if !defined ANDROID && !defined _WIN32
+#if defined(__linux__) && defined(__GLIBC__)
#include <execinfo.h>
#endif
#include <fcntl.h>
--- Source/Core/Common/Thread.cpp.orig 2016-06-26 08:56:12.959031810 +0200
+++ Source/Core/Common/Thread.cpp 2016-06-26 08:57:27.281905099 +0200
@@ -135,7 +135,7 @@ void SetCurrentThreadName(const char* sz
pthread_setname_np(szThreadName);
#elif defined __FreeBSD__
pthread_set_name_np(pthread_self(), szThreadName);
-#else
+#elif defined __GLIBC__
// linux doesn't allow to set more than 16 bytes, including \0.
pthread_setname_np(pthread_self(), std::string(szThreadName).substr(0, 15).c_str());
#endif

112
srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
View File

@ -1,112 +0,0 @@
--- Source/Core/VideoBackends/OGL/RasterFont.cpp.orig 2017-04-20 13:02:30.087390930 +0300
+++ Source/Core/VideoBackends/OGL/RasterFont.cpp 2017-04-20 13:02:49.036390127 +0300
@@ -15,12 +15,12 @@
namespace OGL
{
-static const int CHAR_WIDTH = 8;
-static const int CHAR_HEIGHT = 13;
-static const int CHAR_OFFSET = 32;
-static const int CHAR_COUNT = 95;
+static const int CHARACTER_WIDTH = 8;
+static const int CHARACTER_HEIGHT = 13;
+static const int CHARACTER_OFFSET = 32;
+static const int CHARACTER_COUNT = 95;
-static const u8 rasters[CHAR_COUNT][CHAR_HEIGHT] = {
+static const u8 rasters[CHARACTER_COUNT][CHARACTER_HEIGHT] = {
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36},
@@ -146,27 +146,27 @@
glGenTextures(1, &texture);
glActiveTexture(GL_TEXTURE8);
glBindTexture(GL_TEXTURE_2D, texture);
- std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
- for (int y = 0; y < CHAR_HEIGHT; y++)
+ std::vector<u32> texture_data(CHARACTER_WIDTH * CHARACTER_COUNT * CHARACTER_HEIGHT);
+ for (int y = 0; y < CHARACTER_HEIGHT; y++)
{
- for (int c = 0; c < CHAR_COUNT; c++)
+ for (int c = 0; c < CHARACTER_COUNT; c++)
{
- for (int x = 0; x < CHAR_WIDTH; x++)
+ for (int x = 0; x < CHARACTER_WIDTH; x++)
{
- bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
- texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
+ bool pixel = (0 != (rasters[c][y] & (1 << (CHARACTER_WIDTH - x - 1))));
+ texture_data[CHARACTER_WIDTH * CHARACTER_COUNT * y + CHARACTER_WIDTH * c + x] = pixel ? -1 : 0;
}
}
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
// generate shader
ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
s_shader.Bind();
// bound uniforms
- glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHAR_COUNT), 1.0f);
+ glUniform2f(glGetUniformLocation(s_shader.glprogid,"charSize"), 1.0f / GLfloat(CHARACTER_COUNT), 1.0f);
uniform_color_id = glGetUniformLocation(s_shader.glprogid,"color");
glUniform4f(uniform_color_id, 1.0f, 1.0f, 1.0f, 1.0f);
uniform_offset_id = glGetUniformLocation(s_shader.glprogid, "offset");
@@ -196,8 +196,8 @@
std::vector<GLfloat> vertices(text.length() * 6 * 4);
int usage = 0;
- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
- GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
+ GLfloat delta_x = GLfloat(2 * CHARACTER_WIDTH) / GLfloat(bbWidth);
+ GLfloat delta_y = GLfloat(2 * CHARACTER_HEIGHT) / GLfloat(bbHeight);
GLfloat border_x = 2.0f / GLfloat(bbWidth);
GLfloat border_y = 4.0f / GLfloat(bbHeight);
@@ -220,37 +220,37 @@
continue;
}
- if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
+ if (c < CHARACTER_OFFSET || c >= CHARACTER_COUNT + CHARACTER_OFFSET)
continue;
vertices[usage++] = x;
vertices[usage++] = y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
vertices[usage++] = 0.0f;
vertices[usage++] = x + delta_x;
vertices[usage++] = y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
vertices[usage++] = 0.0f;
vertices[usage++] = x + delta_x;
vertices[usage++] = y + delta_y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
vertices[usage++] = 1.0f;
vertices[usage++] = x;
vertices[usage++] = y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
vertices[usage++] = 0.0f;
vertices[usage++] = x + delta_x;
vertices[usage++] = y + delta_y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET + 1);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET + 1);
vertices[usage++] = 1.0f;
vertices[usage++] = x;
vertices[usage++] = y + delta_y;
- vertices[usage++] = GLfloat(c - CHAR_OFFSET);
+ vertices[usage++] = GLfloat(c - CHARACTER_OFFSET);
vertices[usage++] = 1.0f;
x += delta_x + border_x;

17
srcpkgs/dolphin-emu/patches/soundtouch212.patch
View File

@ -1,17 +0,0 @@
Description: Fix FTBFS with SoundTouch 2.1.2
Explicitly disable exceptions in SoundTouch headers because Dolphin
is compiled with -fno-exceptions.
Author: James Cowgill <jcowgill@debian.org>
Bug-Debian: https://bugs.debian.org/917671
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- Source/Core/AudioCommon/OpenALStream.h
+++ Source/Core/AudioCommon/OpenALStream.h
@@ -32,6 +32,7 @@
#define BOOL SoundTouch_BOOL
#endif
+#define ST_NO_EXCEPTION_HANDLING
#include <soundtouch/SoundTouch.h>
#include <soundtouch/STTypes.h>

25
srcpkgs/dolphin-emu/template
View File

@ -1,25 +1,26 @@
# Template file for 'dolphin-emu' # Template file for 'dolphin-emu'
pkgname=dolphin-emu pkgname=dolphin-emu
version=5.0 version=5.0.13178
revision=18 revision=1
archs="x86_64* ppc64le*" _commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
wrksrc="dolphin-${version}" #Version/hash pair can be found at https://dolphin-emu.org/download/
archs="x86_64* aarch64* ppc64le*"
wrksrc="dolphin-${_commit}"
build_style=cmake build_style=cmake
configure_args="-DUSE_X11=1 -DUSE_EGL=0 configure_args="-DUSE_SHARED_ENET=ON"
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
hostmakedepends="pkg-config"
makedepends=" makedepends="
zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel libevdev-devel zlib-devel glew-devel libusb-devel qt5-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 ffmpeg-devel libgomp-devel libcurl-devel
portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel portaudio-devel libopenal-devel soundtouch-devel lzo-devel libbluetooth-devel
mbedtls-devel SFML-devel libenet-devel" mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
depends="desktop-file-utils" depends="desktop-file-utils"
short_desc="Gamecube / Wii / Triforce emulator" short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://dolphin-emu.org" homepage="http://dolphin-emu.org"
distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz" distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
checksum=62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
nopie=yes nopie=yes
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in