From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 29 Jun 2021 10:15:54 +0100
Subject: gentoo resync : 29.06.2021

---
 games-emulation/desmume/Manifest                   |  3 +-
 .../desmume/desmume-0.9.11_p20210409-r1.ebuild     | 52 ++++++++++++++++++++++
 .../desmume/desmume-0.9.11_p20210409.ebuild        | 50 ---------------------
 ...desmume-0.9.11_p20210409-openal-automagic.patch | 10 +++++
 4 files changed, 64 insertions(+), 51 deletions(-)
 create mode 100644 games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
 delete mode 100644 games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
 create mode 100644 games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch

(limited to 'games-emulation/desmume')

diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 2fc5c0e9b415..1235ba3b8de9 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,4 +1,5 @@
 AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07
+AUX desmume-0.9.11_p20210409-openal-automagic.patch 315 BLAKE2B cf203d506460deb88b6bc366d993e2376ebb6b2ac6d4e9c1d8eeda3aba0e0ab4ffe994c5855cf58babd2d25f86807289dbe48a37cace30732ecdc47363cdcbba SHA512 5d584a18595584ec8f23b74ceef5e3667d4e91a3b35def7cab715a9325a797f1b457dcff4dc804088aa047be49b0f828a28800a4713929ac4073bdf7a99b3b25
 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
+EBUILD desmume-0.9.11_p20210409-r1.ebuild 1134 BLAKE2B 530c34eb5db5934ec48dc253328c6f19932d07b6438eee17faed79839a6b567e7a0a62159c132e6e2637e58466138672aef9052c34a5472f69e7aa1c61717749 SHA512 3c910c91405227139f3d2b478d957230b64186a50b8f444f2bf07cf0d19049642e4981c1c45e10171c3ba17af4a7cdf1c75f8e7ba6e36aff1553e75ab581b517
 MISC metadata.xml 633 BLAKE2B 052f681fd7ff8b6a3d4dd64e5a9fea8fd5db7e782864a913cd382c1da3d984e09033f3d272a4bb966aab14f3d9026b673a730e03565b56c1a68a03a7391ad8c2 SHA512 a41bf6b90e75336de2819de1bf3be17e40a38e4d13ee782b8a6c951b80bedab7f0739c0c11977a5587aa906ba7da72ce8024b5d4b63338af53266a59ae6f0fa7
diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
new file mode 100644
index 000000000000..c3a847606182
--- /dev/null
+++ b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
@@ -0,0 +1,52 @@
+# 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
+)
+
+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/desmume-0.9.11_p20210409.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
deleted file mode 100644
index 752de42b7cbf..000000000000
--- a/games-emulation/desmume/desmume-0.9.11_p20210409.ebuild
+++ /dev/null
@@ -1,50 +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
-)
-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-openal-automagic.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-openal-automagic.patch
new file mode 100644
index 000000000000..565ea3f5a7b0
--- /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 += [
-- 
cgit v1.2.3