From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 070DC138359 for ; Sun, 5 Jul 2020 00:24:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6038E0845; Sun, 5 Jul 2020 00:24:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AACBEE0848 for ; Sun, 5 Jul 2020 00:24:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55A7434F23A for ; Sun, 5 Jul 2020 00:24:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9055B2D1 for ; Sun, 5 Jul 2020 00:24:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1593908606.1c9532d3bd70edd5e4e3d296097a058e68c87b0a.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/generator/, games-emulation/generator/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/generator/files/generator-0.35_p4-autoconf.patch games-emulation/generator/files/generator-0.35_p4-automake.patch games-emulation/generator/files/generator-0.35_p4-configure.patch games-emulation/generator/files/generator-0.35_p4-gcc-9.patch games-emulation/generator/files/generator-0.35_p4-gcc.patch games-emulation/generator/files/generator-0.35_p4-inline.patch games-emulation/generator/files/generator-0.35_p4-underlink.patch games-emulation/generator/generator-0.35_p4-r1.ebuild X-VCS-Directories: games-emulation/generator/files/ games-emulation/generator/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1c9532d3bd70edd5e4e3d296097a058e68c87b0a X-VCS-Branch: master Date: Sun, 5 Jul 2020 00:24:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 846fbfd0-0235-4454-9021-0970e638c4c4 X-Archives-Hash: 257e99ea4429183d11e61fb0106bfab5 commit: 1c9532d3bd70edd5e4e3d296097a058e68c87b0a Author: David Seifert gentoo org> AuthorDate: Sun Jul 5 00:23:26 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jul 5 00:23:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9532d3 games-emulation/generator: Fix build system Closes: https://bugs.gentoo.org/656344 Closes: https://bugs.gentoo.org/686198 Closes: https://bugs.gentoo.org/707776 Closes: https://bugs.gentoo.org/724416 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> ...gure.patch => generator-0.35_p4-autoconf.patch} | 16 +++++++++---- .../files/generator-0.35_p4-automake.patch | 26 ++++++++++++++++++++ ..._p4-gcc-9.patch => generator-0.35_p4-gcc.patch} | 28 ++++++++++++++++++---- .../generator/files/generator-0.35_p4-inline.patch | 12 ---------- .../files/generator-0.35_p4-underlink.patch | 11 --------- .../generator/generator-0.35_p4-r1.ebuild | 25 ++++++++++--------- 6 files changed, 74 insertions(+), 44 deletions(-) diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch similarity index 94% rename from games-emulation/generator/files/generator-0.35_p4-configure.patch rename to games-emulation/generator/files/generator-0.35_p4-autoconf.patch index a918c4a9711..ccc9655a2a7 100644 --- a/games-emulation/generator/files/generator-0.35_p4-configure.patch +++ b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch @@ -1,5 +1,5 @@ ---- a/configure.ac.original 2008-03-17 13:07:48.000000000 -0400 -+++ b/configure.ac 2008-03-17 13:08:03.000000000 -0400 +--- a/configure.ac ++++ b/configure.ac @@ -28,15 +28,12 @@ AC_ARG_WITH(tcltk, AS_HELP_STRING(--with-tcltk,Create tcltk version), @@ -68,7 +68,15 @@ AC_CHECK_LIB(jpeg, jpeg_start_compress, [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ]) -@@ -272,14 +225,7 @@ +@@ -259,6 +212,7 @@ + AC_PROG_CC + AC_PROG_CPP + AC_PROG_RANLIB ++ AM_PROG_AR + AC_PROG_MAKE_SET + AC_ISC_POSIX + AC_PROG_INSTALL +@@ -272,14 +226,7 @@ AC_PATH_XTRA @@ -84,7 +92,7 @@ MY_SUBDIRS="gtkopts $MY_SUBDIRS" AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later)) -@@ -305,6 +251,7 @@ +@@ -305,6 +252,7 @@ AC_CHECK_SIZEOF(unsigned long, 4) AC_CHECK_SIZEOF(unsigned long long, 8) AC_CHECK_HEADERS(sys/param.h) diff --git a/games-emulation/generator/files/generator-0.35_p4-automake.patch b/games-emulation/generator/files/generator-0.35_p4-automake.patch new file mode 100644 index 00000000000..e04ed94b9be --- /dev/null +++ b/games-emulation/generator/files/generator-0.35_p4-automake.patch @@ -0,0 +1,26 @@ +--- a/cpu68k/Makefile.am ++++ b/cpu68k/Makefile.am +@@ -29,6 +29,7 @@ + + gen68k_SOURCES = gen68k.c tab68k.c + gen68k_DEPENDENCIES = def68k-iibs.h ++BUILT_SOURCES = def68k-iibs.h + + noinst_LIBRARIES = lib68k.a + lib68k_a_SOURCES = cpu68k-0.c cpu68k-1.c cpu68k-2.c cpu68k-3.c \ +--- a/main/Makefile.am ++++ b/main/Makefile.am +@@ -3,11 +3,11 @@ + INCLUDES = -I../hdr -I. -I../cpu68k -I../ym2612 -I../raze -I../cmz80 \ + -I../sn76496 -I../gtkopts \ + -DFNAME_TCLSCRIPT=\"${datadir}/generator/gen.tcl\" \ +- @GTK_CFLAGS@ @SDL_CFLAGS@ ++ @SDL_CFLAGS@ + bin_PROGRAMS = @PROGRAM@ + EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \ + generator-gtk generator-sdl +-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \ ++LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \ + ../sn76496/libsn76496.a + + ## this should be generator_tcltk_DATA but it won't let me do that diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc.patch similarity index 59% rename from games-emulation/generator/files/generator-0.35_p4-gcc-9.patch rename to games-emulation/generator/files/generator-0.35_p4-gcc.patch index 7b8eeafb715..c0e22a05739 100644 --- a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch +++ b/games-emulation/generator/files/generator-0.35_p4-gcc.patch @@ -1,8 +1,17 @@ -https://bugs.gentoo.org/698944 - +--- a/hdr/cpuz80.h ++++ b/hdr/cpuz80.h +@@ -5,7 +5,7 @@ + # include "raze.h" + #else + # include "cmz80.h" +-CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */ ++extern CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */ + #endif + + #define LEN_SRAM 0x2000 --- a/main/vdp.c +++ b/main/vdp.c -@@ -87,7 +87,7 @@ void vdp_describe(void); +@@ -87,7 +87,7 @@ void vdp_eventinit(void); void vdp_layer_simple(unsigned int layer, unsigned int priority, uint8 *fielddata, unsigned int lineoffset); @@ -11,7 +20,7 @@ https://bugs.gentoo.org/698944 uint8 *cellloc, unsigned int lineoffset); void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata); int vdp_sprite_simple(unsigned int priority, uint8 *framedata, -@@ -1733,7 +1733,7 @@ void vdp_endfield(void) +@@ -1733,7 +1733,7 @@ vdp_event_endline); */ } @@ -20,3 +29,14 @@ https://bugs.gentoo.org/698944 uint8 *cellloc, unsigned int lineoffset) { int y, x; +--- a/ym2612/support.h ++++ b/ym2612/support.h +@@ -3,7 +3,7 @@ + #include "config.h" + + #define errorlog 0 +-#define INLINE inline ++#define INLINE + #define HAS_YM2612 1 + #define YM2612UpdateRequest(x) + #define AY8910_set_clock(chip,clock) diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch deleted file mode 100644 index e7f09fa3689..00000000000 --- a/games-emulation/generator/files/generator-0.35_p4-inline.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h ---- generator-0.35-cbiere-r4/ym2612/support.h 2005-08-27 05:12:29.000000000 -0400 -+++ generator-0.35-cbiere-r4-patched/ym2612/support.h 2018-03-26 11:49:36.000000000 -0400 -@@ -3,7 +3,7 @@ - #include "config.h" - - #define errorlog 0 --#define INLINE inline -+#define INLINE - #define HAS_YM2612 1 - #define YM2612UpdateRequest(x) - #define AY8910_set_clock(chip,clock) diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch deleted file mode 100644 index b350e8b8a33..00000000000 --- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/main/Makefile.am.old 2011-06-20 21:35:25.832460030 +0200 -+++ b/main/Makefile.am 2011-06-20 21:36:29.490503981 +0200 -@@ -7,7 +7,7 @@ - bin_PROGRAMS = @PROGRAM@ - EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \ - generator-gtk generator-sdl --LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \ -+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \ - ../sn76496/libsn76496.a - - ## this should be generator_tcltk_DATA but it won't let me do that diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild index 54614d750d7..4b25e85945f 100644 --- a/games-emulation/generator/generator-0.35_p4-r1.ebuild +++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools toolchain-funcs MY_P="${PN}-${PV/_p/-cbiere-r}" @@ -14,26 +15,22 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+sdlaudio" -DEPEND=" +RDEPEND=" virtual/jpeg:0 media-libs/libsdl[joystick,video] - sdlaudio? ( media-libs/libsdl[sound] ) -" -RDEPEND="${DEPEND}" + sdlaudio? ( media-libs/libsdl[sound] )" +DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-underlink.patch - "${FILESDIR}"/${P}-inline.patch - "${FILESDIR}"/${P}-gcc-9.patch + "${FILESDIR}"/${P}-autoconf.patch + "${FILESDIR}"/${P}-automake.patch + "${FILESDIR}"/${P}-gcc.patch ) src_prepare() { default - - sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die eautoreconf } @@ -48,5 +45,7 @@ src_configure() { src_install() { dobin main/generator-sdl - dodoc AUTHORS ChangeLog NEWS README TODO docs/* + + einstalldocs + dodoc -r docs/. }