[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/, games-emulation/desmume/files/
commit: 26f9027af69ec1b6d6107fc7816c889963c61d4b
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jan 21 19:04:58 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jan 22 00:32:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f9027a
games-emulation/desmume: drop 0.9.11_p20210409-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-emulation/desmume/Manifest | 1 -
.../desmume/desmume-0.9.11_p20210409-r1.ebuild | 53 --
.../files/desmume-0.9.11_p20210409-clang.patch | 16 ---
3 files changed, 70 deletions(-)
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 924917bf4ae5..1552b4c0f524 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,2 +1 @@
-DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B
f8e58200357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8
SHA512
1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
DIST desmume-0.9.11_p2029.tar.gz 13266678 BLAKE2B
0af12f9fd7f3448d4f18a61ec65f1a64926f402827bd9eb8af4a06766390dc626940c327e2bb0ff17d4d62eefe1171c4a836e98dbbbc34bf5d4e9e6d886189a0
SHA512
53553771b51741c2c553e47befec1eb90bdaa3c9ff239bdb301054dbaf5c483c768dac440fece797c9756f3c1490ad61da59b3b5728328b7f23aaa5e1de40625
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
deleted file mode 100644
index 9cc9dd366242..
--- a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
- "${FILESDIR}"/${P}-openal-automagic.patch
- "${FILESDIR}"/${P}-clang.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-clang.patch
b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
deleted file mode 100644
index 164cb5af4836..
--- a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with clang https://bugs.gentoo.org/739144
-
-Fixed upstream in: https://github.com/TASVideos/desmume/commit/92cb90f
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/, games-emulation/desmume/files/
commit: ab44d066809c6e8791afbaf828db5b7b846dad9b
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jun 26 03:09:54 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jun 26 03:13:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab44d066
games-emulation/desmume: fix openal automagic
There's a meson option to seemingly enable/disable openal, but in
reality only flips its "required" state and it's used anyway if found.
Signed-off-by: Ionen Wolkens gentoo.org>
11_p20210409.ebuild => desmume-0.9.11_p20210409-r1.ebuild} | 2 ++
.../files/desmume-0.9.11_p20210409-openal-automagic.patch | 10 ++
2 files changed, 12 insertions(+)
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
similarity index 96%
rename from games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
rename to games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
index 752de42b7cb..c3a84760618 100644
--- a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
@@ -35,7 +35,9 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-fix-gtk-cliopts.patch
+ "${FILESDIR}"/${P}-openal-automagic.patch
)
+
DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
src_configure() {
diff --git
a/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
b/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
new file mode 100644
index 000..565ea3f5a7b
--- /dev/null
+++
b/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
@@ -0,0 +1,10 @@
+Option only changes whether the dep is required and doesn't disable it.
+--- a/desmume/src/frontend/posix/meson.build
b/desmume/src/frontend/posix/meson.build
+@@ -176,5 +176,5 @@
+ endif
+
+-if dep_openal.found()
++if dep_openal.found() and get_option('openal')
+ dependencies += dep_openal
+ libdesmume_src += [
[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/, games-emulation/desmume/files/
commit: 0e364884e9412dcd04f341ea0dbf2d4f70c5891b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Oct 31 18:48:41 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Tue Oct 31 18:48:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e364884
games-emulation/desmume: Remove old
Package-Manager: Portage-2.3.13, Repoman-2.3.4
games-emulation/desmume/Manifest | 3 --
games-emulation/desmume/desmume-0.9.10.ebuild | 39 --
games-emulation/desmume/desmume-0.9.11.ebuild | 35 ---
games-emulation/desmume/desmume-0.9.8.ebuild | 35 ---
games-emulation/desmume/desmume-0.9.9.ebuild | 35 ---
.../desmume/files/desmume-fix-function-type.patch | 22
6 files changed, 169 deletions(-)
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 32dd994d9cb..4786ddce82f 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,4 +1 @@
-DIST desmume-0.9.10.tar.gz 4141586 SHA256
8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445 SHA512
a9151f1d8b08ce64a837ae2447221f5c0003286d4c75b9416d5f151627755aafb09a5120c39b8ee39a04b99d9e8c49ac7dcc0ccd083507aab7e4801269468012
WHIRLPOOL
e924adf532db2b10691cb01640f1dbf54045b0dbe6c5daf59c0150a2b254c86cd8d384bc364fdb756168599319a1ef81ce751f09cd5d5e5b79980fb26b9a4e72
DIST desmume-0.9.11.tar.gz 5359305 SHA256
3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 SHA512
160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
WHIRLPOOL
71736765288f4e01424a56a65b17efa090cceeaa30bdf759b0f05638c01546b712762444122bb4531a6b5ad88e2f39ac6013d06702109a0d1ef29559d1f16cde
-DIST desmume-0.9.8.tar.gz 3677290 SHA256
78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01 SHA512
b739292f1327ec83b1afcb1c6db45365cf0977fb571256b637a7c6f1c1e57add5b9c0f34820f020c1788c481cbf15755a034e69f14fbf92e3c31dc01594171dd
WHIRLPOOL
0bd50d135aad85652dc233c69c94607400820682d60d7bc35b0e1366d7b6fee1fac9f7091074c21940a80826b50bccc8f14ba0e3770687b54b4d30323c8cf84d
-DIST desmume-0.9.9.tar.gz 4107513 SHA256
cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754 SHA512
ba5a965102559f048cd57718b4c50e6b2bd39eca4a5990e4cdf068bfa752fccb52d71911ea48da769c5ec18bb740f6b09e6c856ccc78b1e1adf23fd701d1fe31
WHIRLPOOL
055594100216e4ffd046119716e9acc018e7631f96f2be4e830495f88462382180c3955841bfcc3ec494227a606bc820820342907e2b1b2b61a8a65f9b1949b4
diff --git a/games-emulation/desmume/desmume-0.9.10.ebuild
b/games-emulation/desmume/desmume-0.9.10.ebuild
deleted file mode 100644
index e2e63494a33..000
--- a/games-emulation/desmume/desmume-0.9.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit games
-
-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=""
-
-DEPEND=">=x11-libs/gtk+-2.8.0:2
- gnome-base/libglade
- x11-libs/gtkglext
- virtual/opengl
- sys-libs/zlib
- dev-libs/zziplib
- media-libs/libsdl[joystick]
- x11-libs/agg"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/desmume-fix-function-type.patch"
-}
-
-src_configure() {
- egamesconf --datadir=/usr/share
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README README.LIN
- prepgamesdirs
-}
diff --git a/games-emulation/desmume/desmume-0.9.11.ebuild
b/games-emulation/desmume/desmume-0.9.11.ebuild
deleted file mode 100644
index 1a01dc70dd0..000
--- a/games-emulation/desmume/desmume-0.9.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-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=">=x11-libs/gtk+-2.8.0:2
- gnome-base/libglade
- x11-libs/gtkglext
- virtual/opengl
- sys-libs/zlib
- dev-libs/zziplib
- media-libs/libsdl[joystick,opengl,video]
- x11-libs/agg"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- egamesconf --datadir=/usr/share
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog README README.LIN" \
- default
- prepgamesdirs
-}
diff --git a/games-emulation/desmume/desmume-0.9.8.ebuild
b/games-emulation/desmume/desmume-0.9.8.ebuild
deleted file mode 100644
index cd3d936b2b7..000
--- a/games-emulation/desmume/desmume-0.9.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-201
[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/, games-emulation/desmume/files/
commit: 7cfe950605746b9a832efda51bc1562e0ddaf338
Author: Peter-Levine gmail com>
AuthorDate: Sat May 6 18:01:45 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun May 7 07:55:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cfe9506
games-emulation/desmume: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612940
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4558
games-emulation/desmume/desmume-0.9.11-r1.ebuild | 7 +++-
.../desmume/files/desmume-0.9.11-gcc6.patch| 47 ++
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
index d6041d39345..ec05ed16af7 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,4 +28,7 @@ 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" )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
+ "${FILESDIR}/${P}-gcc6.patch"
+)
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
new file mode 100644
index 000..761ccef045c
--- /dev/null
+++ b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
@@ -0,0 +1,47 @@
+--- 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;
[gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/, games-emulation/desmume/files/
commit: 16ab6dc1c21bd6b456b5acbb778fff940dd2cd46
Author: Hanno gentoo org>
AuthorDate: Sat Oct 15 09:04:07 2016 +
Commit: Hanno Boeck gentoo org>
CommitDate: Sat Oct 15 09:04:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ab6dc1
games-emulation/desmume: Various fixes and cleanups
Bumped EAPI to 6.
Removed deprecated games eclass.
Added missing intltool dep (fix #576078).
Fix type conversion compiler warning (patch also sent upstream).
Package-Manager: portage-2.3.2
games-emulation/desmume/desmume-0.9.11-r1.ebuild | 32 ++
...mume-0.9.11-fix-pointer-conversion-warning.diff | 11
2 files changed, 43 insertions(+)
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
new file mode 100644
index ..f31a22b
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Nintendo DS emulator"
+HOMEPAGE="http://desmume.org/";
+SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.8.0:2
+ gnome-base/libglade
+ x11-libs/gtkglext
+ virtual/opengl
+ sys-libs/zlib
+ dev-libs/zziplib
+ media-libs/libsdl[joystick,opengl,video]
+ x11-libs/agg"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool"
+
+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" )
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
new file mode 100644
index ..8975085
--- /dev/null
+++
b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
@@ -0,0 +1,11 @@
+--- a/src/path.h 2015-02-14 16:05:26.0 +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);
+ }
