commit: bd4d33c151ac5c14de8a366d7d82338bc994b853 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue May 29 09:56:35 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 29 09:56:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4d33c1
games-emulation/advancemenu: Bump to version 2.9 Use pkg-config to find freetype and sdl. Closes: https://bugs.gentoo.org/656770 Package-Manager: Portage-2.3.40, Repoman-2.3.9 games-emulation/advancemenu/Manifest | 2 + games-emulation/advancemenu/advancemenu-2.9.ebuild | 89 ++++++++++++++++ .../files/advancemenu-2.9-destdir.patch | 112 +++++++++++++++++++++ 3 files changed, 203 insertions(+) diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest index b30583f168b..4473de8f089 100644 --- a/games-emulation/advancemenu/Manifest +++ b/games-emulation/advancemenu/Manifest @@ -1 +1,3 @@ DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb +DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c +DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386 diff --git a/games-emulation/advancemenu/advancemenu-2.9.ebuild b/games-emulation/advancemenu/advancemenu-2.9.ebuild new file mode 100644 index 00000000000..532a8cfeca8 --- /dev/null +++ b/games-emulation/advancemenu/advancemenu-2.9.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator" +HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"; +SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz" + +# Too big to put into FILESDIR +SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug fbcon ncurses oss sdl slang truetype" + +RDEPEND="dev-libs/expat + alsa? ( media-libs/alsa-lib ) + ncurses? ( sys-libs/ncurses:0 ) + sdl? ( media-libs/libsdl ) + slang? ( >=sys-libs/slang-1.4 ) + !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) + truetype? ( >=media-libs/freetype-2 )" +DEPEND="${RDEPEND} + x86? ( >=dev-lang/nasm-0.98 ) + fbcon? ( virtual/os-headers )" + +PATCHES=( + # pic patch - bug #142021 + "${FILESDIR}"/${PN}-2.7-pic.patch + "${FILESDIR}/${PN}-2.9-destdir.patch" + "${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch" +) + +src_prepare() { + default + sed -i -e 's/"-s"//' configure.ac || die + + use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm" + eautoreconf +} + +src_configure() { + export PATH="${PATH}:${T}" + local myeconfargs=( + --enable-expat + --enable-zlib + --disable-svgalib + $(use_enable alsa) + $(use_enable debug) + $(use_enable fbcon fb) + $(use_enable ncurses) + $(use_enable truetype freetype) + $(use_enable oss) + $(use_enable sdl) + $(use_enable slang) + $(use !sdl && use !fbcon && echo --enable-sdl) + $(use_enable x86 asm) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + STRIPPROG=true emake +} + +src_install() { + emake DESTDIR="${D}" install + dodoc HISTORY README RELEASE doc/*.txt + doman doc/{advmenu,advdev}.1 + docinto html + dodoc doc/*.html +} + +pkg_postinst() { + echo + elog "Execute:" + elog " advmenu -default" + elog "to generate a config file" + elog + elog "An example emulator config found in advmenu.rc:" + elog " emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\"" + elog " emulator_roms \"snes9x\" \"/home/user/myroms\"" + elog " emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\"" + elog + elog "For more information, see the advmenu man page." +} diff --git a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch new file mode 100644 index 00000000000..9ebef883ae2 --- /dev/null +++ b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch @@ -0,0 +1,112 @@ +--- advancemenu-2.9/advance/advance.mak ++++ advancemenu-2.9/advance/advance.mak +@@ -284,45 +284,45 @@ + # Common install + + pkgdir = $(datadir)/advance +-pkgdocdir = $(docdir)/advance ++pkgdocdir = $(docdir) + + install-dirs: +- -$(INSTALL_PROGRAM_DIR) $(bindir) +- -$(INSTALL_DATA_DIR) $(pkgdir) +- -$(INSTALL_DATA_DIR) $(pkgdocdir) +- -$(INSTALL_MAN_DIR) $(mandir)/man1 ++ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + ifneq ($(wildcard $(EMUSRC)),) +- -$(INSTALL_DATA_DIR) $(pkgdir)/rom +- -$(INSTALL_DATA_DIR) $(pkgdir)/sample +- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork +- -$(INSTALL_DATA_DIR) $(pkgdir)/image +- -$(INSTALL_DATA_DIR) $(pkgdir)/crc +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap + endif + + install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES) + ifdef INSTALL_DATAFILES + @for i in $(INSTALL_DATAFILES); do \ + echo "$(INSTALL_DATA) $$i $(pkgdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdir); \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(INSTALL_ROMFILES); do \ + echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/rom; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(INSTALL_SAMPLEFILES); do \ + echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/sample; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(INSTALL_SNAPFILES); do \ + echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \ + done + endif + +@@ -351,7 +351,7 @@ + install-bin: $(INSTALL_BINFILES) + @for i in $(INSTALL_BINFILES); do \ + echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \ +- $(INSTALL_PROGRAM) $$i $(bindir); \ ++ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \ + done + + uninstall-bin: +@@ -363,7 +363,7 @@ + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ + echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdocdir); \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ + done + endif + +@@ -378,7 +378,7 @@ + ifdef INSTALL_MANFILES + @for i in $(INSTALL_MANFILES); do \ + echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \ +- $(INSTALL_DATA) $$i $(mandir)/man1; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \ + done + endif + +@@ -401,7 +401,7 @@ + -rmdir $(pkgdocdir) + endif + +-install: install-dirs install-bin install-data install-doc install-man ++install: install-dirs install-bin install-data + + uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs + +--- advancemenu-2.9/configure.ac ++++ advancemenu-2.9/configure.ac +@@ -1158,8 +1158,8 @@ + + dnl Final + AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag]) +-AC_SUBST([mandir],['${prefix}/man']) +-AC_SUBST([docdir],['${prefix}/doc']) ++AC_SUBST([mandir],['${prefix}/share/man']) ++AC_SUBST([docdir],['${prefix}/share/doc/${PF}']) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +
