* [PR PATCH] dolphin-emu: update to 5.0.13178.
@ 2021-01-29 3:42 ericonr
2021-02-03 4:28 ` [PR PATCH] [Merged]: " abenson
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2021-01-29 3:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1767 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages dolphin
https://github.com/void-linux/void-packages/pull/28295
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.
@abenson
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28295.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-28295.patch --]
[-- Type: text/x-diff, Size: 12090 bytes --]
From 3afdcf9940facd28c2edd598920b1f600f1fc03b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 30 Jun 2020 16:19:50 -0500
Subject: [PATCH] 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.
---
...1c73c6e384b55ac8b95891bcecc455fae0da.patch | 47 --------
.../patches/mbedtls_platform_h.patch | 10 --
srcpkgs/dolphin-emu/patches/musl.patch | 22 ----
.../dolphin-emu/patches/raster_font_cpp.patch | 112 ------------------
.../dolphin-emu/patches/soundtouch212.patch | 17 ---
srcpkgs/dolphin-emu/template | 25 ++--
6 files changed, 13 insertions(+), 220 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/musl.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
delete mode 100644 srcpkgs/dolphin-emu/patches/soundtouch212.patch
diff --git a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch b/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
deleted file mode 100644
index a808884a62a..00000000000
--- a/srcpkgs/dolphin-emu/patches/2ab51c73c6e384b55ac8b95891bcecc455fae0da.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch b/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
deleted file mode 100644
index 3d6587bbe60..00000000000
--- a/srcpkgs/dolphin-emu/patches/mbedtls_platform_h.patch
+++ /dev/null
@@ -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>
diff --git a/srcpkgs/dolphin-emu/patches/musl.patch b/srcpkgs/dolphin-emu/patches/musl.patch
deleted file mode 100644
index 52a8164c16d..00000000000
--- a/srcpkgs/dolphin-emu/patches/musl.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch b/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
deleted file mode 100644
index a569ec7e1e6..00000000000
--- a/srcpkgs/dolphin-emu/patches/raster_font_cpp.patch
+++ /dev/null
@@ -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;
diff --git a/srcpkgs/dolphin-emu/patches/soundtouch212.patch b/srcpkgs/dolphin-emu/patches/soundtouch212.patch
deleted file mode 100644
index b48c57d94f5..00000000000
--- a/srcpkgs/dolphin-emu/patches/soundtouch212.patch
+++ /dev/null
@@ -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>
-
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 0e38d8d25be..a577e9cc962 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,25 +1,26 @@
# Template file for 'dolphin-emu'
pkgname=dolphin-emu
-version=5.0
-revision=18
-archs="x86_64* ppc64le*"
-wrksrc="dolphin-${version}"
+version=5.0.13178
+revision=1
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+#Version/hash pair can be found at https://dolphin-emu.org/download/
+archs="x86_64* aarch64* ppc64le*"
+wrksrc="dolphin-${_commit}"
build_style=cmake
-configure_args="-DUSE_X11=1 -DUSE_EGL=0
- -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
-hostmakedepends="pkg-config"
+configure_args="-DUSE_SHARED_ENET=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
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
- portaudio-devel libopenal-devel soundtouch-devel lzo-devel wxWidgets-devel
- mbedtls-devel SFML-devel libenet-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"
short_desc="Gamecube / Wii / Triforce emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${version}.tar.gz"
-checksum=62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
nopie=yes
case "$XBPS_TARGET_MACHINE" in
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: dolphin-emu: update to 5.0.13178.
2021-01-29 3:42 [PR PATCH] dolphin-emu: update to 5.0.13178 ericonr
@ 2021-02-03 4:28 ` abenson
0 siblings, 0 replies; 2+ messages in thread
From: abenson @ 2021-02-03 4:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]
There's a merged pull request on the void-packages repository
dolphin-emu: update to 5.0.13178.
https://github.com/void-linux/void-packages/pull/28295
Description:
This moves to their beta releases, which are recommende for distribution
use.
Added by ericonr:
- Fix cross and use system's libenet.
Closes #25625.
@abenson
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-03 4:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-29 3:42 [PR PATCH] dolphin-emu: update to 5.0.13178 ericonr
2021-02-03 4:28 ` [PR PATCH] [Merged]: " abenson
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).