diff options
Diffstat (limited to 'games-emulation')
34 files changed, 816 insertions, 376 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex 72ca59342dd4..7088e6ee8d72 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest index 600b261cab4d..9f080e78e74c 100644 --- a/games-emulation/advancemame/Manifest +++ b/games-emulation/advancemame/Manifest @@ -1,8 +1,9 @@ -AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360 -AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e -AUX advancemame-3.7-move_aclocal_to_acinclude.patch 2277 BLAKE2B f66691900297b845d9b20f93c989d4f31c7e9cd87be5168fc9e716080f6d23bcf590b372df3275149ad28927581d4e406a4bcd3bb6ba1af3b732f97c7f5483f6 SHA512 1ece971e4d51d4ac6e8bcc9b72413b6cb9d19206797131c1ed6af33da3eec18797be128776061a7478dac807dc4e83a75a9495dd0a6c788090f55eb13aeaa89b -AUX advancemame-3.7-remove_static_configure_option.patch 1076 BLAKE2B 17014295ddf61b910376338998791b645157175b640839ba076c72861cc643c2c5d969139230e7c49ee5e60ce790a100fc3f1612d2370e6bcb3a7a9f37ae4f14 SHA512 b7c1c961c123d8a175325626005c8d2081ba98f0f392dabde795732340f323caf513c6b691790afe254860044fca97cf497209d94dc0ff6e1d98fc8df4bda563 -DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2 -DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74 -EBUILD advancemame-3.7.ebuild 2156 BLAKE2B 269e0044b610bf6c51d2de3cc689c3b4cf6a8529d66b94d08344404ae21eb64c5e225a7651e4639fff08373936a029d3815b32bc461c3706168d18bca7066546 SHA512 0cbe417469a221e735bdfc71b02f1b69e487e9fa903a7ff94a967ef7cc2364966ebf7107985d2cdbfdd760ee5b9492c60e2623782422f20c1e2c7aca1b86ba0d +AUX advancemame-3.9-DESTDIR.patch 6316 BLAKE2B f2b2c08ac5ed2300c58575a9aece9371284aa731dfe63ac5ef86fc1609b24ee1e83d728d8e4d0566f570add7414bd9aa6b4eed2e06a999a79590606474f87d3d SHA512 2d13cd27eb145d6bdd59d8e1bff02b2a99676af343c2569038329716f05990959570141854bf68186ae9d5fbe4dea9da9a67cba1bca790c77264cf9a9530efa1 +AUX advancemame-3.9-FHS.patch 6693 BLAKE2B 44c58b984dee0e2db71a4192fcfc6b281242c12bc5f8edc1d27f2b167b306819ae64c9910a6ec6549691cfdba9f49615a0789618dd784e9b0c12091bba4ae185 SHA512 6d68288214a0a230e08405ae70564a0d144e47cd1a767ddbfd4b5898d2e178d3f8c3feb0020bc0eea1329c689ed603eacbe71f6bfe7f8ba2d3d3fc5badc74f7b +AUX advancemame-3.9-blank-flags.patch 767 BLAKE2B 41601a7eec5ffff178f7da2448d01a7d3823c7ce800bafcbc33ea0a7f2a994e20d5fd3dd3f1eab77689c5965f173f5e432573ef6f04232001b69df141d60c9e5 SHA512 d622b0eb69f4653517c87a7caede4c8f1694efd8a103af360c06ebf704b9e98efe32176163361df73317714599033f004ce762973d475386c913465fea87047d +AUX advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch 4630 BLAKE2B 0655e2c879211d5cc70636cc89fc71d73e79e3f50c468c53f879341a2d81a6087a88e9343dd2dd8044b69a347a02f4e7f6020641cdfa0f40d5a098bf4269f2bf SHA512 c2407adc532208444802c7cab50d0b6edb7e6a3b3e9da9818d891267fb9471524bda2df94cc1974e8c2fbb7b7329e76e313fdfc7b149a3aea264097d96ccf99c +AUX advancemame-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360 +AUX advancemame-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e +DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3 +EBUILD advancemame-3.9.ebuild 1738 BLAKE2B 7f721d6c4074803c3c5aeca2bccbacb9a8bce0f808e60f365b1ced00d26a5a701970ace4f0fd35571a630c9a80b6e9754e11a1b6dd74ceda0a0972404335e1d3 SHA512 b6a3aca29ab87465501e2169bc55f7c72e8b08e75ee3d79a8b62feb17b082cde8b253883fba88169e531c7679d7bf219dcc214e6feed35823326661cd0274f86 MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349 diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild deleted file mode 100644 index c371c14107c3..000000000000 --- a/games-emulation/advancemame/advancemame-3.7.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" -HOMEPAGE="http://www.advancemame.it/" -SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" - -# Fetch too big upstream patch -SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch" - -LICENSE="GPL-2 XMAME" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa fbcon oss truetype" - -# sdl is required (bug #158417) -RDEPEND=" - app-arch/unzip - app-arch/zip - dev-libs/expat - media-libs/libsdl2 - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - truetype? ( media-libs/freetype:2 ) -" -DEPEND="${RDEPEND} - virtual/os-headers - virtual/pkgconfig - x86? ( >=dev-lang/nasm-0.98 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.2-pic.patch" - "${FILESDIR}"/${PN}-1.2-verboselog.patch - - # Patches from upstream - "${FILESDIR}/${P}-move_aclocal_to_acinclude.patch" - "${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch" - "${FILESDIR}/${P}-remove_static_configure_option.patch" -) - -src_prepare() { - default - eautoreconf - - sed -i -e 's/"-s"//' configure || die - - use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm" - ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config" -} - -src_configure() { - # Fix for bug #78030 - if use ppc; then - append-ldflags "-Wl,--relax" - fi - - PATH="${PATH}:${T}" - econf \ - --enable-expat \ - --enable-sdl2 \ - --disable-sdl \ - --enable-zlib \ - --disable-slang \ - --disable-svgalib \ - $(use_enable alsa) \ - $(use_enable fbcon fb) \ - $(use_enable oss) \ - $(use_enable truetype freetype) \ - $(use_enable x86 asm) -} - -src_compile() { - STRIPPROG=true emake -} - -src_install() { - local f - - for f in adv* ; do - if [[ -L "${f}" ]] ; then - dobin "${f}" - fi - done - - insinto "/usr/share/advance" - doins support/event.dat - keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap} - - dodoc HISTORY README RELEASE - cd doc - dodoc *.txt - HTMLDOCS="*.html" einstalldocs - - for f in *.1 ; do - newman ${f} ${f/1/6} - done -} diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild new file mode 100644 index 000000000000..94f891024387 --- /dev/null +++ b/games-emulation/advancemame/advancemame-3.9.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" +HOMEPAGE="http://www.advancemame.it/" +SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2 XMAME" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa fbcon ncurses oss slang truetype" + +DEPEND=" + dev-libs/expat + media-libs/libsdl2[video] + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + ncurses? ( sys-libs/ncurses:= ) + slang? ( sys-libs/slang ) + truetype? ( media-libs/freetype:2 ) +" +RDEPEND=" + ${DEPEND} + app-arch/unzip + app-arch/zip +" +BDEPEND=" + virtual/pkgconfig + x86? ( >=dev-lang/nasm-0.98 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-pic.patch + "${FILESDIR}"/${PN}-verboselog.patch + + # Patches from upstream + "${FILESDIR}"/${P}-pkgconfig_for_ncurses_and_slang.patch + "${FILESDIR}"/${P}-blank-flags.patch + "${FILESDIR}"/${P}-DESTDIR.patch + "${FILESDIR}"/${P}-FHS.patch +) + +src_prepare() { + default + + # AC_CHECK_CC_OPT is obsolete, superseded by AX_CHECK_COMPILE_FLAG + sed -i -e 's/AC_CHECK_CC_OPT/AX_CHECK_COMPILE_FLAG/' configure.ac || die + + eautoreconf +} + +src_configure() { + # Fix for bug #78030 + use ppc && append-ldflags "-Wl,--relax" + + ac_cv_prog_ASM=nasm \ + econf \ + --enable-expat \ + --enable-sdl2 \ + --disable-sdl \ + --enable-zlib \ + --disable-slang \ + --disable-svgalib \ + $(use_enable alsa) \ + $(use_enable fbcon fb) \ + $(use_enable ncurses) \ + $(use_enable oss) \ + $(use_enable slang) \ + $(use_enable truetype freetype) \ + $(use_enable x86 asm) +} + +src_compile() { + emake \ + VERSION="${PV}" +} + +src_install() { + emake -j1 install \ + VERSION="${PV}" \ + DESTDIR="${D}" +} diff --git a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch deleted file mode 100644 index 4a30e179ae27..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001 -From: Andrea Mazzoleni <amadvance@gmail.com> -Date: Tue, 8 May 2018 18:55:39 +0200 -Subject: [PATCH 1/3] Use acinclude instead of aclocal - -aclocal.m4 is generated automatically, and we don't have to lose the content. ---- - acinclude.m4 | 20 ++++++++++++++++++++ - aclocal.m4 | 29 ++++++++++++----------------- - 2 files changed, 32 insertions(+), 17 deletions(-) - create mode 100644 acinclude.m4 - -diff --git a/acinclude.m4 b/acinclude.m4 -new file mode 100644 -index 00000000..ceed823a ---- /dev/null -+++ b/acinclude.m4 -@@ -0,0 +1,20 @@ -+dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) -+dnl -+dnl Shows a message as like "checking wether gcc accepts flag ... no" -+dnl and executess ifyes or ifno. -+ -+AC_DEFUN([AC_CHECK_CC_OPT], -+[ -+AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) -+echo 'void f(){}' > conftest.c -+if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then -+ AC_MSG_RESULT([yes]) -+ $2 -+else -+ AC_MSG_RESULT([no]) -+ $3 -+fi -+rm -f conftest* -+]) -+ -+ -diff --git a/aclocal.m4 b/aclocal.m4 -index d6e7b527..56e944be 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1,20 +1,15 @@ --dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) --dnl --dnl Shows a message as like "checking wether gcc accepts flag ... no" --dnl and executess ifyes or ifno. -+# generated automatically by aclocal 1.15 -*- Autoconf -*- - --AC_DEFUN(AC_CHECK_CC_OPT, --[ --AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) --echo 'void f(){}' > conftest.c --if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then -- AC_MSG_RESULT([yes]) -- $2 --else -- AC_MSG_RESULT([no]) -- $3 --fi --rm -f conftest* --]) -+# Copyright (C) 1996-2014 Free Software Foundation, Inc. - -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -+m4_include([acinclude.m4]) --- -2.17.0 - diff --git a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch deleted file mode 100644 index 342ba1c5c07a..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001 -From: Andrea Mazzoleni <amadvance@gmail.com> -Date: Tue, 8 May 2018 19:32:44 +0200 -Subject: [PATCH 3/3] Remove the --enable-static configure option - -I doubt it still work and it doesn't make sense anymore. ---- - configure.ac | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4e609993..1c94e037 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,13 +139,6 @@ AC_ARG_ENABLE( - ) - AC_SUBST([CONF_DEBUG],[$ac_enable_debug]) - --AC_ARG_ENABLE( -- [static], -- AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]), -- [ac_enable_static=$enableval], -- [ac_enable_static=no] --) -- - AC_ARG_ENABLE( - [bare], - AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]), -@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then - else - LDFLAGS="-s" - fi -- if test $ac_enable_static = yes ; then -- LDFLAGS="-static $LDFLAGS" -- fi - if test ! -z $ac_host_ldflags; then - LDFLAGS="$ac_host_ldflags $LDFLAGS" - fi --- -2.17.0 - diff --git a/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch new file mode 100644 index 000000000000..755f8b45188c --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch @@ -0,0 +1,196 @@ +From fca370c9f7a6dcb0a3625cc15f6d0a80182dd4b3 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 25 Apr 2020 10:56:27 +0100 +Subject: [PATCH] Support make install DESTDIR=/foo just like Automake does + +Distributions really need this. +--- + advance/advance.mak | 94 ++++++++++++++++++++++----------------------- + 1 file changed, 47 insertions(+), 47 deletions(-) + +diff --git a/advance/advance.mak b/advance/advance.mak +index 6c4d89c..100dd23 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -376,131 +376,131 @@ pkgdir = $(datadir)/advance + pkgdocdir = $(docdir)/advance + + install-dirs: +- -$(INSTALL_PROGRAM_DIR) $(bindir) +- -$(INSTALL_DATA_DIR) $(pkgdir) +- -$(INSTALL_DATA_DIR) $(pkgdocdir) +- -$(INSTALL_MAN_DIR) $(mandir)/man1 +- -$(INSTALL_DATA_DIR) $(pkgdir)/rom +- -$(INSTALL_DATA_DIR) $(pkgdir)/sample +- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork +- -$(INSTALL_DATA_DIR) $(pkgdir)/image +- -$(INSTALL_DATA_DIR) $(pkgdir)/image/ti99_4a +- -$(INSTALL_DATA_DIR) $(pkgdir)/crc +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap/ti99_4a ++ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 ++ -$(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)/image/ti99_4a ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap/ti99_4a + + install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_IMAGEFILES_TI99_4A) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES) $(INSTALL_SNAPFILES_TI99_4A) + ifdef INSTALL_DATAFILES + @for i in $(INSTALL_DATAFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(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; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \ + done + endif + ifdef INSTALL_IMAGEFILES_TI99_4A + @for i in $(INSTALL_IMAGEFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(INSTALL_SAMPLEFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/sample; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(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; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \ + done + endif + ifdef INSTALL_SNAPFILES_TI99_4A + @for i in $(INSTALL_SNAPFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a; \ + done + endif + + uninstall-data: + ifdef INSTALL_DATAFILES + @for i in $(notdir $(INSTALL_DATAFILES)); do \ +- rm -f $(pkgdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/$$i; \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(notdir $(INSTALL_ROMFILES)); do \ +- rm -f $(pkgdir)/rom/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/rom/$$i; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(notdir $(INSTALL_SAMPLEFILES)); do \ +- rm -f $(pkgdir)/sample/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/sample/$$i; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(notdir $(INSTALL_SNAPFILES)); do \ +- rm -f $(pkgdir)/snap/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/snap/$$i; \ + done + endif + + install-bin: $(INSTALL_BINFILES) + @for i in $(INSTALL_BINFILES); do \ +- echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \ +- $(INSTALL_PROGRAM) $$i $(bindir); \ ++ echo "$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)"; \ ++ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \ + done + + uninstall-bin: + @for i in $(notdir $(INSTALL_BINFILES)); do \ +- rm -f $(bindir)/$$i; \ ++ rm -f $(DESTDIR)$(bindir)/$$i; \ + done + + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ + done + endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES + @for i in $(INSTALL_MANFILES); do \ +- echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \ +- $(INSTALL_DATA) $$i $(mandir)/man1; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \ + done + endif + + uninstall-man: + ifdef INSTALL_MANFILES + @for i in $(notdir $(INSTALL_MANFILES)); do \ +- rm -f $(mandir)/man1/$$i; \ ++ rm -f $(DESTDIR)$(mandir)/man1/$$i; \ + done + endif + + uninstall-dirs: +- -rmdir $(pkgdir)/rom +- -rmdir $(pkgdir)/sample +- -rmdir $(pkgdir)/artwork +- -rmdir $(pkgdir)/image/ti99_4a +- -rmdir $(pkgdir)/image +- -rmdir $(pkgdir)/crc +- -rmdir $(pkgdir)/snap/ti99_4a +- -rmdir $(pkgdir)/snap +- -rmdir $(pkgdir) +- -rmdir $(pkgdocdir) ++ -rmdir $(DESTDIR)$(pkgdir)/rom ++ -rmdir $(DESTDIR)$(pkgdir)/sample ++ -rmdir $(DESTDIR)$(pkgdir)/artwork ++ -rmdir $(DESTDIR)$(pkgdir)/image/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/image ++ -rmdir $(DESTDIR)$(pkgdir)/crc ++ -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/snap ++ -rmdir $(DESTDIR)$(pkgdir) ++ -rmdir $(DESTDIR)$(pkgdocdir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-FHS.patch b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch new file mode 100644 index 000000000000..312e895b8fd8 --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch @@ -0,0 +1,212 @@ +From 6d8c1dc720b09fb9c6ff6edb273ad2a2ea31d768 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 25 Apr 2020 11:16:01 +0100 +Subject: [PATCH 1/2] Use /usr/share/man and /usr/share/doc and not /usr/man + and /usr/doc + +This has been mandated by the Filesystem Hierarchy Standard since 2.0 +in 1997. Autoconf actually does the right thing by default. +--- + Makefile.usr | 4 ++-- + advance/advance.mak | 11 +++++------ + configure.ac | 2 -- + 3 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/Makefile.usr b/Makefile.usr +index 4519857..74a4d53 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -238,8 +238,8 @@ srcdir=. + datadir=${prefix}/share + sysconfdir=${prefix}/etc + bindir=${prefix}/bin +-mandir=${prefix}/man +-docdir=${prefix}/share/doc ++mandir=${datadir}/man ++docdir=${datadir}/doc/advancemame + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 100dd23..8cd0444 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -373,12 +373,11 @@ CONF_SRC = \ + # Install + + pkgdir = $(datadir)/advance +-pkgdocdir = $(docdir)/advance + + install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) +- -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -463,15 +462,15 @@ uninstall-bin: + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif + +@@ -500,7 +499,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) +- -rmdir $(DESTDIR)$(pkgdocdir) ++ -rmdir $(DESTDIR)$(docdir) + + install: install-dirs install-bin install-data install-doc install-man + +diff --git a/configure.ac b/configure.ac +index f8ba989..e54c038 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1220,8 +1220,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent]) + + dnl Final + AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag]) +-AC_SUBST([mandir],['${prefix}/man']) +-AC_SUBST([docdir],['${prefix}/doc']) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT + +-- +2.26.0 + +From e35a602a73880bf529083bee5de911e1490a27b5 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 25 Apr 2020 11:52:13 +0100 +Subject: [PATCH 2/2] Install *.html files to a separately htmldir rather than + docdir + +Autoconf already sets up htmldir for you. It defaults to the same as +docdir but some distributions set it differently. +--- + Makefile.in | 1 + + Makefile.usr | 1 + + advance/advance.mak | 21 +++++++++++++++++---- + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e92a107..86905d7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -14,6 +14,7 @@ exec_prefix=@exec_prefix@ + bindir=@bindir@ + mandir=@mandir@ + docdir=@docdir@ ++htmldir=@htmldir@ + CONF_SYSTEM=@CONF_SYSTEM@ + CONF_HOST=@CONF_HOST@ + CONF_BUILD=@CONF_BUILD@ +diff --git a/Makefile.usr b/Makefile.usr +index 74a4d53..c8e7430 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -240,6 +240,7 @@ sysconfdir=${prefix}/etc + bindir=${prefix}/bin + mandir=${datadir}/man + docdir=${datadir}/doc/advancemame ++htmldir=${docdir} + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 8cd0444..009ccd6 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -152,7 +152,7 @@ endif + endif + + INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d))) +-INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) ++INSTALL_HTMLFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) + WEB_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.hh,$(wildcard $(srcdir)/doc/*.d))) + + ############################################################################ +@@ -162,7 +162,7 @@ ifdef ADV_ALL + all_override: $(ADV_ALL) + endif + +-all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_MANFILES) ++all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) $(INSTALL_MANFILES) + mame: $(OBJ) $(OBJ)/advmame$(EXE) + mess: $(MESSOBJ) $(MESSOBJ)/advmess$(EXE) + emu: mame mess +@@ -182,7 +182,7 @@ web: $(WEB_DOCFILES) + # Ensure that the doc target is always created also if a doc directory exists + .PHONY: doc + +-doc: $(INSTALL_DOCFILES) ++doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + + ############################################################################ + # Source +@@ -378,6 +378,7 @@ install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(htmldir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -459,13 +460,19 @@ uninstall-bin: + rm -f $(DESTDIR)$(bindir)/$$i; \ + done + +-install-doc: $(INSTALL_DOCFILES) ++install-doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ + echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(INSTALL_HTMLFILES); do \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir); \ ++ done ++endif + + uninstall-doc: + ifdef INSTALL_DOCFILES +@@ -473,6 +480,11 @@ ifdef INSTALL_DOCFILES + rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(notdir $(INSTALL_HTMLFILES)); do \ ++ rm -f $(DESTDIR)$(htmldir)/$$i; \ ++ done ++endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES +@@ -500,6 +512,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) + -rmdir $(DESTDIR)$(docdir) ++ -rmdir $(DESTDIR)$(htmldir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch new file mode 100644 index 000000000000..68cfa62f1cad --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch @@ -0,0 +1,32 @@ +From f306234fbaa6bd3fbcb75ebe5e3b318a9fc1c5f0 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 25 Apr 2020 11:40:18 +0100 +Subject: [PATCH] Don't use auto CFLAGS/LDFLAGS if they are set but blank + +Explicitly blank flags are valid. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8ba989..330959c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,12 +82,12 @@ case "$build" in + esac + AC_SUBST([CONF_BUILD],[$ac_build]) + +-if test -z "$CFLAGS" ; then ++if test -z "${CFLAGS+set}" ; then + ac_auto_cflags=yes + else + ac_auto_cflags=no + fi +-if test -z "$LDFLAGS" ; then ++if test -z "${LDFLAGS+set}" ; then + ac_auto_ldflags=yes + else + ac_auto_ldflags=no +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch new file mode 100644 index 000000000000..b91c887e030f --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch @@ -0,0 +1,184 @@ +diff --git a/Makefile.in b/Makefile.in +index 4e30ada3..e92a1072 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,6 +27,8 @@ CONF_LIB_ALSA=@CONF_LIB_ALSA@ + CONF_LIB_OSS=@CONF_LIB_OSS@ + CONF_LIB_SDL=@CONF_LIB_SDL@ + CONF_LIB_FREETYPE=@CONF_LIB_FREETYPE@ ++CONF_LIB_SLANG=@CONF_LIB_SLANG@ ++CONF_LIB_NCURSES=@CONF_LIB_NCURSES@ + CONF_LIB_SVGAWIN=@CONF_LIB_SVGAWIN@ + CONF_LIB_PTHREAD=@CONF_LIB_PTHREAD@ + CONF_LIB_SLANG=@CONF_LIB_SLANG@ +@@ -97,6 +99,10 @@ SDLCFLAGS=@SDLCFLAGS@ + SDLLIBS=@SDLLIBS@ + FREETYPECFLAGS=@FREETYPECFLAGS@ + FREETYPELIBS=@FREETYPELIBS@ ++SLANGCFLAGS=@SLANGCFLAGS@ ++SLANGLIBS=@SLANGLIBS@ ++NCURSESCFLAGS=@NCURSESCFLAGS@ ++NCURSESLIBS=@NCURSESLIBS@ + VCCFLAGS=@VCCFLAGS@ + VCLIBS=@VCLIBS@ + ASMFLAGS=@ASMFLAGS@ +diff --git a/advance/cfg.mak b/advance/cfg.mak +index 222533ff..d2f83233 100644 +--- a/advance/cfg.mak ++++ b/advance/cfg.mak +@@ -57,15 +57,17 @@ CFGOBJS += \ + $(CFGOBJ)/linux/os.o + ifeq ($(CONF_LIB_SLANG),yes) + CFGCFLAGS += \ ++ $(SLANGCFLAGS) \ + -DUSE_VIDEO_SLANG +-CFGLIBS += -lslang ++CFGLIBS += $(SLANGLIBS) + CFGOBJS += \ + $(CFGOBJ)/linux/vslang.o + endif + ifeq ($(CONF_LIB_NCURSES),yes) + CFGCFLAGS += \ ++ $(NCURSESCFLAGS) \ + -DUSE_VIDEO_CURSES +-CFGLIBS += -lncurses ++CFGLIBS += $(NCURSESLIBS) + CFGOBJS += \ + $(CFGOBJ)/linux/vcurses.o + endif +diff --git a/advance/v.mak b/advance/v.mak +index 4ffe708f..451f0d55 100644 +--- a/advance/v.mak ++++ b/advance/v.mak +@@ -53,15 +53,17 @@ VOBJS += \ + $(VOBJ)/linux/os.o + ifeq ($(CONF_LIB_SLANG),yes) + VCFLAGS += \ ++ $(SLANGCFLAGS) \ + -DUSE_VIDEO_SLANG +-VLIBS += -lslang ++VLIBS += $(SLANGLIBS) + VOBJS += \ + $(VOBJ)/linux/vslang.o + endif + ifeq ($(CONF_LIB_NCURSES),yes) + VCFLAGS += \ ++ $(NCURSESCFLAGS) \ + -DUSE_VIDEO_CURSES +-VLIBS += -lncurses ++VLIBS += $(NCURSESLIBS) + VOBJS += \ + $(VOBJ)/linux/vcurses.o + endif +diff --git a/configure.ac b/configure.ac +index 063c407a..f8ba989a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -717,29 +717,41 @@ AC_ARG_ENABLE( + [ac_lib_slang=auto] + ) + if test $ac_lib_slang = auto; then +- AC_CHECK_LIB( +- [slang], +- [SLang_init_tty], +- [ac_lib_slang=yes], +- [ac_lib_slang=no], +- [] +- ) ++ PKG_CHECK_MODULES([SLANG], [slang], [ac_lib_slang=yes], [ac_lib_slang=no]) ++ if test $ac_lib_slang = yes; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="SLANG_CFLAGS $CFLAGS" ++ LIBS="$SLANG_LIBS $LIBS" ++ AC_MSG_CHECKING([for linking slang]) ++ AC_TRY_LINK([ ++ #include <slang.h> ++ ], [ ++ if (SLang_init_tty(-1, 0, 0) < 0) { ++ perror("SLang_init_tty"); ++ return 1; ++ } ++ ++ SLang_reset_tty(); ++ return 0; ++ ],[ac_lib_slang=yes],[ac_lib_slang=no]) ++ AC_MSG_RESULT([$ac_lib_slang]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + elif test $ac_lib_slang = yes; then +- AC_CHECK_LIB( +- [slang], +- [SLang_init_tty], +- [], +- [AC_MSG_ERROR([the sLang library is missing])], +- [] +- ) ++ PKG_CHECK_MODULES([SLANG], [slang], [], AC_MSG_ERROR([the slang library is missing])) + fi + if test $ac_lib_slang = yes; then + AC_CHECK_HEADERS([slang.h slang/slang.h], [break]) + ac_lib_video="$ac_lib_video slang" + ac_lib_text_flag=yes + fi ++AC_SUBST([SLANGCFLAGS],[$SLANG_CFLAGS]) ++AC_SUBST([SLANGLIBS],[$SLANG_LIBS]) + AC_SUBST([CONF_LIB_SLANG],[$ac_lib_slang]) + ++ + dnl Checks for ncurses + AC_ARG_ENABLE( + [ncurses], +@@ -748,28 +760,37 @@ AC_ARG_ENABLE( + [ac_lib_ncurses=auto] + ) + if test $ac_lib_ncurses = auto; then +- AC_CHECK_LIB( +- [ncurses], +- [endwin], +- [ac_lib_ncurses=yes], +- [ac_lib_ncurses=no], +- [] +- ) ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [ac_lib_ncurses=yes], [ac_lib_ncurses=no]) ++ if test $ac_lib_ncurses = yes; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$NCURSES_CFLAGS $CFLAGS" ++ LIBS="$NCURSES_LIBS $LIBS" ++ AC_MSG_CHECKING([for linking ncurses]) ++ AC_TRY_LINK([ ++ #include <ncurses.h> ++ ], [ ++ initscr(); ++ noecho(); ++ curs_set(FALSE); ++ endwin(); ++ ],[ac_lib_ncurses=yes],[ac_lib_ncurses=no]) ++ AC_MSG_RESULT([$ac_lib_ncurses]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + elif test $ac_lib_ncurses = yes; then +- AC_CHECK_LIB( +- [ncurses], +- [endwin], +- [], +- [AC_MSG_ERROR([the sLang library is missing])], +- [] +- ) ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], AC_MSG_ERROR([the ncurses library is missing])) + fi + if test $ac_lib_ncurses = yes; then + ac_lib_video="$ac_lib_video ncurses" + ac_lib_text_flag=yes + fi ++AC_SUBST([NCURSESCFLAGS],[$NCURSES_CFLAGS]) ++AC_SUBST([NCURSESLIBS],[$NCURSES_LIBS]) + AC_SUBST([CONF_LIB_NCURSES],[$ac_lib_ncurses]) + ++ + dnl Checks for freetype + AC_ARG_ENABLE( + [freetype], diff --git a/games-emulation/advancemame/files/advancemame-1.2-pic.patch b/games-emulation/advancemame/files/advancemame-pic.patch index 049befbfac2c..049befbfac2c 100644 --- a/games-emulation/advancemame/files/advancemame-1.2-pic.patch +++ b/games-emulation/advancemame/files/advancemame-pic.patch diff --git a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch b/games-emulation/advancemame/files/advancemame-verboselog.patch index b72c1224e75f..b72c1224e75f 100644 --- a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch +++ b/games-emulation/advancemame/files/advancemame-verboselog.patch diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index d90119ec4f80..ca6267748ecf 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -3,6 +3,6 @@ AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b AUX dolphin-5.0-soundtouch-exceptions.patch 591 BLAKE2B 7a5f25041214f58e99f8e6d50544392be6f1336a070e812b8f4675c777a3e53482c49fdf578781d2a8bb6f7eb6517f6dde087965482756e7b156958c25c815fb SHA512 df9d1832ea2d844ec7ca79b01a3fe8463e21feb089105b79c91218db0d6426e1fc489d3b40688e02a13bef8782b80c50f09f0d0603822c035e8ed99b559a0f39 AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391 DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a -EBUILD dolphin-5.0.ebuild 4650 BLAKE2B dcef48d6adcea1d7492bf420c07de683429084078a8bd26f82218a37efe1a7f439f503b2d35e6c333662d2877a6aa9d8d2c43fac8ad985be1ab1c36f07446d69 SHA512 b944843c72c2280bf403768cf10486216cbc31adf08508c1467e1220ae11f72fcc94f6379b3a6e972f64811b60976cc29ccf07722212f117ae2b97c7f8b057bc -EBUILD dolphin-9999.ebuild 4112 BLAKE2B 8dae6c5251aa8141a5a23de2d510842ebcc806d4bd7bec7207e3c5f7366b046d4ffba64d75e3b3f48c4eeee83f337d04673ffa3b33a92cc7756aef61c8d5f56a SHA512 acd26148eb78ee77ba0392e0268a321c2da6be7abbfb675cd5feda5a2411ce93bc0e9c6e15bd51bf5de71bae75619554ca45ea882d0fa421ee8319648b1d0055 +EBUILD dolphin-5.0.ebuild 4596 BLAKE2B 81fe5abe2b7779f189346605b6b3900066c6463d0e89be39984ee3ce92046c0ae3fff747e19467b3a105826ab5f1955d89a4e611d56111a15b173e0c77f01bad SHA512 6bf62074ba5f228119d19e23cac7621b96d63191367e60900ca5c82ae7deb5329c3eeb1cf2b898ca38e14d307f4f91703dcde53b753e85c841610070b9f2f382 +EBUILD dolphin-9999.ebuild 4058 BLAKE2B 24179f389e66d6e5bcd6c7617b1382b1791af7e3af3be5707a01b03ce20425db04fa16275b75dcb206eca6bd46ad22385084fe01697bdee3459136e345baf263 SHA512 c33b89c469b5658780d97a69b8623288041ec78a98bfefaf3224977e8aaeffae22886ffe79f5b95270c61a70c708b41ceff4428756654aae67fd1a6f596a7c79 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5 diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 153155a8a7ab..156b83d9fd20 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" RESTRICT=test @@ -42,10 +42,7 @@ RDEPEND=" dev-libs/libevdev virtual/udev ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal media-libs/libsoundtouch diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index ba80667dcd71..30c89c3c2a9a 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav log lto profile pulseaudio +qt5 systemd upnp" +IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp" RDEPEND=" dev-libs/hidapi:0= @@ -48,10 +48,7 @@ RDEPEND=" dev-libs/libevdev virtual/udev ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest new file mode 100644 index 000000000000..8a709520b6e9 --- /dev/null +++ b/games-emulation/dosbox-staging/Manifest @@ -0,0 +1,3 @@ +DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150 SHA512 2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70 +EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B c9c3e22d38d50438b48b4d44dcbf1899827972c9fc8c09ea0464117c53edb4c4c7922f1ce18c058128f1cb48055d3dd52dfcb718c7f5bca2b014b058e9c14c3e SHA512 e3763ad4c8f64d773635019df560d80ec64b86447e6b171db17ac357ea6432e7cdc5cd62beecf159d5ef30b27ea7bf4485a40218f2ed2c4b957b71bbc5065be6 +MISC metadata.xml 550 BLAKE2B 6a9d71dc50af11effc4ddbc97225c70cf7e26ad8268151a22c42f243db366fd06a5c5d7698e4cd2cd7158613dfb9effa765afbee1eb2bbd727bc673a644a6ddd SHA512 df7863f358c9830a70ef57112255c49a8e70393c2b98e268ff727c500a16bfe68981285d2554ca2437bee187af36a8b395758fde9b74a09e49a6cf3c050fdefa diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild new file mode 100644 index 000000000000..fb71bdee846b --- /dev/null +++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools desktop + +DESCRIPTION="Modernized DOSBox soft-fork" +HOMEPAGE="https://dosbox-staging.github.io/" +SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug dynrec opengl opus" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + debug? ( sys-libs/ncurses:0= ) + opengl? ( virtual/opengl ) + opus? ( media-libs/opus ) + media-libs/libpng:0= + media-libs/libsdl2[joystick,opengl?,video,X] + media-libs/sdl-net + sys-libs/zlib + !games-emulation/dosbox" +DEPEND="${RDEPEND}" +BDEPEND="" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable alsa alsa-midi) \ + $(use_enable debug) \ + $(use_enable !dynrec dynamic-x86) \ + $(use_enable dynrec) \ + $(use_enable opengl) \ + $(use_enable opus opus-cdda) +} + +src_install() { + default + doicon contrib/icons/${PN}.svg + make_desktop_entry dosbox DOSBox-staging ${PN}.svg +} diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml new file mode 100644 index 000000000000..ea78ea742a79 --- /dev/null +++ b/games-emulation/dosbox-staging/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <use> + <flag name="dynrec">Use recompiling cpu core instead of dynamic x86/x64 specific cpu core</flag> + <flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag> + </use> + <upstream> + <remote-id type="github">dosbox-staging/dosbox-staging</remote-id> + </upstream> +</pkgmetadata> diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest index e3658a9e5f16..310a5e115c75 100644 --- a/games-emulation/hatari/Manifest +++ b/games-emulation/hatari/Manifest @@ -1,5 +1,5 @@ AUX hatari-2.2.1-default-rom.patch 698 BLAKE2B 5830bf75aa9039f0fda3f354bef50fa5dc6c7bea658c2f540a39f21f9b52fbb51447d1f1819ca3eebd248a93f7d255e9ef98a912aa908fbb15277a9ed106b853 SHA512 24659ea52cccb641010b08778608d87b4849b605b2825804f63f1285483605fdc2559f6ce6e17a5a71f801981c7bcf5d429dfc84f6dc6e5ed4cad9f1d957482f AUX hatari-2.2.1-joystick.patch 2172 BLAKE2B 67be6915d79612d851bcd617637e05d076f8a498194957a21ee6213c77fc0c7b718220afb0749bb2ccfa9322af34b020391fd8be9540dd1f7ed694f510215c2d SHA512 54b73d294dcc061abc4e037515f18bd0aa2e311c97010b687fce5cd90e427aac431bf820a1dd9ce2b2632e1662496e423582d80b1d55f23eef0734f03adfb2b8 DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e -EBUILD hatari-2.2.1-r1.ebuild 2165 BLAKE2B 991d569df2a1c47552c733bed8597b7dabfac60490c11d75e3dc23295d6f6a1e5a530344f36d49b0453f7714517cad4ff824c632bf0966dd2d64e55983714564 SHA512 df0bbd7bc4479a61fc5f336636c003abe8908e78ce82b5d2a9326e4b2b8f2ecf29a35d376a73a3618666ad2c6f718d1badb124c2d4d234c44624e83531a65993 +EBUILD hatari-2.2.1-r1.ebuild 2159 BLAKE2B f42eef2c84f55cadb6b7a69eebd4343d001c9c01610916778c90d8b84792c4a1152c537f03af7bf398238f251788fd25c48be5866ec29acd45d23dbc5f75bdaa SHA512 f0bc3b5a49a231f885c72114e400d4b2f50a03f1a74ac75775250f0ef96f88f9162f588faf54c3b8c50176ecc2fe3ba85b054bed2c223e5b299bd40843138419 MISC metadata.xml 619 BLAKE2B 452a04b03222a27e8790a2ce0b38d81899baaf65c9fcdeb22dcec9950cc0fddf027525b23bdb7739fee45ed1daec47071b3d1262006fc3f10c6ff07a8b1bd148 SHA512 6d87d6ab08072cc43e1f42160d0df993dfba7b2f5480261024bdb637f3169062e530029a248c7bee514c604629f6c04c80dd5c609d23bca639a5ef720c266e42 diff --git a/games-emulation/hatari/hatari-2.2.1-r1.ebuild b/games-emulation/hatari/hatari-2.2.1-r1.ebuild index f6d9298755d1..7f53b4620c0f 100644 --- a/games-emulation/hatari/hatari-2.2.1-r1.ebuild +++ b/games-emulation/hatari/hatari-2.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit cmake python-single-r1 xdg DESCRIPTION="Atari ST emulator" diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest index 04f41b15e5e6..a0897d2e55e8 100644 --- a/games-emulation/mgba/Manifest +++ b/games-emulation/mgba/Manifest @@ -2,8 +2,8 @@ AUX mgba-0.8.0-no_sdl.patch 1465 BLAKE2B 07ca5575da44b787ee1a25c41558f7e198bb89b DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789 DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2 DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2 -EBUILD mgba-0.7.3.ebuild 2479 BLAKE2B 13c131f9073caef9a9aad3f0df1ae9a97fe424bd7595d95e821bcdc0983daff8a5902ca41191744b8104ce1fa1ea76f926f19e9c325fd5a6b42802b2a68e6ea1 SHA512 43b04d3c46ea1390653302b2bb8890d8db4cf6bc1f226b1863096272d5cf0e01fe46e0232f47f4e5d597e6510ed4ef671127c3753510c5c959d5fbac9906943c -EBUILD mgba-0.8.0.ebuild 2579 BLAKE2B e1cbd44cc6400193eee9b41866ac582258d5be07d7c64b9e4b03845023ea6170a759d66b564de8dd3738a3c1493563c5cd0c18c0f1414c17a7cf872557562cba SHA512 d09c0620feb178d48a485ab15701e16b3f72a42b757402a75b7251965f317c912dc07cfe9ed9aa8e8a89d1fe7a81a04d1e47d6827671a9b1b80e4c1fe23e2197 -EBUILD mgba-0.8.1.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65 -EBUILD mgba-9999.ebuild 2525 BLAKE2B 5ae6a32fb577471e4f056af23dc933c32c2c4c2cd219032f6d758d419d4825b9ebd737156d398d2ffc754266256bd98e150907bffc5eb54df2e59399e086e96a SHA512 6b30157b4b45440526707a97e6b3f96918b523453b2068738ecfcef5de6ee8c0eda60b9efcbb9362471614a4bbc58146e3acabe4c8f21cf5217af349b0f51c65 +EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a +EBUILD mgba-0.8.0.ebuild 2525 BLAKE2B 4d4b24c5b4e0310505b3f779642c03f4455949f58f453542d0d210c9bf128959cccca9ddb15c9c246567fa340f95dca33762eb93cd03cc1b31428e13bea065b7 SHA512 e7cf1dd6e6283d819b59080a7812946fb290ab4534c2dab7c9feb4437dbc501f166f41f863668b3d23b9a620dc352ea57653e4d7fe129253902d0c62bbb59086 +EBUILD mgba-0.8.1.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4 +EBUILD mgba-9999.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4 MISC metadata.xml 504 BLAKE2B c297828f1153ba0fa214bd849c22af964f8d5c0134f361956c80ea6239424aeb5eeb83f98a65dc7c924f9f7238223064fa25b3ee048e0e456fb9cdc432500b17 SHA512 2f481e401b55e4aa7089851c9869ec9aee349321a0f720b038e673f3f815c59be9c4cd0db667330ca1273bc7ebaf9671733e2b53e9f2fc34bc655709fbebca15 diff --git a/games-emulation/mgba/mgba-0.7.3.ebuild b/games-emulation/mgba/mgba-0.7.3.ebuild index 9f37db304634..bf269f2432fb 100644 --- a/games-emulation/mgba/mgba-0.7.3.ebuild +++ b/games-emulation/mgba/mgba-0.7.3.ebuild @@ -16,7 +16,7 @@ else fi LICENSE="MPL-2.0" SLOT="0" -IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite" +IUSE="debug elf ffmpeg imagemagick opengl qt5 +sdl sqlite" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" @@ -24,10 +24,7 @@ RDEPEND=" media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( diff --git a/games-emulation/mgba/mgba-0.8.0.ebuild b/games-emulation/mgba/mgba-0.8.0.ebuild index 15a46f8a7006..c8853a7ffd1b 100644 --- a/games-emulation/mgba/mgba-0.8.0.ebuild +++ b/games-emulation/mgba/mgba-0.8.0.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MPL-2.0" SLOT="0" -IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite" +IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" @@ -27,10 +27,7 @@ RDEPEND=" media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 diff --git a/games-emulation/mgba/mgba-0.8.1.ebuild b/games-emulation/mgba/mgba-0.8.1.ebuild index 1200fa57ed49..be2689f439b2 100644 --- a/games-emulation/mgba/mgba-0.8.1.ebuild +++ b/games-emulation/mgba/mgba-0.8.1.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MPL-2.0" SLOT="0" -IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite" +IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" @@ -27,10 +27,7 @@ RDEPEND=" media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild index 1200fa57ed49..be2689f439b2 100644 --- a/games-emulation/mgba/mgba-9999.ebuild +++ b/games-emulation/mgba/mgba-9999.ebuild @@ -19,7 +19,7 @@ else fi LICENSE="MPL-2.0" SLOT="0" -IUSE="debug discord elf ffmpeg libav opengl qt5 +sdl sqlite" +IUSE="debug discord elf ffmpeg opengl qt5 +sdl sqlite" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" @@ -27,10 +27,7 @@ RDEPEND=" media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 diff --git a/games-emulation/pcsxr/Manifest b/games-emulation/pcsxr/Manifest index 06994f0e91eb..7237c7b184c6 100644 --- a/games-emulation/pcsxr/Manifest +++ b/games-emulation/pcsxr/Manifest @@ -1,4 +1,4 @@ DIST pcsxr-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz 2229537 BLAKE2B 2f5c11c16d79b6747ccc5f7c655e99663a882e264548c136ff6d4b1321788a10b1475c023e0c7e0892aeb94032c522f2a0e6312e6cf66f608e1a1d7897aea809 SHA512 894e795c3616bb6abf87d144e1a2409142d457f2f2c04c4287e2804bb06caf008f42501089d555b5e43e6b2d6d2e8ac9a7d78842bed975b1b4b94465f4ed3a3c -EBUILD pcsxr-1.9.94_p20190306.ebuild 1978 BLAKE2B e7afb0cd341e2542c24d574f2992d7ee0a08d66070a49076f3d88f066540a68e886a61401913dce2e5472e0f79ea0c14321fcd6e61abe6c74688bd3371faf8e3 SHA512 975902f5228f87ed6f0211dd44fe0094bf2f2ee3b8815cd8be0a33925ca51213fff90b71e05680966786e4a25cdfad12c611df2000fb4b368102b0c876c9f980 -EBUILD pcsxr-9999.ebuild 1835 BLAKE2B dea87b49445728421ce526125f1c7e2c4010c0b5d5c80122cfd69ce8de554b5ddb79e26e58e4ebbeaba4520fdcf0e9f3e29c7b9e83644ff47d362594e409287b SHA512 5ec3d28c7f3fb2c705617a94cadbbc215e29af59705955475e18b4f39e36859da9588ee6f97aa9ec63ee8af2a1d6ab37e84673728cee2efa35d9e235e7fdcbb0 +EBUILD pcsxr-1.9.94_p20190306.ebuild 1924 BLAKE2B 34682b60de3d6855a978222f4c3e551e8b2efd5547b9ef2dccfbd49c85a7442f2b6466754151ab77a96e0ac42b2f984c7bd1ddd79bff04d78695f8cb2ccfff5a SHA512 5cfe7f6c3937ca13149170129acffee30dabc30189c4a5f11eceff658ec0900fdeedda6156eca917583be59f8934ce7498f26332f3a1b43cd08b61f0ed04d3a8 +EBUILD pcsxr-9999.ebuild 1781 BLAKE2B ccca0ff070104676f72af9784b5c8d9caf1f44f882b2c2db9677e42126349570bbdedaa250897cccf482f680fc43c346560612af319a356b6e08b0fae80e3073 SHA512 c4e1e3f75bb21708df85cbaefb428b9bf03a3c2377971fbaee13b46b2dfaa05a93691142032a61d7cbdc9d17e7180b1b2885dac35f4bb72ba706fbfb2bbeeea4 MISC metadata.xml 552 BLAKE2B 648df03f4c540bfca3e45d71cb88e03016d6fbb5a72e5040014d1ca4cbfc8516fcc064820e015982a0f4a70d816b2da9485abaee6d107fe1b6375fede65b652c SHA512 facef188db74c8ca89b4e67a76857e20e3bac6efb44a1aa104aa4a825ef62987aad75f8560c92588ae972428d7035bf2399130209dfd8ed00a9ae5beac4c956c diff --git a/games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild index d51b0296beab..9f4570150ce9 100644 --- a/games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild +++ b/games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild @@ -15,7 +15,7 @@ LICENSE="GPL-2 public-domain" SLOT="0" KEYWORDS="~amd64" -IUSE="alsa archive ccdda cdio libav openal oss pulseaudio +sdl" +IUSE="alsa archive ccdda cdio openal oss pulseaudio +sdl" REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )" RDEPEND=" @@ -33,10 +33,7 @@ RDEPEND=" archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) - ccdda? ( - !libav? ( >=media-video/ffmpeg-3:= ) - libav? ( media-video/libav:= ) - ) + ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] ) diff --git a/games-emulation/pcsxr/pcsxr-9999.ebuild b/games-emulation/pcsxr/pcsxr-9999.ebuild index 765aaa968483..10ae63ff0105 100644 --- a/games-emulation/pcsxr/pcsxr-9999.ebuild +++ b/games-emulation/pcsxr/pcsxr-9999.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2 public-domain" SLOT="0" KEYWORDS="" -IUSE="alsa archive ccdda cdio libav openal oss pulseaudio +sdl" +IUSE="alsa archive ccdda cdio openal oss pulseaudio +sdl" REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )" RDEPEND=" @@ -30,10 +30,7 @@ RDEPEND=" archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) - ccdda? ( - !libav? ( >=media-video/ffmpeg-3:= ) - libav? ( media-video/libav:= ) - ) + ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] ) diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest index 132e028e827b..6ca4a4ba0984 100644 --- a/games-emulation/ppsspp/Manifest +++ b/games-emulation/ppsspp/Manifest @@ -11,6 +11,6 @@ DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208f DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871 DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714 -EBUILD ppsspp-1.5.4-r2.ebuild 3305 BLAKE2B f5d3c228593fca0ba2dd32b90a8dbae10b3add9765569e8cf5a9e9c88bf7f5450237d19257c182ed4eba6b0b9792cfca58d61468eba504d9505c5edc6ce938d0 SHA512 45706515b51481839a13b1d9582684fda524eb41842b471e60f8ca772a21017f4646a0416595b037791b80a3c504fd15038418469afe74b93a5a8d911fa755d1 -EBUILD ppsspp-9999.ebuild 2254 BLAKE2B e2a927117109fc0d30c4e05c21847dc3738e73061a3906e68a1f4dcd7c81d490c892ac48c7d7997e531e2bd5d4b7fc97466acadfee0487d1775f99dfc49f20c7 SHA512 3ed95f0f27c4f6988ff78f81fcafe32f48964d5fbebcc40b48260d311d8be2c117313ee08b7a4f5f7b372b6b9b712fa7e1d488595d59f9881291021a193d42a4 +EBUILD ppsspp-1.5.4-r2.ebuild 3251 BLAKE2B 2e38f51c429f679d8fbf437f2aed21cce48a4ee7f06906c8ee4b711327da1cf1448316b1c21869e55f6cdf75a46a1d08fa943206f2325e8fa83c2eeac482a6ce SHA512 ee7e8861f3c3f54f0147442c98139feaddfdf69d3074fbd5f1a57a6b12a3917b8d51fc5ff2ab419c5877c547830716c921a45aa3ebf7fd0a8710eec8dfd7824d +EBUILD ppsspp-9999.ebuild 2197 BLAKE2B 6ab498d6e02727c4e9f13818b7fed55af2ebdf4f84038986194da1fb32c8d0ae43894d08bd4552455cf512de5f0e3a4a307bbccb37f2cd0d3db7ec7f26a403c1 SHA512 fa8e8db5ad6885d02ff30675e1cfb1c56762f3caa63b318b2dace273d78a340e49d8ca93d8758bc57ed94f5081b6eae63c558558ad22095a4d0f7082c442f1d3 MISC metadata.xml 487 BLAKE2B 2b141f160af50cfa70e6c8cff123db36bea9c29ea4f96d3f25092d71fa0a1c061f6db7f5c4c012ced2165c6da9649b21aadcf417de0ae2e4a6c9217f03a6d700 SHA512 043e4876c162ea66401fdeefc9e40e4cd2b7f86c9262635a0039e5df37b1a992785cccfcd9eefe04b4375dfe9c406e5e0a79f7348fabc683ce8f40897e444358 diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild index 8de0ecaf7478..e83d7dac0129 100644 --- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild +++ b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="headless libav +qt5 sdl +system-ffmpeg" +IUSE="headless +qt5 sdl +system-ffmpeg" REQUIRED_USE="!qt5? ( sdl )" RDEPEND=" @@ -39,10 +39,7 @@ RDEPEND=" !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) - system-ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) + system-ffmpeg? ( media-video/ffmpeg:= ) " DEPEND="${RDEPEND}" diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild index 536c4d6c89ee..1f03ec0b1d0d 100644 --- a/games-emulation/ppsspp/ppsspp-9999.ebuild +++ b/games-emulation/ppsspp/ppsspp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ EGIT_SUBMODULES=( '*' ) LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="headless libav +qt5 sdl +system-ffmpeg" +IUSE="headless +qt5 sdl +system-ffmpeg" REQUIRED_USE="!qt5? ( sdl )" RDEPEND=" @@ -30,10 +30,7 @@ RDEPEND=" !sdl? ( dev-qt/qtmultimedia:5 ) ) sdl? ( media-libs/libsdl2 ) - system-ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) + system-ffmpeg? ( media-video/ffmpeg:= ) " DEPEND="${RDEPEND}" diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest index a15473db70b0..fcec1a8e1eb9 100644 --- a/games-emulation/snes9x/Manifest +++ b/games-emulation/snes9x/Manifest @@ -1,6 +1,4 @@ AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5 -AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1 -AUX snes9x-1.58-without-screenshot_build_fix.patch 846 BLAKE2B a8afca89a9d5a85df688610e2e136f1e47c1558f3be1a02585f47c075587993b68fbc29de987b7e791517a4584aa9373c4985dbdaed979e0688ae6cb3e5c9d58 SHA512 4cb91935d39766c091fdc30a5eb7b01eb60e29ea365da75968b5302d1f44be6992f46c04ba91af412edc787ddd0738ac8455d7127fbfe79ba7782abc423bab32 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8 DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4 DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9 diff --git a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch deleted file mode 100644 index 8a15e0aa4ee3..000000000000 --- a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- snes9x-1.58/gtk/configure.ac -+++ snes9x-1.58/gtk/configure.ac -@@ -33,8 +33,8 @@ - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.19.2]) - --snes9xlocaledir='${prefix}/share/locale' --snes9xdatadir='${prefix}/share/snes9x' -+snes9xlocaledir='$(localedir)' -+snes9xdatadir='$(datadir)/snes9x' - - AC_SUBST(snes9xlocaledir) - AC_SUBST(snes9xdatadir) ---- snes9x-1.58/unix/configure.ac -+++ snes9x-1.58/unix/configure.ac -@@ -56,37 +56,6 @@ - # *** Execution begins here *** - # ***************************** - --# Test what compiler flags we should use. -- --AC_ARG_ENABLE([debug], -- [AS_HELP_STRING([--enable-debug], -- [leave debug information in the final binary (default: no)])], -- [], [enable_debug="no"]) -- --if test "x$enable_debug" = "xyes"; then -- AC_S9X_COMPILER_FLAG([-g], [g]) -- AC_S9X_COMPILER_FLAG([-O0], [o0]) --else -- AC_S9X_COMPILER_FLAG([-O3], [o3], [ -- AC_S9X_COMPILER_FLAG([-O2], [o2], [ -- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) -- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) --fi -- --AC_ARG_ENABLE([mtune], -- [AS_HELP_STRING([--enable-mtune], -- [use the specified value for the -mtune/-mcpu flag (default: no)])], -- [], [enable_mtune="no"]) -- --if test "x$enable_mtune" != "xno"; then -- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune], -- [ -- AC_MSG_WARN([-mtune failed, trying -mcpu...]) -- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu], -- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])]) -- ]) --fi -- - AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions]) - AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti]) - AC_S9X_COMPILER_FLAG([-pedantic], [pedantic]) diff --git a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch deleted file mode 100644 index 7af1e9e2b902..000000000000 --- a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001 -From: Brandon Wright <bearoso@gmail.com> -Date: Fri, 4 Jan 2019 10:52:11 -0600 -Subject: [PATCH] Fix PNG usage without preprocessor check. - ---- - shaders/shader_helpers.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp -index b84e6291..a589d39b 100644 ---- a/shaders/shader_helpers.cpp -+++ b/shaders/shader_helpers.cpp -@@ -93,6 +93,7 @@ bool loadPngImage(const char* name, - bool& outHasAlpha, - GLubyte** outData) - { -+#ifdef HAVE_LIBPNG - png_structp png_ptr; - png_infop info_ptr; - unsigned int sig_read = 0; -@@ -211,6 +212,9 @@ bool loadPngImage(const char* name, - - /* That's it */ - return true; -+#else -+ return false; -+#endif - } - - bool loadTGA(const char* filename, STGA& tgaFile) |