Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/, games-emulation/desmume/files/
Date: Sat, 22 Jan 2022 00:34:24
Message-Id: 1642811556.26f9027af69ec1b6d6107fc7816c889963c61d4b.ionen@gentoo
1 commit: 26f9027af69ec1b6d6107fc7816c889963c61d4b
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 19:04:58 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 22 00:32:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f9027a
7
8 games-emulation/desmume: drop 0.9.11_p20210409-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-emulation/desmume/Manifest | 1 -
13 .../desmume/desmume-0.9.11_p20210409-r1.ebuild | 53 ----------------------
14 .../files/desmume-0.9.11_p20210409-clang.patch | 16 -------
15 3 files changed, 70 deletions(-)
16
17 diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
18 index 924917bf4ae5..1552b4c0f524 100644
19 --- a/games-emulation/desmume/Manifest
20 +++ b/games-emulation/desmume/Manifest
21 @@ -1,2 +1 @@
22 -DIST desmume-0.9.11_p20210409.tar.gz 13157043 BLAKE2B f8e582005555357cb632478ba8d2730e51a5cb8dbbee05d4af138df19a015ced6cff721fb53f87224774aed8287f91a01da5600f5548189fd0e264e5b3037fd8 SHA512 1897b3b35c7e997876ff53a36849a39b85bd49c737dab61f68c376e3cb294486f9edded98924275e8ee91e5b008e9d3814987edaab7306217c17dbc094f69348
23 DIST desmume-0.9.11_p20211119.tar.gz 13266678 BLAKE2B 0af12f9fd7f3448d4f18a61ec65f1a64926f402827bd9eb8af4a06766390dc626940c327e2bb0ff17d4d62eefe1171c4a836e98dbbbc34bf5d4e9e6d886189a0 SHA512 53553771b51741c2c553e47befec1eb90bdaa3c9ff239bdb301054dbaf5c483c768dac440fece797c9756f3c1490ad61da59b3b5728328b7f23aaa5e1de40625
24
25 diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
26 deleted file mode 100644
27 index 9cc9dd366242..000000000000
28 --- a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
29 +++ /dev/null
30 @@ -1,53 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit meson xdg
37 -
38 -MY_COMMIT="e8f619c44a23ebba06be1fb4442483d481477b81"
39 -
40 -DESCRIPTION="Nintendo DS emulator"
41 -HOMEPAGE="https://desmume.org/"
42 -SRC_URI="https://github.com/TASVideos/desmume/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
43 -S="${WORKDIR}/${PN}-${MY_COMMIT}"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE="gdb +gui openal wifi"
49 -
50 -RDEPEND="
51 - dev-libs/glib:2
52 - media-libs/alsa-lib
53 - media-libs/libsdl2[X,opengl,sound,video]
54 - media-libs/libsoundtouch:=
55 - net-libs/libpcap
56 - sys-libs/zlib:=
57 - virtual/opengl
58 - x11-libs/agg
59 - x11-libs/libX11
60 - gui? ( x11-libs/gtk+:3 )
61 - openal? ( media-libs/openal )"
62 -DEPEND="
63 - ${RDEPEND}
64 - x11-base/xorg-proto"
65 -
66 -PATCHES=(
67 - "${FILESDIR}"/${P}-fix-gtk-cliopts.patch
68 - "${FILESDIR}"/${P}-openal-automagic.patch
69 - "${FILESDIR}"/${P}-clang.patch
70 -)
71 -
72 -DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
73 -
74 -src_configure() {
75 - local EMESON_SOURCE="${S}/${PN}/src/frontend/posix"
76 - local emesonargs=(
77 - $(meson_use gdb gdb-stub)
78 - $(meson_use gui frontend-gtk)
79 - $(meson_use openal)
80 - $(meson_use wifi)
81 - )
82 - meson_src_configure
83 -}
84
85 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
86 deleted file mode 100644
87 index 164cb5af4836..000000000000
88 --- a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
89 +++ /dev/null
90 @@ -1,16 +0,0 @@
91 -Fix build with clang https://bugs.gentoo.org/739144
92 -
93 -Fixed upstream in: https://github.com/TASVideos/desmume/commit/92cb90f
94 ---- a/desmume/src/texcache.cpp
95 -+++ b/desmume/src/texcache.cpp
96 -@@ -1165,8 +1165,8 @@ void NDSTextureUnpack4x4(const size_t sr
97 -
98 - for (size_t y = 0, d = 0; y < yTmpSize; y++)
99 - {
100 -- u32 tmpPos[4]={(y<<2)*sizeX,((y<<2)+1)*sizeX,
101 -- ((y<<2)+2)*sizeX,((y<<2)+3)*sizeX};
102 -+ u32 tmpPos[4]={u32(y<<2)*sizeX,u32((y<<2)+1)*sizeX,
103 -+ u32((y<<2)+2)*sizeX,u32((y<<2)+3)*sizeX};
104 - for (size_t x = 0; x < xTmpSize; x++, d++)
105 - {
106 - if (d >= limit)