public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2018-01-13 22:17 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2018-01-13 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9da917d8e4fdf15ddae409534ea7c4bc29e6115c
Author:     Nado <nado <AT> troglodyte <DOT> be>
AuthorDate: Fri Jan 12 22:36:25 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 22:17:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da917d8

games-emulation/vbam: 9999 update to new requirements from upstream

* switch from fdo-mime to xdg-utils
* add missing REQUIRED_USE constraints
* remove gtk port as it is no longer supported by upstream
* remove cairo support for the same reason

Closes: https://bugs.gentoo.org/638300
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6847

 games-emulation/vbam/vbam-9999.ebuild | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 0af06c4e2c8..357c9489310 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils
+inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -18,8 +18,8 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
@@ -28,13 +28,9 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 	virtual/glu
 	virtual/opengl
 	ffmpeg? ( virtual/ffmpeg[-libav] )
-	gtk? ( >=dev-cpp/glibmm-2.4.0:2
-		>=dev-cpp/gtkmm-2.4.0:2.4
-		>=dev-cpp/gtkglextmm-1.2.0 )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
-		cairo? ( x11-libs/cairo )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
@@ -48,15 +44,13 @@ src_prepare() {
 	default
 
 	# fix desktop file QA warnings
-	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
+	edos2unix src/wx/wxvbam.desktop
 }
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
-		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_GTK=$(usex gtk)
 		-DENABLE_LINK=$(usex link)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_NLS=$(usex nls)
@@ -79,28 +73,27 @@ src_install() {
 
 	if use sdl ; then
 		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.1
+		doman src/debian/vbam.6
 	fi
-	use wxwidgets && doman src/debian/wxvbam.1
-	use gtk && doman src/debian/gvbam.1
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
 }
 
 pkg_preinst() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_savelist
 	fi
 }
 
 pkg_postinst() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_cache_update
+		xdg_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_cache_update
+		xdg_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2024-06-16  9:37 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2024-06-16  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9fe2f294f33f40349b63ecfd67402464023ffa9e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:35:16 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:35:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe2f294

games-emulation/vbam: drop 2.1.5

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-emulation/vbam/Manifest          |   1 -
 games-emulation/vbam/vbam-2.1.5.ebuild | 110 ---------------------------------
 2 files changed, 111 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 9e943d8af8db..38cb879a1546 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,3 +1,2 @@
-DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
 DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88
 DIST vbam-2.1.9.tar.gz 3641821 BLAKE2B 83f303741636f0c32d24c58fdd1b93c483ad82da17764ff3a7f1283f649f540452658693bd27febac3a8afc5871ffee6d8fff2e00f62fc23a211602244b64318 SHA512 de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6

diff --git a/games-emulation/vbam/vbam-2.1.5.ebuild b/games-emulation/vbam/vbam-2.1.5.ebuild
deleted file mode 100644
index e5c66f3e0817..000000000000
--- a/games-emulation/vbam/vbam-2.1.5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg cmake
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-
-REQUIRED_USE="
-	ffmpeg? ( wxwidgets )
-	openal? ( wxwidgets )
-	|| ( sdl wxwidgets )
-"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:=
-	media-libs/libsdl2[joystick]
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	link? ( >=media-libs/libsfml-2.0:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		ffmpeg? ( media-video/ffmpeg:= )
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig
-	wxwidgets? ( virtual/imagemagick-tools )
-	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-		-DENABLE_LTO=OFF
-		-DENABLE_ONLINEUPDATES=OFF
-		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
-	)
-
-	if use wxwidgets; then
-		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		xdg_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		xdg_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		xdg_pkg_postrm
-	fi
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2024-06-16  9:37 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2024-06-16  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4fe20ba10f43be2938c934c8922fb536420049f6
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:31:59 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:31:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe20ba1

games-emulation/vbam: add 2.1.9

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-emulation/vbam/Manifest          |   1 +
 games-emulation/vbam/vbam-2.1.9.ebuild | 115 +++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7002ed329ec3..9e943d8af8db 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,2 +1,3 @@
 DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
 DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88
+DIST vbam-2.1.9.tar.gz 3641821 BLAKE2B 83f303741636f0c32d24c58fdd1b93c483ad82da17764ff3a7f1283f649f540452658693bd27febac3a8afc5871ffee6d8fff2e00f62fc23a211602244b64318 SHA512 de3d9256e18eec7cad785871d002fd6defa148cfe80001c4ff00c8dd04ffec53a721bd280a590c7ef5213a82125f190966c7769250a6aa660c477707ba5539d6

diff --git a/games-emulation/vbam/vbam-2.1.9.ebuild b/games-emulation/vbam/vbam-2.1.9.ebuild
new file mode 100644
index 000000000000..ab5f40c41f2f
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.1.9.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit flag-o-matic wxwidgets xdg cmake
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls +sdl wxwidgets"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:=
+	media-libs/libsdl2[joystick]
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
+		media-libs/openal
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i 's/ -mtune=generic//g' CMakeLists.txt || die
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/926080
+	# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1260
+	filter-lto
+
+	use wxwidgets && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		xdg_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		xdg_pkg_postrm
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2024-04-18 16:56 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2024-04-18 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     2a52ce00f4f2be7e623f89cba01799f75e8fed9a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 16:55:20 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 16:55:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a52ce00

