commit: 207590d493406fc36e7734876d80968688dd1b9f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 22 14:08:20 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 24 21:06:46 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207590d4
games-emulation/advancemame: drop 3.9-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-emulation/advancemame/Manifest | 1 - .../advancemame/advancemame-3.9-r1.ebuild | 99 ---------- .../files/advancemame-3.9-DESTDIR.patch | 196 ------------------- .../advancemame/files/advancemame-3.9-FHS.patch | 212 --------------------- .../files/advancemame-3.9-blank-flags.patch | 32 ---- .../files/advancemame-3.9-fno-common.patch | 33 ---- ...emame-3.9-pkgconfig_for_ncurses_and_slang.patch | 184 ------------------ 7 files changed, 757 deletions(-) diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest index fb94b560c822..f8b6554e4924 100644 --- a/games-emulation/advancemame/Manifest +++ b/games-emulation/advancemame/Manifest @@ -1,2 +1 @@ -DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3 DIST advancemame-5.0.tar.gz 27668230 BLAKE2B cd057514f2d85e30a9c911051201d55a31e600b89fba5a602f2cb0125ae3c23cf6c2dea00dc0b3b9a9fb9412d928452337a89c27f82e9b14f5e9e7cb2c4c9fb6 SHA512 5b10b4a0a0a66ad87c50ef0201d5d79dd36c65bf99be57986ac6049cfa0225a8c247b23a0f1eb49884871ce6c9ceb3bcf13af242bcf59c68371b84f365b4b83e diff --git a/games-emulation/advancemame/advancemame-3.9-r1.ebuild b/games-emulation/advancemame/advancemame-3.9-r1.ebuild deleted file mode 100644 index b3eea6dd1512..000000000000 --- a/games-emulation/advancemame/advancemame-3.9-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2025 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 ~ppc64 ~x86" -IUSE="alsa fbcon ncurses oss slang truetype" - -DEPEND=" - dev-libs/expat - media-libs/libsdl2[video] - virtual/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=" - dev-build/autoconf-archive - 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 - "${FILESDIR}"/${P}-fno-common.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() { - # https://bugs.gentoo.org/858626 - # - # From upstream configure.ac, only enabled if CFLAGS is not set: - # - Code was written when compilers where not aggressively optimizing undefined behaviour about aliasing - # - Code was written when compilers where not aggressively optimizing undefined behaviour about overflow in signed integers - # - Code was written on Intel where char is signed - # - # Do not trust with LTO either, BTW - append-flags -fno-strict-aliasing -fno-strict-overflow -fsigned-char - filter-lto - - # 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.9-DESTDIR.patch b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch deleted file mode 100644 index 755f8b45188c..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch +++ /dev/null @@ -1,196 +0,0 @@ -From fca370c9f7a6dcb0a3625cc15f6d0a80182dd4b3 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -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 deleted file mode 100644 index 312e895b8fd8..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.9-FHS.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 6d8c1dc720b09fb9c6ff6edb273ad2a2ea31d768 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -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 <[email protected]> -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 deleted file mode 100644 index 68cfa62f1cad..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f306234fbaa6bd3fbcb75ebe5e3b318a9fc1c5f0 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -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-fno-common.patch b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch deleted file mode 100644 index c378b9aa919e..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f8688cae05799a30cd5337e626a07fa9f004c0a3 Mon Sep 17 00:00:00 2001 -From: Andrea Mazzoleni <[email protected]> -Date: Fri, 23 Oct 2020 21:29:41 +0200 -Subject: [PATCH] Fix build errors due new gcc 10 default for -fno-common - ---- - src/drivers/cavepgm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c -index 38d3dae8..df6e97ab 100644 ---- a/src/drivers/cavepgm.c -+++ b/src/drivers/cavepgm.c -@@ -287,7 +287,7 @@ IGS PCB NO-0136 (Riser) - #include "timer.h" - - --UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram; -+extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram; - static UINT8 *z80_mainram; - static UINT32 *arm7_shareram; - static UINT32 arm7_latch; -@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void) - /* This function expands the sprite colour data (in the A Roms) from 3 pixels - in each word to a byte per pixel making it easier to use */ - --UINT8 *pgm_sprite_a_region; --size_t pgm_sprite_a_region_allocate; -+extern UINT8 *pgm_sprite_a_region; -+extern size_t pgm_sprite_a_region_allocate; - - static void expand_colourdata(void) - { 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 deleted file mode 100644 index b91c887e030f..000000000000 --- a/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch +++ /dev/null @@ -1,184 +0,0 @@ -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],
