commit: 6e29bbcd3a34928a515d035df21bf806223958b1 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Mon Mar 3 16:42:12 2025 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Fri Apr 25 00:35:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e29bbcd
games-emulation/rmg: drop 0.6.6-r2 Closes: https://github.com/gentoo/gentoo/pull/40871 Signed-off-by: orbea <orbea <AT> riseup.net> Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> games-emulation/rmg/Manifest | 1 - .../rmg-0.5.6-parallel-rdp-standalone-musl.patch | 40 ---- .../rmg-0.6.6-mupen64plus-core-sdl-pkgconfig.patch | 59 ------ ....6-mupen64plus-input-raphnetraw-pkgconfig.patch | 59 ------ ...upen64plus-video-GLideN64-strict-aliasing.patch | 207 --------------------- games-emulation/rmg/rmg-0.6.6-r2.ebuild | 145 --------------- 6 files changed, 511 deletions(-) diff --git a/games-emulation/rmg/Manifest b/games-emulation/rmg/Manifest index 2f70e3083573..8fae0441f323 100644 --- a/games-emulation/rmg/Manifest +++ b/games-emulation/rmg/Manifest @@ -7,7 +7,6 @@ DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0 DIST pkg-config-0.3.29.crate 20563 BLAKE2B ed0559b0073890911fb47742743b2586123bf9e9b594aa0d5b2c419c6768cd37e25b546c21077ea6cc02823a679b302aeaaca6c7fcaf9aeec615dd08f53a1f6f SHA512 bac7dafc0e10bef40e427c1fc0271d1a26acb2f5b1cf7cc7a128f4d4f1f3110529e45057b71cea7b0f6ddff26945fe08962285ddeb22b54639e44a2e43af698f DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 -DIST rmg-0.6.6.tar.gz 78980131 BLAKE2B 2925e087a1ac35a6ee5ed01a3c17eae5890a2fd72e2921e625f2ee5832763796614a4b7f397290aaea4e6bed2c84af1b9a9d1c002913143227b2a5cfb31985d0 SHA512 57ef882fb08280ec5b999a9c9accca16517517b5798e9283496b47b66c82b5122ec9340df2a2449b554b1aee0314a6c46f7a827759b8ab27b0135b3ea778f783 DIST rmg-0.7.3.tar.gz 71562276 BLAKE2B 5718d9d845c3cf30be5db25d078d0133b50f4486b36ce61582b526731c289ddb873a4a712a52c3c3005d26b66459276cd0ec56acec3042e214b1ee47afca2398 SHA512 63825bce24417404d12bb1f7d1967eed08153c122d57963065a7b8283cb1681801069311a7a467162a756d6f8d993dbed4262cac00d7d565f16ed24146c83982 DIST rmg-0.7.8.tar.gz 71689736 BLAKE2B cfec255783de19ee261f61d04a2fdd8a748b4e10e8d7b080d77b7551875c42d56cec066bcb58b30c847e0dfa756983fda87ffc995eb3f16698d230815880e779 SHA512 df6321d29674ca38e46869398ab3c42b27095f01dfb12c462f8bc46d5458da41ee7c92f2e79398db0871bd84e0bde279a898ef37c771b7be3c53b8db781ef9cf DIST rusb-0.9.3.crate 43389 BLAKE2B f9359bddad8963fe86f50aecdd2ca95666de49799fa79b656e5f406f0c8262d8478470b44bcd79247a80674f78a7d19f1bb6770ea247c7d28980efe6b369dfef SHA512 fb2125e0a8bbab9b1324b3b5aaa0ccdc3254ffb5adfee1629ae3958d76d50b79a47a02f9ade77e986d9478e66c53bb956b2b08c3fc0efd5c5b488bcb8ecfaa42 diff --git a/games-emulation/rmg/files/rmg-0.5.6-parallel-rdp-standalone-musl.patch b/games-emulation/rmg/files/rmg-0.5.6-parallel-rdp-standalone-musl.patch deleted file mode 100644 index 951ed61a4b7a..000000000000 --- a/games-emulation/rmg/files/rmg-0.5.6-parallel-rdp-standalone-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/Themaister/Granite/pull/129 - -From 9e78ed6c4ec494d29a9341d127cf3131a2e22722 Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Mon, 22 Jan 2024 08:03:46 -0800 -Subject: [PATCH] util: fix the musl build - -samu: job failed with status 1: /usr/lib/ccache/bin/c++ -I/tmp/Granite/util -I/tmp/Granite/application/global -std=gnu++14 -Wshadow -Wall -Wextra -Wno-comment -Wno-missing-field-initializers -Wno-empty-body -fno-omit-frame-pointer -msse3 -ffast-math -MD -MT util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o -MF util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o.d -o util/CMakeFiles/granite-util.dir/aligned_alloc.cpp.o -c /tmp/Granite/util/aligned_alloc.cpp -/tmp/Granite/util/aligned_alloc.cpp: In function 'void* Util::memalign_alloc(size_t, size_t)': -/tmp/Granite/util/aligned_alloc.cpp:47:5: error: 'uintptr_t' was not declared in this scope - 47 | uintptr_t addr = 0; - | ^~~~~~~~~ -/tmp/Granite/util/aligned_alloc.cpp:27:1: note: 'uintptr_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? - 26 | #include <string.h> - +++ |+#include <cstdint> - 27 | #ifdef _WIN32 -/tmp/Granite/util/aligned_alloc.cpp:53:5: error: 'addr' was not declared in this scope - 53 | addr = ((uintptr_t)ptr + sizeof(uintptr_t) + boundary) & ~(boundary - 1); - | ^~~~ -/tmp/Granite/util/aligned_alloc.cpp:53:24: error: expected ')' before 'ptr' - 53 | addr = ((uintptr_t)ptr + sizeof(uintptr_t) + boundary) & ~(boundary - 1); - | ~ ^~~ - | ) -samu: subcommand failed ---- - util/aligned_alloc.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/util/aligned_alloc.cpp b/util/aligned_alloc.cpp -index 674aeb3c0..9f5900eca 100644 ---- a/Source/3rdParty/mupen64plus-video-parallel/util/aligned_alloc.cpp -+++ b/Source/3rdParty/mupen64plus-video-parallel/util/aligned_alloc.cpp -@@ -21,6 +21,7 @@ - */ - - #include "aligned_alloc.hpp" -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #ifdef _WIN32 diff --git a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-core-sdl-pkgconfig.patch b/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-core-sdl-pkgconfig.patch deleted file mode 100644 index 5b4fa24ce481..000000000000 --- a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-core-sdl-pkgconfig.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://github.com/mupen64plus/mupen64plus-core/pull/1093 -https://github.com/mupen64plus/mupen64plus-core/commit/966a5df3165afede21204610c396dba1ed8a5bf3 -https://github.com/mupen64plus/mupen64plus-core/commit/b007759b9ed9d1473c732b4f3abcd9257165c65c -https://github.com/Rosalie241/RMG/commit/4cd4f4c6ea37c82cdda6b0a57e79af1b71df17fe - -From: orbea <[email protected]> -Date: Mon, 21 Oct 2024 09:10:57 -0700 -Subject: [PATCH 3/3] build: drop SDL1 support - -SDL1 is unmaintained upstream and using it only leads to a degraded -experience. Especially when it recives far less testing. - -build: use pkg-config for SDL2 - -SDL2 hasn't required suing sdl2-config in a long time and using -pkg-config can have better results for distros. ---- - projects/unix/Makefile | 28 ++++++++++------------------ - 1 file changed, 10 insertions(+), 18 deletions(-) - ---- a/Source/3rdParty/mupen64plus-core/projects/unix/Makefile -+++ b/Source/3rdParty/mupen64plus-core/projects/unix/Makefile -@@ -351,26 +351,18 @@ endif - - # test for presence of SDL - ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined) -- SDL_CONFIG = $(CROSS_COMPILE)sdl2-config -- ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),) -- SDL_CONFIG = $(CROSS_COMPILE)sdl-config -- ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),) -- $(error No SDL development libraries found!) -- else -- ifeq ($(NETPLAY), 1) -- SDL_LDLIBS += -lSDL_net -- endif -- # SDL1 doesn't support vulkan -- VULKAN = 0 -- $(warning Using SDL 1.2 libraries) -- endif -- else -- ifeq ($(NETPLAY), 1) -- SDL_LDLIBS += -lSDL2_net -+ ifeq ($(shell $(PKG_CONFIG) --modversion sdl2 2>/dev/null),) -+ $(error No SDL2 development libraries found!) -+ endif -+ ifeq ($(NETPLAY), 1) -+ ifeq ($(shell $(PKG_CONFIG) --modversion SDL2_net 2>/dev/null),) -+ $(error No SDL2_net development libraries found!) - endif -+ SDL_CFLAGS += $(shell $(PKG_CONFIG) --cflags SDL2_net) -+ SDL_LDLIBS += $(shell $(PKG_CONFIG) --libs SDL2_net) - endif -- SDL_CFLAGS += $(shell $(SDL_CONFIG) --cflags) -- SDL_LDLIBS += $(shell $(SDL_CONFIG) --libs) -+ SDL_CFLAGS += $(shell $(PKG_CONFIG) --cflags sdl2) -+ SDL_LDLIBS += $(shell $(PKG_CONFIG) --libs sdl2) - endif - CFLAGS += $(SDL_CFLAGS) - LDLIBS += $(SDL_LDLIBS) diff --git a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-input-raphnetraw-pkgconfig.patch b/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-input-raphnetraw-pkgconfig.patch deleted file mode 100644 index 0e179046bf40..000000000000 --- a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-input-raphnetraw-pkgconfig.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/941889 -https://github.com/raphnet/mupen64plus-input-raphnetraw/pull/17 -https://github.com/Rosalie241/RMG/pull/296 -https://github.com/Rosalie241/RMG/pull/297 -https://github.com/Rosalie241/RMG/commit/f6b73b86c6625fa5a268b74b1e36114a5bdd535c -https://github.com/Rosalie241/RMG/commit/69c24b9131909c338b03c48438744b253501146a - -From e8ec98eb7e7ee4b769232ce143af6c6f9cf29bc6 Mon Sep 17 00:00:00 2001 -From: orbea <[email protected]> -Date: Sun, 20 Oct 2024 08:59:56 -0700 -Subject: [PATCH 1/2] 3rdParty: don't hard-code pkg-config in - mupen64plus-input-raphnetraw (#296) 3rdParty: improve the hidapi check in - mupen64plus-input-raphnetraw (#297) - ---- - .../projects/unix/Makefile | 22 ++++++++++--------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix/Makefile b/Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix/Makefile -index a2571378..18dcaf19 100644 ---- a/Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix/Makefile -+++ b/Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix/Makefile -@@ -141,6 +141,14 @@ ifeq ($(OS), OSX) - endif - endif - -+# test for essential build dependencies -+ifeq ($(origin PKG_CONFIG), undefined) -+ PKG_CONFIG = $(CROSS_COMPILE)pkg-config -+ ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) -+ $(error $(PKG_CONFIG) not found) -+ endif -+endif -+ - ifeq ($(OS), LINUX) - HIDAPI_NAME=hidapi-hidraw - else -@@ -149,17 +157,11 @@ endif - - # test for presence of HIDLIB - ifeq ($(origin HID_CFLAGS) $(origin HID_LDLIBS), undefined undefined) -- HIDAPI_CONFIG = $(CROSS_COMPILE)pkg-config $(HIDAPI_NAME) -- ifeq ($(shell which $(HIDAPI_CONFIG) 2>/dev/null),) -- HIDAPI_CONFIG = $(CROSS_COMPILE)pkg-config $(HIDAPI_NAME) -- ifeq ($(shell which $(HIDAPI_CONFIG) 2>/dev/null),) -- $(error No HIDAPI development libraries found!) -- else -- $(warning Using HIDAPI libraries) -- endif -+ ifeq ($(shell $(PKG_CONFIG) --modversion $(HIDAPI_NAME) 2>/dev/null),) -+ $(error No HIDAPI development libraries found!) - endif -- HID_CFLAGS += $(shell $(HIDAPI_CONFIG) --cflags) -- HID_LDLIBS += $(shell $(HIDAPI_CONFIG) --libs) -+ HID_CFLAGS = $(shell $(PKG_CONFIG) --cflags $(HIDAPI_NAME)) -+ HID_LDLIBS = $(shell $(PKG_CONFIG) --libs $(HIDAPI_NAME)) - endif - CFLAGS += $(HID_CFLAGS) - LDLIBS += $(HID_LDLIBS) diff --git a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-video-GLideN64-strict-aliasing.patch b/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-video-GLideN64-strict-aliasing.patch deleted file mode 100644 index 4b8686a69021..000000000000 --- a/games-emulation/rmg/files/rmg-0.6.6-mupen64plus-video-GLideN64-strict-aliasing.patch +++ /dev/null @@ -1,207 +0,0 @@ -https://github.com/gonetz/GLideN64/issues/2877 -https://github.com/gonetz/GLideN64/pull/2884 -https://github.com/gonetz/GLideN64/commit/a1320da566c03503ea755447458bb2b79a610cb5 -https://github.com/Rosalie241/RMG/commit/e68483fce2a977c07fee38e1d8d8f8dc22bb6072 - -From a1320da566c03503ea755447458bb2b79a610cb5 Mon Sep 17 00:00:00 2001 -From: Sergey Lipskiy <[email protected]> -Date: Sat, 19 Oct 2024 16:18:29 +0700 -Subject: [PATCH] Fix -Wstrict-aliasing warnings - ---- - Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp | 56 ++++++++++++++++++++++++------------------------ - 1 file changed, 28 insertions(+), 28 deletions(-) - -diff --git a/Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp b/Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp -index 4739ec31c..22edf608d 100644 ---- a/Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp -+++ b/Source/3rdParty/mupen64plus-video-GLideN64/src/Textures.cpp -@@ -52,9 +52,9 @@ u32 GetCI4IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette) - const u8 color4B = Get4BitPaletteColor(offset, x, i); - - if (x & 1) -- return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF)); - else -- return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI4IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) -@@ -62,9 +62,9 @@ u32 GetCI4IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - const u8 color4B = Get4BitPaletteColor(offset, x, i); - - if (x & 1) -- return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF)); - else -- return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI4RGBA_RGBA5551(u16 offset, u16 x, u16 i, u8 palette) -@@ -72,9 +72,9 @@ u32 GetCI4RGBA_RGBA5551(u16 offset, u16 x, u16 i, u8 palette) - const u8 color4B = Get4BitPaletteColor(offset, x, i); - - if (x & 1) -- return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF)); - else -- return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI4RGBA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) -@@ -82,9 +82,9 @@ u32 GetCI4RGBA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - const u8 color4B = Get4BitPaletteColor(offset, x, i); - - if (x & 1) -- return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B & 0x0F)) & 0x1FF] & 0xFFFF)); - else -- return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + (palette << 4) + (color4B >> 4)) & 0x1FF] & 0xFFFF)); - } - - u32 GetIA31_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) -@@ -120,25 +120,25 @@ inline u8 Get8BitPaletteColor(u16 offset, u16 x, u16 i) - u32 GetCI8IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette) - { - const u8 color = Get8BitPaletteColor(offset, x, i); -- return IA88_RGBA4444(*(u16*)&TMEM[(0x100 + color) & 0x1FF]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI8IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - { - const u8 color = Get8BitPaletteColor(offset, x, i); -- return IA88_RGBA8888(*(u16*)&TMEM[(0x100 + color) & 0x1FF]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI8RGBA_RGBA5551(u16 offset, u16 x, u16 i, u8 palette) - { - const u8 color = Get8BitPaletteColor(offset, x, i); -- return RGBA5551_RGBA5551(*(u16*)&TMEM[(0x100 + color) & 0x1FF]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF)); - } - - u32 GetCI8RGBA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - { - const u8 color = Get8BitPaletteColor(offset, x, i); -- return RGBA5551_RGBA8888(*(u16*)&TMEM[(0x100 + color) & 0x1FF]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[(0x100 + color) & 0x1FF] & 0xFFFF)); - } - - u32 GetIA44_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) -@@ -193,7 +193,7 @@ u32 GetI16_RGBA4444(u16 offset, u16 x, u16 i, u8 palette) - u32 GetCI16IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - { - const u16 tex = Get16BitColor(offset, x, i); -- const u16 col = (*(u16*)&TMEM[0x100 + (tex & 0xFF)]); -+ const u16 col = (static_cast<u16>(TMEM[0x100 + (tex & 0xFF)] & 0xFFFF)); - const u16 c = col >> 8; - const u16 a = col & 0xFF; - return (a << 24) | (c << 16) | (c << 8) | c; -@@ -202,7 +202,7 @@ u32 GetCI16IA_RGBA8888(u16 offset, u16 x, u16 i, u8 palette) - u32 GetCI16IA_RGBA4444(u16 offset, u16 x, u16 i, u8 palette) - { - const u16 tex = Get16BitColor(offset, x, i); -- const u16 col = (*(u16*)&TMEM[0x100 + (tex & 0xFF)]); -+ const u16 col = (static_cast<u16>(TMEM[0x100 + (tex & 0xFF)] & 0xFFFF)); - const u16 c = col >> 12; - const u16 a = col & 0x0F; - return (a << 12) | (c << 8) | (c << 4) | c; -@@ -303,9 +303,9 @@ u32 GetCI4IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette) - u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)]; - - if (x & 1) -- return IA88_RGBA4444(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF)); - else -- return IA88_RGBA4444(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF)); - } - - u32 GetCI4IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) -@@ -313,9 +313,9 @@ u32 GetCI4IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)]; - - if (x & 1) -- return IA88_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF)); - else -- return IA88_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF)); - } - - u32 GetCI4RGBA_RGBA5551_BG(u64 *src, u16 x, u16 i, u8 palette) -@@ -323,9 +323,9 @@ u32 GetCI4RGBA_RGBA5551_BG(u64 *src, u16 x, u16 i, u8 palette) - u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)]; - - if (x & 1) -- return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF)); - else -- return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF)); - } - - u32 GetCI4RGBA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) -@@ -333,9 +333,9 @@ u32 GetCI4RGBA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)]; - - if (x & 1) -- return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B & 0x0F)]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B & 0x0F)] & 0xFFFF)); - else -- return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + (palette << 4) + (color4B >> 4)]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + (palette << 4) + (color4B >> 4)] & 0xFFFF)); - } - - u32 GetIA31_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) -@@ -368,22 +368,22 @@ u32 GetI4_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette) - - u32 GetCI8IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette) - { -- return IA88_RGBA4444(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]); -+ return IA88_RGBA4444(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF)); - } - - u32 GetCI8IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - { -- return IA88_RGBA8888(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]); -+ return IA88_RGBA8888(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF)); - } - - u32 GetCI8RGBA_RGBA5551_BG(u64 *src, u16 x, u16 i, u8 palette) - { -- return RGBA5551_RGBA5551(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]); -+ return RGBA5551_RGBA5551(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF)); - } - - u32 GetCI8RGBA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - { -- return RGBA5551_RGBA8888(*(u16*)&TMEM[256 + ((u8*)src)[x ^ (i << 1)]]); -+ return RGBA5551_RGBA8888(static_cast<u16>(TMEM[256 + ((u8*)src)[x ^ (i << 1)]] & 0xFFFF)); - } - - u32 GetIA44_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) -@@ -429,7 +429,7 @@ u32 GetI16_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette) - u32 GetCI16IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - { - const u16 tex = ((u16*)src)[x^i]; -- const u16 col = (*(u16*)&TMEM[256 + (tex & 0xFF)]); -+ const u16 col = (static_cast<u16>(TMEM[256 + (tex & 0xFF)] & 0xFFFF)); - const u16 c = col >> 8; - const u16 a = col & 0xFF; - return (a << 24) | (c << 16) | (c << 8) | c; -@@ -438,7 +438,7 @@ u32 GetCI16IA_RGBA8888_BG(u64 *src, u16 x, u16 i, u8 palette) - u32 GetCI16IA_RGBA4444_BG(u64 *src, u16 x, u16 i, u8 palette) - { - const u16 tex = ((u16*)src)[x^i]; -- const u16 col = (*(u16*)&TMEM[256 + (tex & 0xFF)]); -+ const u16 col = (static_cast<u16>(TMEM[256 + (tex & 0xFF)] & 0xFFFF)); - const u16 c = col >> 12; - const u16 a = col & 0x0F; - return (a << 12) | (c << 8) | (c << 4) | c; diff --git a/games-emulation/rmg/rmg-0.6.6-r2.ebuild b/games-emulation/rmg/rmg-0.6.6-r2.ebuild deleted file mode 100644 index a4725fab7f32..000000000000 --- a/games-emulation/rmg/rmg-0.6.6-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CARGO_OPTIONAL=1 - -CRATES=" - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] -" - -inherit cargo cmake toolchain-funcs xdg - -MY_PN="${PN^^}" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Rosalie's Mupen GUI" -HOMEPAGE="https://github.com/Rosalie241/RMG"; -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Rosalie241/${MY_PN}.git"; -else - SRC_URI=" - https://github.com//Rosalie241/${MY_PN}/archive/v${PV}/${MY_P}.tar.gz \ - -> ${P}.tar.gz - rust-plugin? ( ${CARGO_CRATE_URIS} ) - " - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64" -fi - -LICENSE=" - BSD-2 CC0-1.0 GPL-2 GPL-3 MIT ZLIB public-domain - angrylion-plugin? ( XMAME ) - rust-plugin? ( ISC Unicode-DFS-2016 ) -" -SLOT="0" -IUSE="angrylion-plugin discord dynarec rust-plugin" - -DEPEND=" - dev-libs/hidapi - dev-qt/qtbase:6[gui,opengl,vulkan,widgets] - dev-qt/qtsvg:6 - media-libs/freetype - media-libs/libpng:= - media-libs/libsamplerate - media-libs/libsdl2[haptic,joystick,opengl,sound,vulkan] - media-libs/speexdsp - sys-libs/zlib[minizip(+)] - virtual/opengl - rust-plugin? ( dev-libs/libusb:1 ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - dynarec? ( dev-lang/nasm ) - rust-plugin? ( ${RUST_DEPEND} ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.6-parallel-rdp-standalone-musl.patch - # Use pkg-config(1) for SDL2 and don't depend on which(1) - "${FILESDIR}"/${P}-mupen64plus-core-sdl-pkgconfig.patch - # https://bugs.gentoo.org/941889 - "${FILESDIR}"/${P}-mupen64plus-input-raphnetraw-pkgconfig.patch - # https://github.com/gonetz/GLideN64/issues/2877 - "${FILESDIR}"/${P}-mupen64plus-video-GLideN64-strict-aliasing.patch -) - -pkg_setup() { - QA_FLAGS_IGNORED="/usr/$(get_libdir)/RMG/Plugin/Input/libmupen64plus_input_gca.so" - use rust-plugin && rust_pkg_setup -} - -src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack - if use rust-plugin; then - S="${S}"/Source/3rdParty/mupen64plus-input-gca \ - cargo_live_src_unpack - fi - else - if use rust-plugin; then - cargo_src_unpack - else - default - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Don't install unused 3rdParty code - rm -r "${S}"/Source/3rdParty/fmt || die - - # Don't install XMAME licensed code - if ! use angrylion-plugin; then - rm -r "${S}"/Source/3rdParty/mupen64plus-video-angrylion-plus || die - fi - - # Don't install pre-compiled binaries - rm -r "${S}"/Source/3rdParty/vosk-api || die - - # Enable verbose make(1) output - sed -e 's/CC=/V=1 CC=/' -i "${S}"/Source/3rdParty/CMakeLists.txt || die -} - -src_configure() { - export PKG_CONFIG="$(tc-getPKG_CONFIG)" - export PKG_CONFIG_ALLOW_CROSS=1 - - local mycmakeargs=( - -DAPPIMAGE_UPDATER=OFF - -DDISCORD_RPC=$(usex discord) - -DNO_ASM=$(usex dynarec OFF ON) - -DNO_RUST=$(usex rust-plugin OFF ON) - -DPORTABLE_INSTALL=OFF - -DUPDATER=OFF - -DUSE_ANGRYLION=$(usex angrylion-plugin) - -DUSE_CCACHE=OFF - -DUSE_LIBFMT=OFF # Use std::format - -DUSE_LTO=OFF - -DVRU=OFF # Precompiled binaries - ) - - cmake_src_configure -}