games-emulation/vbam: support wxGTK 3.2

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-emulation/vbam/vbam-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index e5c66f3e0817..cae4118aaf8e 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 inherit wxwidgets xdg cmake
 
 if [[ ${PV} == 9999 ]]; then


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2024-03-22  5:33 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2024-03-22  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     85fc56aec46c02a6c5ea1d46f940398e12022e34
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 02:57:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 05:31:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fc56ae

games-emulation/vbam: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/926080
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/vbam/vbam-2.1.7.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.1.7.ebuild b/games-emulation/vbam/vbam-2.1.7.ebuild
index c18685667d58..8208b7e893c4 100644
--- a/games-emulation/vbam/vbam-2.1.7.ebuild
+++ b/games-emulation/vbam/vbam-2.1.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
-inherit wxwidgets xdg cmake
+inherit flag-o-matic wxwidgets xdg cmake
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -61,6 +61,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/926080
+	# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1260
+	filter-lto
+
 	use wxwidgets && setup-wxwidgets
 
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2023-11-24 12:59 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2023-11-24 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     2e808adf1da655e9bac4dca1772cd38ad109f152
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 12:59:29 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 12:59:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e808adf

games-emulation/vbam: add 2.1.7

Closes: https://bugs.gentoo.org/899948
Closes: https://bugs.gentoo.org/903966
Closes: https://bugs.gentoo.org/916450
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-emulation/vbam/Manifest          |   1 +
 games-emulation/vbam/vbam-2.1.7.ebuild | 115 +++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index b5f28a98042b..7002ed329ec3 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7
+DIST vbam-2.1.7.tar.gz 4804929 BLAKE2B 1c2bdec1cd5621e0bd8ad49bce209074bcdf5f6728c975f4ed073f8a92c7100d3f6bde30c9bda9fef3489e96f7b96835a662c044e12ec489eb9fbfd6020e7ffa SHA512 3aab71c6843beb3446f30318580ca6df890560d85498d0112666a7e65fecec3d7c8d13a02bb561917d46019ecd39713e189748ae39353dee39c04d49ff82ce88

