[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/files/, games-emulation/desmume/
commit: 9bf0d9a9e6c1c4f4d56b731b77dabc728f0889c8
Author: Alexey Sokolov asokolov org>
AuthorDate: Sat Sep 18 23:48:09 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 19 00:38:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0d9a9
games-emulation/desmume: fix build with clang
Closes: https://bugs.gentoo.org/739144
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/22331
Signed-off-by: Ionen Wolkens gentoo.org>
.../desmume/desmume-0.9.11_p20210409-r1.ebuild| 1 +
.../desmume/files/desmume-0.9.11_p20210409-clang.patch| 15 +++
2 files changed, 16 insertions(+)
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
index c3a84760618..9cc9dd36624 100644
--- a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
@@ -36,6 +36,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-fix-gtk-cliopts.patch
"${FILESDIR}"/${P}-openal-automagic.patch
+ "${FILESDIR}"/${P}-clang.patch
)
DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
new file mode 100644
index 000..e80cebced38
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
@@ -0,0 +1,15 @@
+Fix build with clang https://bugs.gentoo.org/739144
+
+--- a/desmume/src/texcache.cpp
b/desmume/src/texcache.cpp
+@@ -1165,8 +1165,8 @@ void NDSTextureUnpack4x4(const size_t sr
+
+ for (size_t y = 0, d = 0; y < yTmpSize; y++)
+ {
+- u32 tmpPos[4]={(y<<2)*sizeX,((y<<2)+1)*sizeX,
+- ((y<<2)+2)*sizeX,((y<<2)+3)*sizeX};
++ u32 tmpPos[4]={u32(y<<2)*sizeX,u32((y<<2)+1)*sizeX,
++ u32((y<<2)+2)*sizeX,u32((y<<2)+3)*sizeX};
+ for (size_t x = 0; x < xTmpSize; x++, d++)
+ {
+ if (d >= limit)
[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/files/, games-emulation/desmume/
commit: a7478e660bb64d23fb8790cd93567f898ff0d314
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jun 1 11:59:05 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 2 02:22:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7478e66
games-emulation/desmume: add 0.9.11_p20210409 snapshot
Upstream labels their stable 0.9.11 release as '(do not use)'
and is missing 6 years worth of changes, they instead suggest
to use current git autobuilds.
Current hasn't changed in some time and should be a fair
snapshot (not that it isn't without some issues, included patch
to fix cli option issues with gtk+:3 port).
Removes gtk+:2 and migrates to meson / gtk+:3 / libsdl2.
USE=gui enabled by default because the cli version is very
limited and more useful for debugging.
Closes: https://bugs.gentoo.org/701138
Closes: https://github.com/gentoo/gentoo/pull/20947
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/desmume/Manifest | 1 +
.../desmume/desmume-0.9.11_p20210409.ebuild| 50
.../desmume-0.9.11_p20210409-fix-gtk-cliopts.patch | 91 ++
games-emulation/desmume/metadata.xml | 5 ++
4 files changed, 147 insertions(+)
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index bb91d3bfd1d..a715a37faf4 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1 +1,2 @@
DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B
31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01
SHA512
160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
+DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B
f8e58200357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8
SHA512
1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
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 000..752de42b7cb
--- /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_p20210409-fix-gtk-cliopts.patch
b/games-emulation/desmume/files/desmume-0.9.11_p20210409-fix-gtk-cliopts.patch
new file mode 100644
index 000..f773385748a
--- /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;
+-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/files/, games-emulation/desmume/
commit: f8c5ab82437990540303065670b04fa21b71df82
Author: Peter Levine gmail com>
AuthorDate: Sun Mar 25 06:16:42 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Apr 4 21:37:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c5ab82
games-emulation/desmume: Fix building with GCC-7
Closes: https://bugs.gentoo.org/646352
Closes: https://github.com/gentoo/gentoo/pull/7606
Package-Manager: Portage-2.3.16, Repoman-2.3.6
games-emulation/desmume/desmume-0.9.11-r1.ebuild| 3 ++-
.../desmume/files/desmume-0.9.11-gcc7.patch | 21 +
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
index cddcc940a31..d1546468ae8 100644
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,4 +31,5 @@ DOCS=( AUTHORS ChangeLog README README.LIN )
PATCHES=(
"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
"${FILESDIR}/${P}-gcc6.patch"
+ "${FILESDIR}/${P}-gcc7.patch"
)
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
new file mode 100644
index 000..8b8a67f2291
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
@@ -0,0 +1,21 @@
+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 +
+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 (, src, MB_CUR_MAX, );
+ if (bytes > 0) {
+ *dst = (ucs2_t)tempChar;
