From b226cc20961b7f3f5c091eaf02b30ecc2b503a93 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 20 Jan 2018 20:53:26 +0100 Subject: 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 --- games-emulation/vbam/vbam-2.0.1-r1.ebuild | 104 +++++++++++++++++++++++++++++ games-emulation/vbam/vbam-2.0.1.ebuild | 105 ------------------------------ games-emulation/vbam/vbam-9999.ebuild | 22 +++---- 3 files changed, 115 insertions(+), 116 deletions(-) create mode 100644 games-emulation/vbam/vbam-2.0.1-r1.ebuild delete mode 100644 games-emulation/vbam/vbam-2.0.1.ebuild (limited to 'games-emulation') diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild new file mode 100644 index 000000000000..8185bd80ace3 --- /dev/null +++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild @@ -0,0 +1,104 @@ +# 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 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://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" + +PATCHES=( + "${FILESDIR}"/${P}-changelog-update.patch + "${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=( + -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 +} diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1.ebuild deleted file mode 100644 index c564e02df5d5..000000000000 --- a/games-emulation/vbam/vbam-2.0.1.ebuild +++ /dev/null @@ -1,105 +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" -inherit cmake-utils wxwidgets gnome2-utils eutils xdg-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? ( virtual/ffmpeg[-libav] ) - lirc? ( app-misc/lirc ) - nls? ( virtual/libintl ) - wxwidgets? ( - openal? ( media-libs/openal ) - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - )" -DEPEND="${RDEPEND} - 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" -) - -src_prepare() { - default - - # fix desktop file QA warnings - edos2unix src/wx/wxvbam.desktop -} - -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_compile() { - cmake-utils_src_compile -} - -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 -} diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index 357c94893101..a030b6e4a4de 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 -- cgit v1.2.3-65-gdbad