diff --git a/games-emulation/vbam/vbam-2.1.7.ebuild b/games-emulation/vbam/vbam-2.1.7.ebuild
new file mode 100644
index 000000000000..c18685667d58
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.1.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit wxwidgets xdg cmake
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:=
+	media-libs/libsdl2[joystick]
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i 's/ -mtune=generic//g' CMakeLists.txt || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
+	)
+
+	if use wxwidgets; then
+		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		xdg_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		xdg_pkg_postrm
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2023-01-20  3:54 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2023-01-20  3:54 UTC (permalink / raw
  To: gentoo-commits

commit:     ff864f5fc9ea92617ffd9ce13352158250d9c512
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 03:32:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 03:54:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff864f5f

games-emulation/vbam: add 2.1.5

Closes: https://bugs.gentoo.org/834377
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/vbam/Manifest                           |  1 +
 .../vbam/{vbam-9999.ebuild => vbam-2.1.5.ebuild}        | 17 ++++++++++++-----
 games-emulation/vbam/vbam-9999.ebuild                   | 17 ++++++++++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index cce742bd3f1b..dc89a1dadd98 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
+DIST vbam-2.1.5.tar.gz 4779351 BLAKE2B ef27185e0af1ad07016834f89689b9d81f59b9dc15ea7ea22d2fc72e0c3b86aeb2f23b4cab846f64d40cab35f0ea5510381530e9e8d7889c12949f5630272237 SHA512 5a85ac22ee8d2515d458503ecb5a40d62a490d4704bc966d1511e25b7530191e4e5e523505eada0c1203e45bb28433bc1e8a896d986de2b88998703f5a1c26a7

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-2.1.5.ebuild
similarity index 91%
copy from games-emulation/vbam/vbam-9999.ebuild
copy to games-emulation/vbam/vbam-2.1.5.ebuild
index 7cd76d64a0ef..e5c66f3e0817 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-2.1.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 inherit wxwidgets xdg cmake
@@ -29,12 +29,12 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=media-libs/libpng-1.4:0=
+	>=media-libs/libpng-1.4:=
 	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -48,14 +48,16 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/zip
+	virtual/pkgconfig
 	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
 "
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
+
 	local mycmakeargs=(
 		-DENABLE_FFMPEG=$(usex ffmpeg)
 		-DENABLE_LINK=$(usex link)
@@ -67,10 +69,14 @@ src_configure() {
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
 		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
 	)
+
 	if use wxwidgets; then
 		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
 	fi
+
 	cmake_src_configure
 }
 
@@ -81,6 +87,7 @@ src_install() {
 		dodoc doc/ReadMe.SDL.txt
 		doman src/debian/vbam.6
 	fi
+
 	use wxwidgets && doman src/debian/visualboyadvance-m.6
 }
 

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 7cd76d64a0ef..e5c66f3e0817 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 inherit wxwidgets xdg cmake
@@ -29,12 +29,12 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=media-libs/libpng-1.4:0=
+	>=media-libs/libpng-1.4:=
 	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -48,14 +48,16 @@ DEPEND="
 "
 BDEPEND="
 	app-arch/zip
+	virtual/pkgconfig
 	wxwidgets? ( virtual/imagemagick-tools )
+	amd64? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
 "
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
+
 	local mycmakeargs=(
 		-DENABLE_FFMPEG=$(usex ffmpeg)
 		-DENABLE_LINK=$(usex link)
@@ -67,10 +69,14 @@ src_configure() {
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
 		-DENABLE_LTO=OFF
+		-DENABLE_ONLINEUPDATES=OFF
+		-DDISABLE_MACOS_PACKAGE_MANAGERS=ON
 	)
+
 	if use wxwidgets; then
 		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
 	fi
+
 	cmake_src_configure
 }
 
@@ -81,6 +87,7 @@ src_install() {
 		dodoc doc/ReadMe.SDL.txt
 		doman src/debian/vbam.6
 	fi
+
 	use wxwidgets && doman src/debian/visualboyadvance-m.6
 }
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2020-11-07 22:48 James Le Cuirot
  0 siblings, 0 replies; 30+ messages in thread
From: James Le Cuirot @ 2020-11-07 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4170d8bfd1daa58c8738c6a61db1e52187641a1d
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Thu Oct 29 01:42:09 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 22:42:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4170d8bf

games-emulation/vbam: don't override CMAKE_AR

Closes: https://bugs.gentoo.org/733938
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/18064
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-emulation/vbam/vbam-2.1.4.ebuild | 1 +
 games-emulation/vbam/vbam-9999.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index f006bb998fa..b9fd01b61bd 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -70,6 +70,7 @@ src_configure() {
 		-DENABLE_ASM_CORE=$(usex x86)
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_LTO=OFF
 	)
 	if use wxwidgets; then
 		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 31465821c5d..7cd76d64a0e 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -66,6 +66,7 @@ src_configure() {
 		-DENABLE_ASM_CORE=$(usex x86)
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
+		-DENABLE_LTO=OFF
 	)
 	if use wxwidgets; then
 		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2020-07-25 20:26 James Le Cuirot
  0 siblings, 0 replies; 30+ messages in thread
From: James Le Cuirot @ 2020-07-25 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f8a520bdece570707a9d584afed5a7fe10f6c02e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 20:24:25 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 20:24:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a520bd

games-emulation/vbam: Now build against ffmpeg-4, fix dependencies

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-emulation/vbam/vbam-2.1.4.ebuild | 20 +++++++++++++++-----
 games-emulation/vbam/vbam-9999.ebuild  | 20 +++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index 4cddf8bc249..f006bb998fa 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
 
 RDEPEND="
 	>=media-libs/libpng-1.4:0=
@@ -30,19 +35,24 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
 	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake_fix.patch

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index fa211e451c1..31465821c5d 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -21,7 +21,12 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+REQUIRED_USE="
+	ffmpeg? ( wxwidgets )
+	openal? ( wxwidgets )
+	|| ( sdl wxwidgets )
+"
 
 RDEPEND="
 	>=media-libs/libpng-1.4:0=
@@ -30,19 +35,24 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
+		ffmpeg? ( media-video/ffmpeg:= )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
 	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2020-06-05 23:12 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     6f849e8dbdc837366fdcb39ebcf764be06bb9d52
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 22:55:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 22:55:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f849e8d

games-emulation/vbam: -DENABLE_OPENAL depends on IUSE=wxpython

Closes: https://bugs.gentoo.org/660538
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-emulation/vbam/vbam-2.1.4.ebuild | 4 +++-
 games-emulation/vbam/vbam-9999.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.1.4.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild
index c469223e11d..4cddf8bc249 100644
--- a/games-emulation/vbam/vbam-2.1.4.ebuild
+++ b/games-emulation/vbam/vbam-2.1.4.ebuild
@@ -55,13 +55,15 @@ src_configure() {
 		-DENABLE_LINK=$(usex link)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
 		-DENABLE_SDL=$(usex sdl)
 		-DENABLE_WX=$(usex wxwidgets)
 		-DENABLE_ASM_CORE=$(usex x86)
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
 	)
+	if use wxwidgets; then
+		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
+	fi
 	cmake_src_configure
 }
 

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index dd9bfdfa90c..fa211e451c1 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -51,13 +51,15 @@ src_configure() {
 		-DENABLE_LINK=$(usex link)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
 		-DENABLE_SDL=$(usex sdl)
 		-DENABLE_WX=$(usex wxwidgets)
 		-DENABLE_ASM_CORE=$(usex x86)
 		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
 	)
+	if use wxwidgets; then
+		mycmakeargs+=( -DENABLE_OPENAL=$(usex openal) )
+	fi
 	cmake_src_configure
 }
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2019-12-06 11:08 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2019-12-06 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c52fce4fb9838ec0d96d067cb2089c1b12f8dca4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 11:07:40 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 11:07:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52fce4f

games-emulation/vbam: Removed old

Package-Manager: Portage-2.3.81, Repoman-2.3.19
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-emulation/vbam/Manifest          |  1 -
 games-emulation/vbam/vbam-2.0.2.ebuild | 92 ----------------------------------
 2 files changed, 93 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 63f0ffb5f7b..fe54a9b045c 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,3 +1,2 @@
-DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
 DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896

diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
deleted file mode 100644
index 507362bca85..00000000000
--- a/games-emulation/vbam/vbam-2.0.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( =media-video/ffmpeg-3*:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2019-12-06 11:08 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2019-12-06 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3d950cd83851795eb3513c0d4c306fc94e28f9e6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 11:05:35 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 11:05:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d950cd8

games-emulation/vbam: Synced live ebuild

Package-Manager: Portage-2.3.81, Repoman-2.3.19
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-emulation/vbam/vbam-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 507362bca85..f8607c8a0a0 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+inherit wxwidgets xdg cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -73,20 +73,18 @@ src_install() {
 
 pkg_preinst() {
 	if use wxwidgets ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postinst
 	fi
 }
 
 pkg_postrm() {
 	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
+		xdg_pkg_postrm
 	fi
 }


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2018-08-29 21:22 James Le Cuirot
  0 siblings, 0 replies; 30+ messages in thread
From: James Le Cuirot @ 2018-08-29 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ef9f6bf56e2a038da4cdda33020cf9d8decf1e85
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 21:21:24 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 21:22:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9f6bf5

games-emulation/vbam: Pin ffmpeg back to version 3

It doesn't build with ffmpeg 4, the dependency is optional, and
upstream don't appear to be in a hurry to fix it.

Closes: https://bugs.gentoo.org/654176
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 games-emulation/vbam/vbam-2.0.2.ebuild | 2 +-
 games-emulation/vbam/vbam-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
index 53f480e326e..507362bca85 100644
--- a/games-emulation/vbam/vbam-2.0.2.ebuild
+++ b/games-emulation/vbam/vbam-2.0.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 53f480e326e..507362bca85 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
+	ffmpeg? ( =media-video/ffmpeg-3*:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2018-03-18  4:48 Tim Harder
  0 siblings, 0 replies; 30+ messages in thread
From: Tim Harder @ 2018-03-18  4:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c67ca2a173bf8cf325fb792fdc5a7afcde77a0cc
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 04:43:21 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 04:44:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67ca2a1

games-emulation/vbam: version bump to 2.0.2

 games-emulation/vbam/Manifest          |  1 +
 games-emulation/vbam/vbam-2.0.2.ebuild | 92 ++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 6b0c0502dc3..08ad2c375b5 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
+DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910

diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
new file mode 100644
index 00000000000..53f480e326e
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.0.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
+	media-libs/libsdl2[joystick]
+	link? ( >=media-libs/libsfml-2.0:= )
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( media-video/ffmpeg:= )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	wxwidgets? ( virtual/imagemagick-tools )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2018-01-21 10:20 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2018-01-21 10:20 UTC (permalink / raw
  To: gentoo-commits

commit:     9e90026294df8a59b74630511b1f8e30ba6881e9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 10:19:23 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 10:19:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e900262

games-emulation/vbam: Remove obsolete calls to 'edos2unix'

* edos2unix is not required anymore

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-emulation/vbam/vbam-2.0.1-r1.ebuild | 9 +--------
 games-emulation/vbam/vbam-9999.ebuild     | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
index 8185bd80ace..7895e9c087d 100644
--- a/games-emulation/vbam/vbam-2.0.1-r1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0-gtk3"
-inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -49,13 +49,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-read-version-from-changelog.patch
 )
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix desktop file QA warnings
-	edos2unix src/wx/wxvbam.desktop
-}
-
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index a030b6e4a4d..53f480e326e 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0-gtk3"
-inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
+inherit gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -44,13 +44,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix desktop file QA warnings
-	edos2unix src/wx/wxvbam.desktop
-}
-
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2018-01-20 19:54 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2018-01-20 19:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b226cc20961b7f3f5c091eaf02b30ecc2b503a93
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 19:53:26 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 19:53:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b226cc20

games-emulation/vbam: Modernise

* Use GTK3 wxwidgets
* Call cmake-utils_src_prepare
* Remove redundant calls to src_compile
* Add missing app-arch/zip DEPEND
* Use proper ffmpeg/libav construct

Closes: https://bugs.gentoo.org/642742
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../{vbam-2.0.1.ebuild => vbam-2.0.1-r1.ebuild}    | 23 +++++++++++-----------
 games-emulation/vbam/vbam-9999.ebuild              | 22 ++++++++++-----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
similarity index 86%
rename from games-emulation/vbam/vbam-2.0.1.ebuild
rename to games-emulation/vbam/vbam-2.0.1-r1.ebuild
index c564e02df5d..8185bd80ace 100644
--- a/games-emulation/vbam/vbam-2.0.1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -22,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
 	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( virtual/ffmpeg[-libav] )
+	ffmpeg? ( media-video/ffmpeg:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -36,18 +38,19 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
+	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-changelog-update.patch"
-	"${FILESDIR}/${P}-read-version-from-changelog.patch"
+	"${FILESDIR}"/${P}-changelog-update.patch
+	"${FILESDIR}"/${P}-read-version-from-changelog.patch
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# fix desktop file QA warnings
 	edos2unix src/wx/wxvbam.desktop
@@ -70,10 +73,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 357c9489310..a030b6e4a4d 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -2,15 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
@@ -21,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
 	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/opengl
-	ffmpeg? ( virtual/ffmpeg[-libav] )
+	ffmpeg? ( media-video/ffmpeg:= )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
@@ -35,13 +38,14 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
+	app-arch/zip
 	wxwidgets? ( virtual/imagemagick-tools )
 	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	# fix desktop file QA warnings
 	edos2unix src/wx/wxvbam.desktop
@@ -64,10 +68,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2017-12-30 21:41 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2017-12-30 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     a5aa5029aa649637c91bd8d2188cbfc52679441e
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Dec 30 15:22:20 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 21:40:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5aa5029

games-emulation/vbam: add missing setup-wxwidgets()

setup-wxwidgets() is required in EAPI 6 ebuilds. Probably it was
forgotten with EAPI bump.

Closes: https://bugs.gentoo.org/604244
Closes: https://github.com/gentoo/gentoo/pull/6690

 games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild | 1 +
 games-emulation/vbam/vbam-9999.ebuild                     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
index 055ea0f7ff4..21315294a29 100644
--- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 )
 
 src_configure() {
+	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
 		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 5fe89033daf..0af06c4e2c8 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
 		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2017-12-16 10:31 Tobias Klausmann
  0 siblings, 0 replies; 30+ messages in thread
From: Tobias Klausmann @ 2017-12-16 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     58d54220598f5301b4e65e0e19a938f0bb037149
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 10:29:43 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 10:31:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d54220

games-emulation/vbam-2.0.0_beta2_p20161211-r1: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/632515

 games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
index 72f32af3fea..055ea0f7ff4 100644
--- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git
 else
 	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/c2165287938aea2306a75f0714744a6d23ba7dab.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	inherit vcs-snapshot
 fi
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-12-27  5:43 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2016-12-27  5:43 UTC (permalink / raw
  To: gentoo-commits

commit:     a29d1de907adef50e5c0db7b9b06b00dfa36c6d8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 05:42:43 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 05:42:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29d1de9

games-emulation/vbam: package RDEPENDs on media-libs/libsdl2 (bug #603808).

Thanks to Daniel M. Weeks for reporting this.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild | 2 +-
 games-emulation/vbam/vbam-9999.ebuild                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild
index 59f55d9..6ad0a84 100644
--- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild
@@ -24,7 +24,7 @@ IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl[sound]
+	media-libs/libsdl2[sound]
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index e198f37..031fcad 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
-	media-libs/libsdl[joystick]
+	media-libs/libsdl2[joystick]
 	link? ( >=media-libs/libsfml-2.0:= )
 	sys-libs/zlib
 	virtual/glu


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-12-11 18:10 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2016-12-11 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     9afbc342b8b48d0bbf2416a3fc583db9c1a54ddd
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 11 17:51:30 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 18:10:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9afbc342

games-emulation/vbam: Correct Vbam ebuild name

Rename vbam-2.0.0_beta2_pre20161211.tar.gz to
vbam-2.0.0_beta2_p20161211.tar.gz.  The ebuild points to a version that
came out after v2.0.0_beta2.

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3088

 games-emulation/vbam/Manifest                                           | 2 +-
 ...2.0.0_beta2_pre20161211.ebuild => vbam-2.0.0_beta2_p20161211.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index eebfa6a..b68ed3f 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,4 +1,4 @@
-DIST vbam-2.0.0_beta2_pre20161211.tar.gz 3075570 SHA256 32902dd418446ed8150098e776eecb0e8567cb39c36037eb0d19d0973e071043 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40 WHIRLPOOL 06ec3273abf1454b908a24825cb1db9d32d4ce2c9ac417066809174ae82e74b3b7477bdcac711aabe0540e8e3ef706453bb6cfbfc4c7a19267658440a632e39e
+DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 SHA256 32902dd418446ed8150098e776eecb0e8567cb39c36037eb0d19d0973e071043 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40 WHIRLPOOL 06ec3273abf1454b908a24825cb1db9d32d4ce2c9ac417066809174ae82e74b3b7477bdcac711aabe0540e8e3ef706453bb6cfbfc4c7a19267658440a632e39e
 DIST vbam-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch 3205 SHA256 88ddcf60842fb0156277ef2533d3b0e4f6a6a5266ec33176c390c89d4819e17e SHA512 c9a1545967d1ee2fa6510f69183e491df7800639c995ad8f9259daac698471ac02097610008181a045d280d6d3b5a472e7b900bf99f61db1f30c0759e216f6ea WHIRLPOOL 1f40ea9fbc10a95a3dad7e7805e6687f59b21d274d328f7310997d8230d61958df834791289fa54333d1bfaf1cef4cb3492a717ebe30b1ba86171721f742ea33
 DIST vbam-2.0.0_pre1507-ffmpeg3_defines.patch 1848 SHA256 03f3d7e1c73ef63fe8710e60711b4c1c0e5881d6bdd02bdfc38d71d7730d22f5 SHA512 fb2b2ab6ae4a07b3509da4ba366c422f1cb0dda8669ad23a4cd312398c73598a47654bba5ff5450d4cf0f553adf917a9549ded5e8b4da806eefb468c4dbdfb38 WHIRLPOOL 6f632bc8ed402565c81c95a769568b006e99720c1569bfd0f3a03b9a1466b75e0a4b350dc930b079017085fecf1b02df6a84d2a1ab14e3035a4f6b6096f6838f
 DIST vbam-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch 1552 SHA256 56060f51079a7beb51c0d519110799ae1eae164a01db5ada4383d2f11cec6ef7 SHA512 61623cbcdf77114c371b6add7d86579c262e573c6aa4515f12b2a6e01b9aa83f8330cf9aec5ffde1cac66eeb3e66418687d16811bbaea6d148202a5a9083328c WHIRLPOOL 75a5d268ce55f989e1cfef92062d0d6e911a27186e12d2964516d1ce5d1054005eb2f8433689b2e431b4852e55d0ba5bbcba3be7dedff34a18da344d39f3d5c7

diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild
similarity index 100%
rename from games-emulation/vbam/vbam-2.0.0_beta2_pre20161211.ebuild
rename to games-emulation/vbam/vbam-2.0.0_beta2_p20161211.ebuild


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-12-11 13:49 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2016-12-11 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     dd706ea0be38d3b6582534c585db797a292beaf0
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 11 10:55:52 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 13:48:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd706ea0

games-emulation/vbam: rename vbam-2.0.0_pre1507.ebuild

Rename vbam-2.0.0_pre1507.ebuild to vbam-2.0.0_beta2_pre1507.ebuild.
This ensures the new version (vbam-2.0.0_beta2_pre20161211.ebuild)
to be favored over the older pre version.

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3076

 ....0_pre1507.ebuild => vbam-2.0.0_beta2_pre1507.ebuild} | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild
similarity index 90%
rename from games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
rename to games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild
index 1c1d406..5bd487a 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507.ebuild
@@ -7,11 +7,13 @@ WX_GTK_VER="3.0"
 CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games
 
+MY_P=${P//_beta2/}
+
 if [[ ${PV} == 9999 ]]; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
 	inherit subversion
 else
-	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${MY_P}.tar.xz"
 	KEYWORDS="amd64 x86"
 
 	# upstream patches
@@ -55,6 +57,8 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
+S="${WORKDIR}"/${MY_P}
+
 src_prepare() {
 	[[ ${PV} == 9999 ]] && subversion_src_prepare
 
@@ -63,13 +67,13 @@ src_prepare() {
 
 	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
 		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
-	epatch "${FILESDIR}"/${P}-man.patch
+	epatch "${FILESDIR}"/${MY_P}-man.patch
 
 	epatch \
-		"${DISTDIR}/${P}-ffmpeg3_defines.patch" \
-		"${DISTDIR}/${P}-ffmpeg3_audio_recording_kludge.patch" \
-		"${DISTDIR}/${P}-ffmpeg3_encoders_no_s16.patch" \
-		"${DISTDIR}/${P}-ffmpeg3_nonfunc_video_encoding.patch"
+		"${DISTDIR}/${MY_P}-ffmpeg3_defines.patch" \
+		"${DISTDIR}/${MY_P}-ffmpeg3_audio_recording_kludge.patch" \
+		"${DISTDIR}/${MY_P}-ffmpeg3_encoders_no_s16.patch" \
+		"${DISTDIR}/${MY_P}-ffmpeg3_nonfunc_video_encoding.patch"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-12-06  9:13 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2016-12-06  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     97e7760baefab27351eda33af87d674a673fbe1d
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:11:30 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:13:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e7760b

games-emulation/vbam: Fix compat with ffmpeg-3 (#574894 by Lars Wendler (Polynomial-C)).

Package-Manager: portage-2.3.2

 games-emulation/vbam/Manifest                  |  4 ++++
 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7415663..ba7e08e 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,5 @@
+DIST vbam-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch 3205 SHA256 88ddcf60842fb0156277ef2533d3b0e4f6a6a5266ec33176c390c89d4819e17e SHA512 c9a1545967d1ee2fa6510f69183e491df7800639c995ad8f9259daac698471ac02097610008181a045d280d6d3b5a472e7b900bf99f61db1f30c0759e216f6ea WHIRLPOOL 1f40ea9fbc10a95a3dad7e7805e6687f59b21d274d328f7310997d8230d61958df834791289fa54333d1bfaf1cef4cb3492a717ebe30b1ba86171721f742ea33
+DIST vbam-2.0.0_pre1507-ffmpeg3_defines.patch 1848 SHA256 03f3d7e1c73ef63fe8710e60711b4c1c0e5881d6bdd02bdfc38d71d7730d22f5 SHA512 fb2b2ab6ae4a07b3509da4ba366c422f1cb0dda8669ad23a4cd312398c73598a47654bba5ff5450d4cf0f553adf917a9549ded5e8b4da806eefb468c4dbdfb38 WHIRLPOOL 6f632bc8ed402565c81c95a769568b006e99720c1569bfd0f3a03b9a1466b75e0a4b350dc930b079017085fecf1b02df6a84d2a1ab14e3035a4f6b6096f6838f
+DIST vbam-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch 1552 SHA256 56060f51079a7beb51c0d519110799ae1eae164a01db5ada4383d2f11cec6ef7 SHA512 61623cbcdf77114c371b6add7d86579c262e573c6aa4515f12b2a6e01b9aa83f8330cf9aec5ffde1cac66eeb3e66418687d16811bbaea6d148202a5a9083328c WHIRLPOOL 75a5d268ce55f989e1cfef92062d0d6e911a27186e12d2964516d1ce5d1054005eb2f8433689b2e431b4852e55d0ba5bbcba3be7dedff34a18da344d39f3d5c7
+DIST vbam-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch 1810 SHA256 49f969a4b6e11b06cd2f1c26849e8f13dd0e9b610345888abd44f9fe6c146d60 SHA512 923851a8ace4d1f65eeb2cc3384abc2886fb22460eae2a583b82e19dfd9a3a5fcb4ed044d3a1b1b14d29d83d289daff7690b2511596a4f163bd407c452f7776c WHIRLPOOL ed95f7477c0ae1fa5a42635942a18b5f6bd87b0e5450b2615af50f95bf37e6d15c8117810850a3f99a3949109dc64d2bf73d679ae42fce9ebc7129d0399c411c
 DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 186e685..1c1d406 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -13,6 +13,12 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
+
+	# upstream patches
+	SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/3f3c3859c1c5f92937bef5d3398a37605e9c16ec.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_defines.patch"
+	SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/029a5fc14b8e5d6f6ce724e66564f9ef89c6a809.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_audio_recording_kludge.patch"
+	SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/a3a07d2f565756771e9c4f0b9574dcffe51c2fa4.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_encoders_no_s16.patch"
+	SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/502de18456ee272c4bf264f2db9bea73a6b0bfd0.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_nonfunc_video_encoding.patch"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
@@ -58,6 +64,12 @@ src_prepare() {
 	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
 		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
 	epatch "${FILESDIR}"/${P}-man.patch
+
+	epatch \
+		"${DISTDIR}/${P}-ffmpeg3_defines.patch" \
+		"${DISTDIR}/${P}-ffmpeg3_audio_recording_kludge.patch" \
+		"${DISTDIR}/${P}-ffmpeg3_encoders_no_s16.patch" \
+		"${DISTDIR}/${P}-ffmpeg3_nonfunc_video_encoding.patch"
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-08-26  5:17 Tim Harder
  0 siblings, 0 replies; 30+ messages in thread
From: Tim Harder @ 2016-08-26  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0ca8f58344643b381c0ec900b73960c75226c5c4
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 05:10:17 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 05:17:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca8f583

games-emulation/vbam: update to EAPI 6 and drop games eclass usage

 games-emulation/vbam/vbam-9999.ebuild | 51 +++++++++++++----------------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index acb9bda..e198f37 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils
 
 if [[ ${PV} == 9999 ]]; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://sourceforge.net/projects/vbam/"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,7 +24,7 @@ REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
 	media-libs/libsdl[joystick]
-	link? ( >=media-libs/libsfml-2.0 )
+	link? ( >=media-libs/libsfml-2.0:= )
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
@@ -46,13 +46,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	[[ ${PV} == 9999 ]] && subversion_src_prepare
-
-	# fix issue with zlib-1.2.5.1 macros (bug #383179)
-	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
-
-	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
-		CMakeLists.txt src/wx/CMakeLists.txt || die
+	default
 
 	# fix desktop file QA warnings
 	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
@@ -60,19 +54,18 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable cairo CAIRO)
-		$(cmake-utils_use_enable ffmpeg FFMPEG)
-		$(cmake-utils_use_enable gtk GTK)
-		$(cmake-utils_use_enable link LINK)
-		$(cmake-utils_use_enable lirc LIRC)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable openal OPENAL)
-		$(cmake-utils_use_enable sdl SDL)
-		$(cmake-utils_use_enable wxwidgets WX)
-		$(cmake-utils_use_enable x86 ASM_CORE)
-		$(cmake-utils_use_enable x86 ASM_SCALERS)
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
 		-DCMAKE_SKIP_RPATH=ON
-		-DDATA_INSTALL_DIR=share/games/${PN}
 	)
 	cmake-utils_src_configure
 }
@@ -90,21 +83,15 @@ src_install() {
 	fi
 	use wxwidgets && doman src/debian/wxvbam.1
 	use gtk && doman src/debian/gvbam.1
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
-
-	games_pkg_preinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_savelist
 	fi
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_cache_update
 	fi


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-08-26  5:17 Tim Harder
  0 siblings, 0 replies; 30+ messages in thread
From: Tim Harder @ 2016-08-26  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1a0e98ed2a7193305a752a66256b9c2a983f4a75
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 05:12:34 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 05:17:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0e98ed

games-emulation/vbam: add github upstream metadata

 games-emulation/vbam/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
index caad129..0211d21 100644
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="link">Enable GBA linking functionality</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">vbam</remote-id>
+		<remote-id type="github">visualboyadvance-m/visualboyadvance-m</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-04-03  3:08 Michael Sterrett
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Sterrett @ 2016-04-03  3:08 UTC (permalink / raw
  To: gentoo-commits

commit:     32f8d90649164ca4a2674273ba961fa283b47607
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 03:07:41 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 03:08:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f8d906

games-emulation/vbam: explicitly set the makefile ganerator (bug #562540)

Package-Manager: portage-2.2.26

 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index f9c8f35..b65ee28 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 WX_GTK_VER="3.0"
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games
 
 if [[ ${PV} == 9999 ]]; then


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2016-01-01  7:21 Michael Sterrett
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Sterrett @ 2016-01-01  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     13416e8e5b771305ceab90d018877106abcd96ed
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 07:20:05 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 07:20:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13416e8e

games-emulation/vbam: fix building with libsigc++-2.6 (bug #568792)

Package-Manager: portage-2.2.24

 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index f907be2..f9c8f35 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets flag-o-matic gnome2-utils fdo-mime games
 
 if [[ ${PV} == 9999 ]]; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
@@ -60,6 +60,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug #568792
+	append-cxxflags -std=c++11 -fpermissive
 	local mycmakeargs=(
 		$(cmake-utils_use_enable cairo CAIRO)
 		$(cmake-utils_use_enable ffmpeg FFMPEG)


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2015-12-11 10:06 Agostino Sarubbo
  0 siblings, 0 replies; 30+ messages in thread
From: Agostino Sarubbo @ 2015-12-11 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     13b92a8ca5ab2d5905c17df4f232ab0cdbd036c9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 10:06:09 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 10:06:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b92a8c

games-emulation/vbam: amd64 stable wrt bug #567948

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 146aafb..5321a2c 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit subversion
 else
 	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2015-11-10 16:57 Michael Sterrett
  0 siblings, 0 replies; 30+ messages in thread
From: Michael Sterrett @ 2015-11-10 16:57 UTC (permalink / raw
  To: gentoo-commits

commit:     dd1cf30dd5baef5f827d55fee88cc1c54d6a921c
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 16:57:16 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 16:57:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1cf30d

drop attempt at enabling mmx support since it doesn't work on amd64 (bug #564980)

Package-Manager: portage-2.2.20.1

 games-emulation/vbam/vbam-2.0.0_pre1507.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 0e0e07b..146aafb 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="cairo cpu_flags_x86_mmx ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
@@ -72,7 +72,6 @@ src_configure() {
 		$(cmake-utils_use_enable wxwidgets WX)
 		$(cmake-utils_use_enable x86 ASM_CORE)
 		$(cmake-utils_use_enable x86 ASM_SCALERS)
-		$(cmake-utils_use_enable cpu_flags_x86_mmx MMX)
 		-DCMAKE_SKIP_RPATH=ON
 		-DDATA_INSTALL_DIR=share/games/${PN}
 	)


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2015-08-29 20:26 Tim Harder
  0 siblings, 0 replies; 30+ messages in thread
From: Tim Harder @ 2015-08-29 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     74e69c90edb6e8a5989417b85d0fe647fa842a96
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 20:22:35 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 20:23:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e69c90

games-emulation/vbam: version bump to new snapshot

Also merge the live and snapshot ebuilds.

 games-emulation/vbam/Manifest                       |  1 +
 .../{vbam-9999.ebuild => vbam-2.0.0_pre1507.ebuild} | 21 ++++++++++++---------
 games-emulation/vbam/vbam-9999.ebuild               | 21 ++++++++++++---------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index d5dd232..1978f16 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a
+DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
similarity index 87%
copy from games-emulation/vbam/vbam-9999.ebuild
copy to games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 12b7eb2..5ddac33 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -4,16 +4,21 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+	inherit subversion
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	subversion_src_unpack
-}
-
 src_prepare() {
-	subversion_src_prepare
+	[[ ${PV} == 9999 ]] && subversion_src_prepare
+
 	# fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
@@ -93,7 +95,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	subversion_pkg_preinst
+	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
+
 	games_pkg_preinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_savelist

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 12b7eb2..5ddac33 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -4,16 +4,21 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+	inherit subversion
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	subversion_src_unpack
-}
-
 src_prepare() {
-	subversion_src_prepare
+	[[ ${PV} == 9999 ]] && subversion_src_prepare
+
 	# fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
@@ -93,7 +95,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	subversion_pkg_preinst
+	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
+
 	games_pkg_preinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_savelist


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
@ 2015-08-29 20:26 Tim Harder
  0 siblings, 0 replies; 30+ messages in thread
From: Tim Harder @ 2015-08-29 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1dd5c1f6f3d337ed32af8f64e172432ea01fbeb9
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 20:07:54 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 20:23:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd5c1f6

games-emulation/vbam: update repo and libsfml dep for live ebuild

 games-emulation/vbam/vbam-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 2ac6f5d..12b7eb2 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 WX_GTK_VER="3.0"
 inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
 
-ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"
+ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
@@ -19,7 +19,7 @@ REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
 	media-libs/libsdl[joystick]
-	link? ( <media-libs/libsfml-2.0 )
+	link? ( >=media-libs/libsfml-2.0 )
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2024-06-16  9:37 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-13 22:17 [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2024-06-16  9:37 Pacho Ramos
2024-06-16  9:37 Pacho Ramos
2024-04-18 16:56 Pacho Ramos
2024-03-22  5:33 Sam James
2023-11-24 12:59 Pacho Ramos
2023-01-20  3:54 Sam James
2020-11-07 22:48 James Le Cuirot
2020-07-25 20:26 James Le Cuirot
2020-06-05 23:12 Andreas Sturmlechner
2019-12-06 11:08 Lars Wendler
2019-12-06 11:08 Lars Wendler
2018-08-29 21:22 James Le Cuirot
2018-03-18  4:48 Tim Harder
2018-01-21 10:20 David Seifert
2018-01-20 19:54 David Seifert
2017-12-30 21:41 David Seifert
2017-12-16 10:31 Tobias Klausmann
2016-12-27  5:43 Lars Wendler
2016-12-11 18:10 David Seifert
2016-12-11 13:49 David Seifert
2016-12-06  9:13 Pacho Ramos
2016-08-26  5:17 Tim Harder
2016-08-26  5:17 Tim Harder
2016-04-03  3:08 Michael Sterrett
2016-01-01  7:21 Michael Sterrett
2015-12-11 10:06 Agostino Sarubbo
2015-11-10 16:57 Michael Sterrett
2015-08-29 20:26 Tim Harder
2015-08-29 20:26 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox