From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- games-emulation/desmume/Manifest | 10 +-- games-emulation/desmume/desmume-0.9.11-r2.ebuild | 37 --------- .../desmume/desmume-0.9.11_p20210409.ebuild | 50 ++++++++++++ ...mume-0.9.11-fix-pointer-conversion-warning.diff | 11 --- .../desmume/files/desmume-0.9.11-gcc6.patch | 47 ----------- .../desmume/files/desmume-0.9.11-gcc7.patch | 21 ----- .../desmume-0.9.11_p20210409-fix-gtk-cliopts.patch | 91 ++++++++++++++++++++++ games-emulation/desmume/metadata.xml | 6 ++ 8 files changed, 151 insertions(+), 122 deletions(-) delete mode 100644 games-emulation/desmume/desmume-0.9.11-r2.ebuild create mode 100644 games-emulation/desmume/desmume-0.9.11_p20210409.ebuild delete mode 100644 games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff delete mode 100644 games-emulation/desmume/files/desmume-0.9.11-gcc6.patch delete mode 100644 games-emulation/desmume/files/desmume-0.9.11-gcc7.patch create mode 100644 games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch (limited to 'games-emulation/desmume') diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest index 146a19854425..2fc5c0e9b415 100644 --- a/games-emulation/desmume/Manifest +++ b/games-emulation/desmume/Manifest @@ -1,6 +1,4 @@ -AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b3669166f1ee04d26e6538a392e494d356b2eeabd43ac69fe9489ddeda146054ab5d1f821b3a52719d58ae493ca870f46461eacaab26ffb9eba1 SHA512 f7d5f4ac4d96f244aa6ee81a90f64e754aceebf075f1c4ff84dde2d1d2beaf617631569c5aa9a8afb40ae4499067e2233ba00a4b9d606a9608915714766d0bff -AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd -AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f -DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c -EBUILD desmume-0.9.11-r2.ebuild 778 BLAKE2B 43c3a3e4e773015deb7298a27c89afd385ee51f17609aae9690e429e70d81ab4db1123184f42fa0136fd6c6a1502e7e6f89a2f0067d0ab329d19820bc57c17ad SHA512 d8cedd2e9fc22ac1b57b3537387ea500055fc70bf07fc0e347af93a686f0867e9921a74dc44a3c01c60ebe344f8693ef65cdd2a74592ec173b8444c7f684e6b5 -MISC metadata.xml 330 BLAKE2B eb079764905cfeea2e4851dcf8b3cc66f0be8181abe0a0e103bfcfc1da46231d257c60946d165f87d231446f18cfa1ee53e0593e2f7788f60d587da8684e0936 SHA512 169091ef557b69e2f43fd21e696ce662d3c65a1b22ff6b9b7f3e452a8d065f20c2904b0e5f85058d03ca93a73c1acb4ae0f3426b9f3727486897847ff29ac8ba +AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07 +DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B f8e582005555357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8 SHA512 1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348 +EBUILD desmume-0.9.11_p20210409.ebuild 1090 BLAKE2B 932b88d648771a739f98d3d3b82acb74a76dc4385392872c61cf1493d3a71341d8e084ffe7b05263e8caf7db89fa19ab0ab2364a9bc980c408605b46eceab5c4 SHA512 6f06b5e559298d6feaf74a19d12e825f03882fb137fd5280653df0b0fa5f4103e83f8e9bcb47232b0ca26813768eacfc140788871cda3bf71898d2f17651d185 +MISC metadata.xml 633 BLAKE2B 052f681fd7ff8b6a3d4dd64e5a9fea8fd5db7e782864a913cd382c1da3d984e09033f3d272a4bb966aab14f3d9026b673a730e03565b56c1a68a03a7391ad8c2 SHA512 a41bf6b90e75336de2819de1bf3be17e40a38e4d13ee782b8a6c951b80bedab7f0739c0c11977a5587aa906ba7da72ce8024b5d4b63338af53266a59ae6f0fa7 diff --git a/games-emulation/desmume/desmume-0.9.11-r2.ebuild b/games-emulation/desmume/desmume-0.9.11-r2.ebuild deleted file mode 100644 index 964f794fb7f2..000000000000 --- a/games-emulation/desmume/desmume-0.9.11-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg - -DESCRIPTION="Nintendo DS emulator" -HOMEPAGE="http://desmume.org/" -SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/zziplib - gnome-base/libglade - media-libs/libsdl[joystick,opengl,video] - sys-libs/zlib - virtual/opengl - x11-libs/agg - >=x11-libs/gtk+-2.8.0:2" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog README README.LIN ) - -# fix QA compiler warning, see -# https://sourceforge.net/p/desmume/patches/172/ -PATCHES=( - "${FILESDIR}/${P}-fix-pointer-conversion-warning.diff" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-gcc7.patch" -) diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild new file mode 100644 index 000000000000..752de42b7cbf --- /dev/null +++ b/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +MY_COMMIT="e8f619c44a23ebba06be1fb4442483d481477b81" + +DESCRIPTION="Nintendo DS emulator" +HOMEPAGE="https://desmume.org/" +SRC_URI="https://github.com/TASVideos/desmume/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gdb +gui openal wifi" + +RDEPEND=" + dev-libs/glib:2 + media-libs/alsa-lib + media-libs/libsdl2[X,opengl,sound,video] + media-libs/libsoundtouch:= + net-libs/libpcap + sys-libs/zlib:= + virtual/opengl + x11-libs/agg + x11-libs/libX11 + gui? ( x11-libs/gtk+:3 ) + openal? ( media-libs/openal )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${P}-fix-gtk-cliopts.patch +) +DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} ) + +src_configure() { + local EMESON_SOURCE="${S}/${PN}/src/frontend/posix" + local emesonargs=( + $(meson_use gdb gdb-stub) + $(meson_use gui frontend-gtk) + $(meson_use openal) + $(meson_use wifi) + ) + meson_src_configure +} diff --git a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff deleted file mode 100644 index 8975085133ff..000000000000 --- a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/path.h 2015-02-14 16:05:26.000000000 +0100 -+++ b/src/path.h 2016-07-11 12:09:59.591987169 +0200 -@@ -375,7 +375,7 @@ - else if (strchr(strftimeArgs, *p)) - { - char tmp[MAX_PATH]; -- char format[] = { '%', *p, NULL }; -+ char format[] = { '%', *p, '\0' }; - strftime(tmp, MAX_PATH, format, time_struct); - file.append(tmp); - } diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch deleted file mode 100644 index 761ccef045cf..000000000000 --- a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/wifi.cpp -+++ b/src/wifi.cpp -@@ -314,9 +314,9 @@ - - #if (WIFI_LOGGING_LEVEL >= 1) - #if WIFI_LOG_USE_LOGC -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); - #else -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); - #endif - #else - #define WIFI_LOG(level, ...) {} ---- a/src/MMU_timing.h -+++ b/src/MMU_timing.h -@@ -155,8 +155,8 @@ - enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; - enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; - enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; -- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; -- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; -+ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; -+ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; - enum { WORDSIZE = sizeof(u32) }; - enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; - enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; ---- a/src/ctrlssdl.cpp -+++ b/src/ctrlssdl.cpp -@@ -200,7 +200,7 @@ - break; - case SDL_JOYAXISMOTION: - /* Dead zone of 50% */ -- if( (abs(event.jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) - { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); - if (event.jaxis.value > 0) { -@@ -370,7 +370,7 @@ - Note: button constants have a 1bit offset. */ - case SDL_JOYAXISMOTION: - key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); -- if( (abs(event->jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) - { - if (event->jaxis.value > 0) - key_code |= 1; diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch deleted file mode 100644 index 8b8a67f2291a..000000000000 --- a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch +++ /dev/null @@ -1,21 +0,0 @@ -Bug: https://bugs.gentoo.org/646352 -Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch - -From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Mon, 17 Aug 2015 21:15:04 +0000 -Subject: Fix bug with libfat string handling. - -diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp -index 765d7ae5..b6d7f01f 100644 ---- a/src/utils/libfat/directory.cpp -+++ b/src/utils/libfat/directory.cpp -@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len - int bytes; - size_t count = 0; - -- while (count < len-1 && src != '\0') { -+ while (count < len-1 && *src != '\0') { - bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); - if (bytes > 0) { - *dst = (ucs2_t)tempChar; diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch new file mode 100644 index 000000000000..f773385748af --- /dev/null +++ b/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch @@ -0,0 +1,91 @@ +Fix unusable command line options since GTK+:3 migration. + +https://github.com/TASVideos/desmume/pull/416 +From: Ingo Saitz +Date: Sun, 3 Jan 2021 16:00:38 +0100 +--- a/desmume/src/commandline.cpp ++++ b/desmume/src/commandline.cpp +@@ -41,7 +41,8 @@ + , _load_to_memory(-1) +-, _play_movie_file(0) +-, _record_movie_file(0) +-, _cflash_image(0) +-, _cflash_path(0) +-, _gbaslot_rom(0) ++, nds_file("") ++, play_movie_file("") ++, record_movie_file("") ++, cflash_image("") ++, cflash_path("") ++, gbaslot_rom("") + , _bios_arm9(NULL) +@@ -60,4 +61,4 @@ + , _texture_smooth(-1) +-, _slot1(NULL) +-, _slot1_fat_dir(NULL) ++, slot1("") ++, slot1_fat_dir("") + , _slot1_fat_dir_type(false) +@@ -68,3 +69,3 @@ + #endif +-, _console_type(NULL) ++, console_type("") + , _advanscene_import(NULL) +@@ -360,4 +361,4 @@ + case OPT_SLOT2_CFLASH_IMAGE: cflash_image = optarg; break; +- case OPT_SLOT2_CFLASH_DIR: _cflash_path = optarg; break; +- case OPT_SLOT2_GBAGAME: _gbaslot_rom = optarg; break; ++ case OPT_SLOT2_CFLASH_DIR: cflash_path = optarg; break; ++ case OPT_SLOT2_GBAGAME: gbaslot_rom = optarg; break; + +@@ -520,4 +521,5 @@ + +- if((_cflash_image && _gbaslot_rom) || (_cflash_path && _gbaslot_rom)) { ++ if((cflash_image != "" && gbaslot_rom != "") || (cflash_path != "" && gbaslot_rom != "")) { + printerror("Cannot specify both cflash and gbaslot rom (both occupy SLOT-2)\n"); ++ return false; + } +--- a/desmume/src/commandline.h ++++ b/desmume/src/commandline.h +@@ -88,7 +88,2 @@ + private: +- char* _play_movie_file; +- char* _record_movie_file; +- char* _cflash_image; +- char* _cflash_path; +- char* _gbaslot_rom; + char* _bios_arm9, *_bios_arm7; +@@ -109,5 +104,2 @@ + #endif +- char* _slot1; +- char *_slot1_fat_dir; +- char* _console_type; + char* _advanscene_import; +--- a/desmume/src/frontend/posix/gtk/main.cpp ++++ b/desmume/src/frontend/posix/gtk/main.cpp +@@ -3555,12 +3555,9 @@ + +-static void +-handle_open(GApplication *application, +- GFile **files, +- gint n_files, +- const gchar *hint, ++static gint ++ignore_command_line(GApplication *application, ++ GApplicationCommandLine *command_line, + gpointer user_data) + { +- configured_features *my_config = static_cast(user_data); +- my_config->nds_file = g_file_get_path(files[0]); + common_gtk_main(application, user_data); ++ return 0; + } +@@ -3584,6 +3581,5 @@ + +- // TODO: pass G_APPLICATION_HANDLES_COMMAND_LINE instead. +- GtkApplication *app = gtk_application_new("org.desmume.DeSmuME", G_APPLICATION_HANDLES_OPEN); ++ GtkApplication *app = gtk_application_new("org.desmume.DeSmuME", G_APPLICATION_HANDLES_COMMAND_LINE); + g_signal_connect (app, "activate", G_CALLBACK(common_gtk_main), &my_config); +- g_signal_connect (app, "open", G_CALLBACK(handle_open), &my_config); ++ g_signal_connect (app, "command-line", G_CALLBACK(ignore_command_line), &my_config); + g_action_map_add_action_entries(G_ACTION_MAP(app), diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml index 7b0fa88f32e9..52b0e3d68a46 100644 --- a/games-emulation/desmume/metadata.xml +++ b/games-emulation/desmume/metadata.xml @@ -5,7 +5,13 @@ games@gentoo.org Gentoo Games Project + + Enable support for the remote GDB stub + Use media-libs/openal for microphone input + Enable support for Wi-Fi (experimental and discouraged) + + TASVideos/desmume desmume -- cgit v1.2.3