commit: 17bd64be273a560dc8c64ff50e046646f9038a21 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Aug 14 14:39:24 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Aug 14 21:55:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bd64be
games-emulation/dolphin: remove unused patch(es) Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17120 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../files/dolphin-5.0-CHAR_WIDTH-collision.patch | 49 ---------------------- .../dolphin/files/dolphin-5.0-no-pie.patch | 26 ------------ .../files/dolphin-5.0-soundtouch-exceptions.patch | 19 --------- .../dolphin/files/dolphin-5.0-xgetbv.patch | 24 ----------- 4 files changed, 118 deletions(-) diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch deleted file mode 100644 index d6e4c7a2dc0..00000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch +++ /dev/null @@ -1,49 +0,0 @@ -Avoid clash with TS 18661-1:2014 macros -https://bugs.gentoo.org/637986 - ---- a/Source/Core/VideoBackends/OGL/RasterFont.cpp -+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp -@@ -15,7 +15,7 @@ - namespace OGL - { - --static const int CHAR_WIDTH = 8; -+static const int DOLPHIN_CHAR_WIDTH = 8; - static const int CHAR_HEIGHT = 13; - static const int CHAR_OFFSET = 32; - static const int CHAR_COUNT = 95; -@@ -146,20 +146,20 @@ - glGenTextures(1, &texture); - glActiveTexture(GL_TEXTURE8); - glBindTexture(GL_TEXTURE_2D, texture); -- std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT); -+ std::vector<u32> texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT); - for (int y = 0; y < CHAR_HEIGHT; y++) - { - for (int c = 0; c < CHAR_COUNT; c++) - { -- for (int x = 0; x < CHAR_WIDTH; x++) -+ for (int x = 0; x < DOLPHIN_CHAR_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 << (DOLPHIN_CHAR_WIDTH - x - 1)))); -+ texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_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, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); - - // generate shader - ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc); -@@ -196,7 +196,7 @@ - std::vector<GLfloat> vertices(text.length() * 6 * 4); - - int usage = 0; -- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth); -+ GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth); - GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight); - GLfloat border_x = 2.0f / GLfloat(bbWidth); - GLfloat border_y = 4.0f / GLfloat(bbHeight); diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch deleted file mode 100644 index 949e42e50de..00000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disable PIE-compatible code generation via -fno-pie. - -Before upstream fix: -https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f -dolphin assumed executable image to be in low addresses (<2GB) -and hardcoded 32-bit absolute addresses during JIT phase. - -PIE-compatible code does not have this restriction and -allows mapping binaries above 2GB area (and breaks dolphin's JIT). - -Strictly speaking -no-pie (link-time flag) does not or guarantee -or require low address mapping for binary if it was already built -as PIC/PIE. - -But -fno-pie imposes additional restrictions on generated code by GCC -and makes -no-pie to take effect. -Bug: https://bugs.gentoo.org/640124 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC) - set(_M_X86_64 1) -- add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie") -+ add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2 -fno-pie) -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie -no-pie") - else() diff --git a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch deleted file mode 100644 index ffd07cf0697..00000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/686752 - -Description: Fix FTBFS with SoundTouch 2.1.2 - Explicitly disable exceptions in SoundTouch headers because Dolphin - is compiled with -fno-exceptions. -Author: James Cowgill <[email protected]> -Bug-Debian: https://bugs.debian.org/917671 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Source/Core/AudioCommon/OpenALStream.h -+++ b/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/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch deleted file mode 100644 index ffa7cc81c13..00000000000 --- a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch +++ /dev/null @@ -1,24 +0,0 @@ -Workaround collision of _xgetbv intrinsic redeclaration: - -Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration of ‘u64 _xgetbv(u32)’ - static u64 _xgetbv(u32 index) - ^~~~~~~ -In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74, - from Source/Core/Common/Intrinsics.h:12, - from Source/Core/Common/x64CPUDetect.cpp:10: -/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old declaration ‘long long int _xgetbv(unsigned int)’ - _xgetbv (unsigned int __A) - ^~~~~~~ - -Upstream fied it in - commit 823fdda30c38be953c3d425874f2adeabed2b5a8 - intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are reserved - ---- a/Source/Core/Common/x64CPUDetect.cpp -+++ b/Source/Core/Common/x64CPUDetect.cpp -@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id) --static u64 _xgetbv(u32 index) -+static u64 _xgetbv_dolphin(u32 index) -@@ -137 +137 @@ void CPUInfo::Detect() -- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) -+ if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
