gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

games-emulation/vbam: Modernise

Browse Source 
* 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
This commit is contained in:
David Seifert
2018-01-20 20:53:26 +01:00
parent 6487a19351
commit b226cc2096
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
games-emulation/vbam/vbam-2.0.1.ebuild → games-emulation/vbam/vbam-2.0.1-r1.ebuild
View File

@@ -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

22
games-emulation/vbam/vbam-9999.ebuild
View File

@@ -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