public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2015-11-12  4:07 Michael Sterrett
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Sterrett @ 2015-11-12  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     79181c4192325a722f4c01aa987e152e1efbff96
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 04:06:55 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 04:06:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79181c41

restore mistakenly removed stable ebuild (bug #565442)

Package-Manager: portage-2.2.20.1

 app-emulation/vice/Manifest                        |   1 +
 .../vice/files/vice-2.4.20-autotools.patch         |  11 ++
 app-emulation/vice/files/vice-2.4.20-format.patch  |  20 +++
 .../vice/files/vice-2.4.20-xf86extensions.patch    |  15 ++
 app-emulation/vice/metadata.xml                    |   1 +
 app-emulation/vice/vice-2.4.20.ebuild              | 173 +++++++++++++++++++++
 6 files changed, 221 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 7c68c74..2180a63 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
+DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823

diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.20-autotools.patch
new file mode 100644
index 0000000..7bebd28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch b/app-emulation/vice/files/vice-2.4.20-format.patch
new file mode 100644
index 0000000..1c782fd
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-format.patch
@@ -0,0 +1,20 @@
+--- src/main.c.old	2015-10-19 17:25:07.549164652 +0200
++++ src/main.c	2015-10-19 17:25:33.106694706 +0200
+@@ -227,7 +227,7 @@
+     for (i = 0; core_team[i].name; i++) {
+         n += strlen(core_team[i].name);
+         if (n > 74) {
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+             n = 0; *tmp = 0;
+         }
+         strcat(tmp, core_team[i].name);
+@@ -235,7 +235,7 @@
+             strcat(tmp, ", ");
+         } else {
+             strcat(tmp, ".");
+-            log_message(LOG_DEFAULT, tmp);
++            log_message(LOG_DEFAULT, "%s", tmp);
+         }
+     }
+     lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
new file mode 100644
index 0000000..357d686
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
@@ -0,0 +1,15 @@
+--- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
++++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
+@@ -102,9 +102,10 @@
+ #include "ui-threads.h"
+ #endif
+ 
+-#ifdef USE_XF86_EXTENSIONS
++#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
+ #include <gdk/gdkx.h>
+ #endif
++
+ #include "x11ui.h"
+ 
+ #ifdef DEBUG_X11UI
+

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 242aab2..9364cf9 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,6 +5,7 @@
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
 		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
+		<flag name="gtk2">Use GTK+2 for GUI instead of GTK+3</flag>
 		<flag name="memmap">Enable extra monitor features</flag>
 		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
 		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>

diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild
new file mode 100644
index 0000000..1ee7dc6
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk2 sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline
+	)
+	gtk2? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk2? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk2? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-format.patch \
+		"${FILESDIR}"/${P}-xf86extensions.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk2 ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk2 gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2015-12-29  7:41 Michael Sterrett
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Sterrett @ 2015-12-29  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b8f5a3c2770d2d3f96a27d846c73c3072d3abbc3
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 05:15:03 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 07:40:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f5a3c2

old

Package-Manager: portage-2.2.24

 app-emulation/vice/Manifest                        |   1 -
 .../vice/files/vice-2.4.20-autotools.patch         |  11 --
 app-emulation/vice/files/vice-2.4.20-format.patch  |  20 ---
 .../vice/files/vice-2.4.20-xf86extensions.patch    |  15 --
 app-emulation/vice/vice-2.4.20.ebuild              | 173 ---------------------
 5 files changed, 220 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 4e11019..64ad041 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
-DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81

diff --git a/app-emulation/vice/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.20-autotools.patch
deleted file mode 100644
index 7bebd28..0000000
--- a/app-emulation/vice/files/vice-2.4.20-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-2.4.20-format.patch b/app-emulation/vice/files/vice-2.4.20-format.patch
deleted file mode 100644
index 1c782fd..0000000
--- a/app-emulation/vice/files/vice-2.4.20-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c.old	2015-10-19 17:25:07.549164652 +0200
-+++ src/main.c	2015-10-19 17:25:33.106694706 +0200
-@@ -227,7 +227,7 @@
-     for (i = 0; core_team[i].name; i++) {
-         n += strlen(core_team[i].name);
-         if (n > 74) {
--            log_message(LOG_DEFAULT, tmp);
-+            log_message(LOG_DEFAULT, "%s", tmp);
-             n = 0; *tmp = 0;
-         }
-         strcat(tmp, core_team[i].name);
-@@ -235,7 +235,7 @@
-             strcat(tmp, ", ");
-         } else {
-             strcat(tmp, ".");
--            log_message(LOG_DEFAULT, tmp);
-+            log_message(LOG_DEFAULT, "%s", tmp);
-         }
-     }
-     lib_free(tmp);

diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
deleted file mode 100644
index 357d686..0000000
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
-@@ -102,9 +102,10 @@
- #include "ui-threads.h"
- #endif
- 
--#ifdef USE_XF86_EXTENSIONS
-+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
- #include <gdk/gdkx.h>
- #endif
-+
- #include "x11ui.h"
- 
- #ifdef DEBUG_X11UI
-

diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild
deleted file mode 100644
index 1ee7dc6..0000000
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs flag-o-matic games
-
-DESCRIPTION="The Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk2 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk2 sdl )"
-
-GTK_COMMON="
-	x11-libs/pango
-	x11-libs/cairo"
-#	gtk3? (
-#		x11-libs/gtk+:3
-#		vte? ( x11-libs/vte:2.90 )
-#		${GTK_COMMON}
-#	)
-RDEPEND="
-	virtual/jpeg:0
-	virtual/opengl
-	media-libs/giflib
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdlsound? ( media-libs/libsdl[sound] )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	lame? ( media-sound/lame )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )
-	sdl? (
-		media-libs/libsdl[joystick,video]
-	)
-	!sdl? (
-		fullscreen? (
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm )
-		x11-libs/libX11
-		x11-libs/libXext
-		sys-libs/readline
-	)
-	gtk2? (
-		x11-libs/gtk+:2
-		vte? ( x11-libs/vte:0 )
-		x11-libs/gtkglext
-		${GTK_COMMON}
-	)
-	!sdl? ( !gtk2? (
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libXv
-		Xaw3d? ( x11-libs/libXaw3d )
-		!Xaw3d? ( x11-libs/libXaw )
-	) )
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!sdl? (
-		fullscreen? ( x11-proto/xf86vidmodeproto )
-		!gtk2? (
-			x11-libs/libICE
-			x11-libs/libSM
-		)
-	)
-	x11-apps/bdftopcf
-	x11-apps/mkfontdir
-	x11-proto/xproto
-	x11-proto/xextproto
-	media-libs/fontconfig
-	x11-proto/videoproto
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-xf86extensions.patch
-	sed -i \
-		-e 's/building//' \
-		doc/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
-		doc/Makefile.am \
-		doc/readmes/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
-		doc/html/Makefile.am || die
-	sed -i \
-		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
-		man/vice.1 \
-		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
-		configure.ac || die
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
-		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-		src/arch/unix/archdep.h \
-		src/arch/sdl/archdep_unix.h || die
-	rm -rf src/lib/{libffmpeg,liblame} || die
-	sed -i \
-		-e '/SUBDIRS/s/libffmpeg//;' \
-		-e '/SUBDIRS/s/liblame//;' \
-		src/lib/Makefile.am || die
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local gui_arg snd_arg
-
-	snd_arg+=" $(use_with alsa)"
-	snd_arg+=" $(use_with oss)"
-	snd_arg+=" $(use_with pulseaudio pulse)"
-	snd_arg+=" $(use_with sdlsound)"
-
-	gui_arg+=" $(use_enable sdl sdlui)"
-	# The gtk UI code has raw calls to XOpenDisplay and
-	# is missing -lX11 if vte doesn't pull it in.
-	#if use gtk2 || use gtk3 ; then
-	if use gtk2 ; then
-		use vte || append-libs -lX11
-	fi
-	gui_arg+=" $(use_enable gtk2 gnomeui)"
-	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
-	gui_arg+=" $(use_enable Xaw3d xaw3d)"
-
-	# --with-readline is forced to avoid using the embedded copy
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	egamesconf \
-		--enable-parsid \
-		--with-resid \
-		--with-readline \
-		--without-arts \
-		--without-midas \
-		$(use_enable ethernet) \
-		$(use_enable ffmpeg) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(use_enable fullscreen) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable nls) \
-		$(use_enable vte) \
-		$(use_with png) \
-		$(use_with threads uithreads) \
-		$(use_with zlib) \
-		${gui_arg} \
-		${snd_arg} \
-		--disable-option-checking
-		# --disable-option-checking has to be last
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog FEEDBACK README" \
-		default
-	prepgamesdirs
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2016-05-30 20:01 Michael Sterrett
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Sterrett @ 2016-05-30 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1e3077b1095f1187c6ab1fb78d57102cf7781f30
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:00:53 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:01:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3077b1

app-emulation/vice: version bump

Package-Manager: portage-2.2.28

 app-emulation/vice/Manifest                        |   1 +
 .../vice/files/vice-2.4.27-autotools.patch         |  11 ++
 app-emulation/vice/vice-2.4.27.ebuild              | 170 +++++++++++++++++++++
 3 files changed, 182 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 64ad041..dde8136 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1 +1,2 @@
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
+DIST vice-2.4.27.tar.gz 25561665 SHA256 ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec WHIRLPOOL 44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch
new file mode 100644
index 0000000..7bebd28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/vice-2.4.27.ebuild b/app-emulation/vice/vice-2.4.27.ebuild
new file mode 100644
index 0000000..f70e449
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.27.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline:0
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:$(games_get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"$(games_get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"$(games_get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	egamesconf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog FEEDBACK README" \
+		default
+	prepgamesdirs
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2018-11-29 22:04 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-11-29 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     1b6961ef0347393ca69eb7e03a3cc07d316d36b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 21:46:13 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 22:04:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6961ef

app-emulation/vice: Fix build with ffmpeg-4

Rename PATCH to PATCHES (again!) and restore missing patch.

Thanks-to: Adam Jones <adam <AT> eidolon.org.uk>
Closes: https://bugs.gentoo.org/670620
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../vice/files/vice-2.4.27-autotools.patch         | 11 ++++
 app-emulation/vice/files/vice-3.1-ffmpeg4.patch    | 74 ++++++++++++++++++++++
 app-emulation/vice/vice-3.1.ebuild                 |  7 +-
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch
new file mode 100644
index 00000000000..7bebd2800ef
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.4.27-autotools.patch
@@ -0,0 +1,11 @@
+--- vice-2.4.7.orig/configure.ac
++++ vice-2.4.7/configure.ac
+@@ -124,7 +118,7 @@
+ AC_SUBST(VICE_VERSION)
+ 
+ AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
+   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
new file mode 100644
index 00000000000..d232ee22337
--- /dev/null
+++ b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
@@ -0,0 +1,74 @@
+--- a/src/gfxoutputdrv/ffmpegdrv.c
++++ b/src/gfxoutputdrv/ffmpegdrv.c
+@@ -46,6 +46,13 @@
+ #include "util.h"
+ #include "soundmovie.h"
+ 
++/** \brief  Helper macro to determine ffmpeg version
++ */
++#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
++# define HAVE_FFMPEG4
++#endif
++
++
+ static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
+     { AV_CODEC_ID_MP2, "MP2" },
+     { AV_CODEC_ID_MP3, "MP3" },
+@@ -354,7 +361,11 @@
+     }
+ 
+     audio_is_open = 1;
++#ifdef HAVE_FFMPEG4
++    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
++#else
+     if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
++#endif
+         audio_inbuf_samples = 10000;
+     } else {
+         audio_inbuf_samples = c->frame_size;
+@@ -447,8 +458,13 @@
+     audio_st.samples_count = 0;
+ 
+     /* Some formats want stream headers to be separate. */
+-    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
++    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
++#ifdef HAVE_FFMPEG4
++        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++#else
+         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++#endif
++    }
+ 
+     /* create resampler context */
+ #ifndef HAVE_FFMPEG_AVRESAMPLE
+@@ -781,7 +797,11 @@
+ 
+     /* Some formats want stream headers to be separate. */
+     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
++#ifdef HAVE_FFMPEG4
++        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
++#else
+         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++#endif
+     }
+ 
+     if (audio_init_done) {
+@@ -961,6 +981,7 @@
+ 
+     video_st.frame->pts = video_st.next_pts++;
+ 
++#ifdef AVFMT_RAWPICTURE
+     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+         AVPacket pkt;
+         VICE_P_AV_INIT_PACKET(&pkt);
+@@ -971,7 +992,9 @@
+         pkt.pts = pkt.dts = video_st.frame->pts;
+ 
+         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
+-    } else {
++    } else
++#endif
++    {
+         AVPacket pkt = { 0 };
+         int got_packet;
+ 

diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
index 6fe9e2623e2..d7267e2b207 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -85,8 +85,9 @@ DEPEND="${RDEPEND}
 		)
 	)"
 
-PATCH=(
-	"${FILESDIR}"/${P}-autotools.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.27-autotools.patch
+	"${FILESDIR}"/${P}-ffmpeg4.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2020-04-14 13:22 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-04-14 13:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8687928d6af65a41eef0fda0f92cd3953563bff0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 13:19:24 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 13:21:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8687928d

app-emulation/vice: Drop old 3.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-emulation/vice/Manifest                        |   1 -
 .../vice/files/vice-2.4.27-autotools.patch         |  11 --
 app-emulation/vice/files/vice-3.1-ffmpeg4.patch    |  74 ---------
 app-emulation/vice/metadata.xml                    |   3 -
 app-emulation/vice/vice-3.1.ebuild                 | 171 ---------------------
 5 files changed, 260 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 5aaf0e57602..a4b74f25b8c 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,2 @@
-DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998

diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch
deleted file mode 100644
index 7bebd2800ef..00000000000
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"

diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
deleted file mode 100644
index d232ee22337..00000000000
--- a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/gfxoutputdrv/ffmpegdrv.c
-+++ b/src/gfxoutputdrv/ffmpegdrv.c
-@@ -46,6 +46,13 @@
- #include "util.h"
- #include "soundmovie.h"
- 
-+/** \brief  Helper macro to determine ffmpeg version
-+ */
-+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
-+# define HAVE_FFMPEG4
-+#endif
-+
-+
- static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
-     { AV_CODEC_ID_MP2, "MP2" },
-     { AV_CODEC_ID_MP3, "MP3" },
-@@ -354,7 +361,11 @@
-     }
- 
-     audio_is_open = 1;
-+#ifdef HAVE_FFMPEG4
-+    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#else
-     if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#endif
-         audio_inbuf_samples = 10000;
-     } else {
-         audio_inbuf_samples = c->frame_size;
-@@ -447,8 +458,13 @@
-     audio_st.samples_count = 0;
- 
-     /* Some formats want stream headers to be separate. */
--    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
-+    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-+    }
- 
-     /* create resampler context */
- #ifndef HAVE_FFMPEG_AVRESAMPLE
-@@ -781,7 +797,11 @@
- 
-     /* Some formats want stream headers to be separate. */
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-     }
- 
-     if (audio_init_done) {
-@@ -961,6 +981,7 @@
- 
-     video_st.frame->pts = video_st.next_pts++;
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-         AVPacket pkt;
-         VICE_P_AV_INIT_PACKET(&pkt);
-@@ -971,7 +992,9 @@
-         pkt.pts = pkt.dts = video_st.frame->pts;
- 
-         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
--    } else {
-+    } else
-+#endif
-+    {
-         AVPacket pkt = { 0 };
-         int got_packet;
- 

diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 8ff137c8c20..2294b11c8d0 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -7,13 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
-		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
 		<flag name="headless">Include the headless variant of the emulator</flag>
 		<flag name="mpg123">Enable mp3@64 cartridge support</flag>
 		<flag name="parport">Enable parallel port SID support</flag>
 		<flag name="pci">Enable PCI device discovery using <pkg>sys-apps/pciutils</pkg></flag>
-		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
-		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">vice-emu</remote-id>

diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
deleted file mode 100644
index 083344470e3..00000000000
--- a/app-emulation/vice/vice-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte Xaw3d zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk sdl )"
-
-#	gtk3? (
-#		x11-libs/cairo
-#		x11-libs/gtk+:3
-#		x11-libs/pango
-#		vte? ( x11-libs/vte:2.90 )
-#	)
-RDEPEND="
-	media-libs/giflib
-	virtual/jpeg:0
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		x11-libs/pango
-		vte? ( x11-libs/vte:0 )
-	)
-	lame? ( media-sound/lame )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl[joystick,video] )
-	!sdl? (
-		sys-libs/readline:0=
-		x11-libs/libX11
-		x11-libs/libXext
-		fullscreen? (
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm
-		)
-		!gtk? (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libXv
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( x11-libs/libXaw )
-		)
-	)
-	sdlsound? ( media-libs/libsdl[sound] )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	media-libs/fontconfig
-	x11-apps/bdftopcf
-	>=x11-apps/mkfontscale-1.2.0
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!gtk? ( !sdl? (
-			x11-libs/libICE
-			x11-libs/libSM
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.27-autotools.patch
-	"${FILESDIR}"/${P}-ffmpeg4.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/building//' \
-		doc/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
-		doc/Makefile.am \
-		doc/readmes/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
-		doc/html/Makefile.am || die
-	sed -i \
-		-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
-		man/vice.1 \
-		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
-		configure.ac || die
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
-		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-		src/arch/unix/archdep.h \
-		src/arch/sdl/archdep_unix.h || die
-	rm -rf src/lib/{libffmpeg,liblame} || die
-	sed -i \
-		-e '/SUBDIRS/s/libffmpeg//;' \
-		-e '/SUBDIRS/s/liblame//;' \
-		src/lib/Makefile.am || die
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local gui_arg=() snd_arg=()
-
-	snd_arg+=( $(use_with alsa) )
-	snd_arg+=( $(use_with oss) )
-	snd_arg+=( $(use_with pulseaudio pulse) )
-	snd_arg+=( $(use_with sdlsound) )
-
-	gui_arg+=( $(use_enable sdl sdlui) )
-	# The gtk UI code has raw calls to XOpenDisplay and
-	# is missing -lX11 if vte doesn't pull it in.
-	#if use gtk2 || use gtk3 ; then
-	if use gtk ; then
-		use vte || append-libs -lX11
-	fi
-	gui_arg+=( $(use_enable gtk gnomeui) )
-	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
-	gui_arg+=( $(use_enable Xaw3d xaw3d) )
-
-	# --with-readline is forced to avoid using the embedded copy
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	econf \
-		--enable-parsid \
-		--with-resid \
-		--with-readline \
-		--without-arts \
-		--without-midas \
-		$(use_enable ethernet) \
-		$(use_enable ffmpeg) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(use_enable fullscreen) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable nls) \
-		$(use_enable vte) \
-		$(use_with png) \
-		$(use_with threads uithreads) \
-		$(use_with zlib) \
-		"${gui_arg[@]}" \
-		"${snd_arg[@]}" \
-		--disable-option-checking
-		# --disable-option-checking has to be last
-}
-
-src_install() {
-	default
-	dodoc FEEDBACK
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2020-09-17 16:27 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-09-17 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     633ba8dd6e962cce120e36c8b7de882f291bd0b7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 16:25:33 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 16:27:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ba8dd

app-emulation/vice: Bump 3.4 to rev 38553

This now adds desktop icons.

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-emulation/vice/Manifest                        |   1 +
 .../vice/files/vice-pkg-config-3.4_p38553.patch    |  29 ++++
 app-emulation/vice/vice-3.4_p38553.ebuild          | 183 +++++++++++++++++++++
 3 files changed, 213 insertions(+)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index a4b74f25b8c..98153090bff 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
+DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
new file mode 100644
index 00000000000..557c0a92731
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
@@ -0,0 +1,29 @@
+https://sourceforge.net/p/vice-emu/patches/218/
+
+Index: configure.ac
+===================================================================
+--- a/configure.ac	(revision 38502)
++++ b/configure.ac	(working copy)
+@@ -1275,6 +1275,14 @@
+   fi
+ 
+   if test x"$found_sdl2" != "xyes"; then
++    PKG_CHECK_MODULES(SDL2, sdl2, [
++      use_sdl_prefix=no
++      use_sdl2_prefix=no
++      found_sdl2=yes
++      VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
++      VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
++      LIBS="$LIBS $SDL2_LIBS"
++    ], [
+     dnl Check for sdl2-config
+     if test x"$sdl2_config" != "xno"; then
+       user_CFLAGS="$CFLAGS"
+@@ -1311,6 +1319,7 @@
+       CFLAGS="$user_CFLAGS"
+       CXXFLAGS="$user_CXXFLAGS"
+     fi
++    ])
+   fi
+ 
+   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
new file mode 100644
index 00000000000..825c3d61a1c
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild xdg
+
+MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/"
+#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
+
+RDEPEND="
+	sys-libs/readline:0=
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	ethernet? (
+		>=net-libs/libpcap-0.9.8
+		>=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	gif? ( media-libs/giflib:= )
+	gtk? (
+		dev-libs/glib:2
+		media-libs/fontconfig:1.0
+		x11-libs/cairo
+		x11-libs/gtk+:3
+		x11-libs/pango
+		opengl? (
+			media-libs/glew:0=
+			virtual/opengl
+		)
+	)
+	jpeg? ( virtual/jpeg )
+	lame? ( media-sound/lame )
+	mpg123? ( media-sound/mpg123 )
+	ogg? (
+		 media-libs/libogg
+		 media-libs/libvorbis
+	)
+	parport? ( sys-libs/libieee1284 )
+	pci? ( sys-apps/pciutils )
+	png? ( media-libs/libpng:0= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[video] )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+BDEPEND="
+	app-arch/unzip
+	dev-embedded/xa
+	dev-lang/perl
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( virtual/texi2dvi )
+"
+
+S="${WORKDIR}/${MY_P}"
+ECONF_SOURCE="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/vice-pkg-config-${PV}.patch
+)
+
+src_prepare() {
+	default
+
+	# Delete some bundled libraries.
+	rm -r src/lib/lib{ffmpeg,lame,x264} || die
+
+	local DIR
+	for DIR in src/resid src/resid-dtv .; do
+		pushd "${DIR}" || die
+		AT_NO_RECURSIVE=1 eautoreconf
+		popd || die
+	done
+
+	# Strip the predefined C(XX)FLAGS.
+	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+}
+
+src_configure() {
+	MULTIBUILD_VARIANTS=(
+		$(usev gtk)
+		$(usev headless)
+		$(usev sdl)
+	)
+
+	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_enable() {
+	if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
+		printf -- "--enable-%s\n" "$2"
+	else
+		printf -- "--disable-%s\n" "$2"
+	fi
+}
+
+multibuild_src_configure() {
+	# Some dependencies lack configure options so prevent them becoming
+	# automagic by using configure cache variables.
+	use pci || export ac_cv_header_pci_pci_h=no
+
+	# Ensure we use giflib, not ungif.
+	export ac_cv_lib_ungif_EGifPutLine=no
+
+	# Append ".variant" to x* programs if building multiple variants.
+	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+	else
+		unset xform
+	fi
+
+	econf \
+		--program-transform-name="${xform}" \
+		--disable-arch \
+		$(use_enable debug) \
+		$(use_enable debug debug-gtk3ui) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(multibuild_enable headless headlessui) \
+		--enable-html-docs \
+		$(use_enable ethernet) \
+		$(use_enable opengl hwscale) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable parport libieee1284) \
+		$(multibuild_enable gtk native-gtk3ui) \
+		$(use_enable doc pdf-docs) \
+		$(use_enable portaudio) \
+		--disable-sdlui \
+		$(multibuild_enable sdl sdlui2) \
+		--disable-shared-ffmpeg \
+		--disable-static-ffmpeg \
+		$(multibuild_enable gtk desktop-files) \
+		$(use_with alsa) \
+		$(use_with gif) \
+		$(use_with jpeg) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with pulseaudio pulse) \
+		$(use_with zlib) \
+		$(use_with mpg123) \
+		$(use_with ogg vorbis) \
+		$(use_with flac)
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_install() {
+	# Get xdg-desktop-menu to play nicely while doing the install.
+	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
+	XDG_UTILS_INSTALL_MODE=system \
+	XDG_DATA_DIRS="${ED}"/usr/share \
+	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
+		multibuild_foreach_variant run_in_build_dir default
+	rm -f "${ED}"/usr/share/applications/*.cache || die
+	dodoc FEEDBACK
+
+	# Delete the bundled fonts. These could be packaged separately but
+	# they're only for the HTML documentation.
+	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2020-09-17 16:27 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-09-17 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ea829542dbcaef08f523fb4a9fd863ec3408519e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 16:26:39 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 16:27:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea829542

app-emulation/vice: Drop old 3.4_p37605

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-emulation/vice/Manifest                    |   1 -
 app-emulation/vice/files/vice-pkg-config.patch |  29 ----
 app-emulation/vice/vice-3.4_p37605.ebuild      | 176 -------------------------
 3 files changed, 206 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 98153090bff..5c23e52b7bf 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,2 @@
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
-DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config.patch b/app-emulation/vice/files/vice-pkg-config.patch
deleted file mode 100644
index d29eff252fb..00000000000
--- a/app-emulation/vice/files/vice-pkg-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/p/vice-emu/patches/218/
-
-Index: configure.proto
-===================================================================
---- a/configure.proto	(revision 37525)
-+++ b/configure.proto	(working copy)
-@@ -1275,6 +1275,14 @@
-   fi
- 
-   if test x"$found_sdl2" != "xyes"; then
-+    PKG_CHECK_MODULES(SDL2, sdl2, [
-+      use_sdl_prefix=no
-+      use_sdl2_prefix=no
-+      found_sdl2=yes
-+      VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
-+      VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
-+      LIBS="$LIBS $SDL2_LIBS"
-+    ], [
-     dnl Check for sdl2-config
-     if test x"$sdl2_config" != "xno"; then
-       user_CFLAGS="$CFLAGS"
-@@ -1311,6 +1319,7 @@
-       CFLAGS="$user_CFLAGS"
-       CXXFLAGS="$user_CXXFLAGS"
-     fi
-+    ])
-   fi
- 
-   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p37605.ebuild
deleted file mode 100644
index 23c94697352..00000000000
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multibuild
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/"
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
-
-RDEPEND="
-	sys-libs/readline:0=
-	virtual/libintl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-		>=net-libs/libpcap-0.9.8
-		>=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	gif? ( media-libs/giflib:= )
-	gtk? (
-		dev-libs/glib:2
-		media-libs/fontconfig:1.0
-		x11-libs/gtk+:3
-		opengl? (
-			media-libs/glew:0=
-			virtual/opengl
-		)
-	)
-	jpeg? ( virtual/jpeg )
-	lame? ( media-sound/lame )
-	mpg123? ( media-sound/mpg123 )
-	ogg? (
-		 media-libs/libogg
-		 media-libs/libvorbis
-	)
-	parport? ( sys-libs/libieee1284 )
-	pci? ( sys-apps/pciutils )
-	png? ( media-libs/libpng:0= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2[video] )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-BDEPEND="
-	app-arch/unzip
-	dev-embedded/xa
-	dev-lang/perl
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	virtual/yacc
-	doc? ( virtual/texi2dvi )
-"
-
-S="${WORKDIR}/${MY_P}"
-ECONF_SOURCE="${S}"
-
-PATCHES=(
-	"${FILESDIR}"/vice-pkg-config.patch
-)
-
-src_prepare() {
-	default
-
-	# Delete some bundled libraries.
-	rm -r src/lib/lib{ffmpeg,lame,x264} || die
-
-	sed "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" < configure.proto > configure.ac || die
-
-	local DIR
-	for DIR in src/resid src/resid-dtv .; do
-		pushd "${DIR}" || die
-		AT_NO_RECURSIVE=1 eautoreconf
-		popd || die
-	done
-
-	# Strip the predefined C(XX)FLAGS.
-	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-}
-
-src_configure() {
-	MULTIBUILD_VARIANTS=(
-		$(usev gtk)
-		$(usev headless)
-		$(usev sdl)
-	)
-
-	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_enable() {
-	if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
-		printf -- "--enable-%s\n" "$2"
-	else
-		printf -- "--disable-%s\n" "$2"
-	fi
-}
-
-multibuild_src_configure() {
-	# Some dependencies lack configure options so prevent them becoming
-	# automagic by using configure cache variables.
-	use flac || export ac_cv_header_FLAC_stream_decoder_h=no
-	use mpg123 || export ac_cv_header_mpg123_h=no
-	use ogg || export ac_cv_header_vorbis_vorbisfile_h=no
-	use pci || export ac_cv_header_pci_pci_h=no
-
-	# Ensure we use giflib, not ungif.
-	export ac_cv_lib_ungif_EGifPutLine=no
-
-	# Append ".variant" to x* programs if building multiple variants.
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-	else
-		unset xform
-	fi
-
-	econf \
-		--program-transform-name="${xform}" \
-		--disable-sdlui \
-		$(multibuild_enable sdl sdlui2) \
-		$(multibuild_enable gtk native-gtk3ui) \
-		$(use_enable debug debug-gtk3ui) \
-		$(multibuild_enable headless headlessui) \
-		$(use_enable opengl hwscale) \
-		--disable-shared-ffmpeg \
-		--disable-static-ffmpeg \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(use_enable ethernet) \
-		$(use_enable ipv6) \
-		$(use_enable parport libieee1284) \
-		$(use_enable portaudio) \
-		$(use_enable lame) \
-		$(use_enable debug) \
-		--disable-arch \
-		$(use_enable doc pdf-docs) \
-		--enable-html-docs \
-		$(use_with pulseaudio pulse) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with gif) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir emake
-}
-
-src_install() {
-	multibuild_foreach_variant run_in_build_dir default
-	dodoc FEEDBACK
-
-	# Delete the bundled fonts. These could be packaged separately but
-	# they're only for the HTML documentation.
-	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/
@ 2021-10-30 13:10 Ionen Wolkens
  0 siblings, 0 replies; 8+ messages in thread
From: Ionen Wolkens @ 2021-10-30 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     467c3fb39b6c659d40f3b39a3e024310ea96aaed
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 10:59:51 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 11:11:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467c3fb3

app-emulation/vice: drop 3.4_p38553

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/vice/Manifest                        |   1 -
 .../vice/files/vice-pkg-config-3.4_p38553.patch    |  29 ----
 app-emulation/vice/vice-3.4_p38553.ebuild          | 185 ---------------------
 3 files changed, 215 deletions(-)

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6d59125ff4d..a40919df8c4 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1 @@
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
-DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86

diff --git a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch b/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
deleted file mode 100644
index 557c0a92731..00000000000
--- a/app-emulation/vice/files/vice-pkg-config-3.4_p38553.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceforge.net/p/vice-emu/patches/218/
-
-Index: configure.ac
-===================================================================
---- a/configure.ac	(revision 38502)
-+++ b/configure.ac	(working copy)
-@@ -1275,6 +1275,14 @@
-   fi
- 
-   if test x"$found_sdl2" != "xyes"; then
-+    PKG_CHECK_MODULES(SDL2, sdl2, [
-+      use_sdl_prefix=no
-+      use_sdl2_prefix=no
-+      found_sdl2=yes
-+      VICE_CFLAGS="$VICE_CFLAGS $SDL2_CFLAGS"
-+      VICE_CXXFLAGS="$VICE_CXXFLAGS $SDL2_CFLAGS"
-+      LIBS="$LIBS $SDL2_LIBS"
-+    ], [
-     dnl Check for sdl2-config
-     if test x"$sdl2_config" != "xno"; then
-       user_CFLAGS="$CFLAGS"
-@@ -1311,6 +1319,7 @@
-       CFLAGS="$user_CFLAGS"
-       CXXFLAGS="$user_CXXFLAGS"
-     fi
-+    ])
-   fi
- 
-   dnl fail if SDL2 ui was requested, otherwise restore flags and continue

diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
deleted file mode 100644
index 17bb3310b2a..00000000000
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multibuild xdg
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
-
-DESCRIPTION="The Versatile Commodore Emulator"
-HOMEPAGE="https://vice-emu.sourceforge.io/"
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
-REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
-
-RDEPEND="
-	sys-libs/readline:0=
-	virtual/libintl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-		>=net-libs/libpcap-0.9.8
-		>=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	gif? ( media-libs/giflib:= )
-	gtk? (
-		dev-libs/glib:2
-		media-libs/fontconfig:1.0
-		x11-libs/cairo
-		x11-libs/gtk+:3
-		x11-libs/pango
-		opengl? (
-			media-libs/glew:0=
-			virtual/opengl
-		)
-	)
-	jpeg? ( virtual/jpeg )
-	lame? ( media-sound/lame )
-	mpg123? ( media-sound/mpg123 )
-	ogg? (
-		 media-libs/libogg
-		 media-libs/libvorbis
-	)
-	parport? ( sys-libs/libieee1284 )
-	pci? ( sys-apps/pciutils )
-	png? ( media-libs/libpng:0= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2[video] )
-	zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-BDEPEND="
-	app-arch/unzip
-	app-text/dos2unix
-	dev-embedded/xa
-	dev-lang/perl
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	virtual/yacc
-	doc? ( virtual/texi2dvi )
-	gtk? ( x11-misc/xdg-utils )
-"
-
-S="${WORKDIR}/${MY_P}"
-ECONF_SOURCE="${S}"
-
-PATCHES=(
-	"${FILESDIR}"/vice-pkg-config-${PV}.patch
-)
-
-src_prepare() {
-	default
-
-	# Delete some bundled libraries.
-	rm -r src/lib/lib{ffmpeg,lame,x264} || die
-
-	local DIR
-	for DIR in src/resid src/resid-dtv .; do
-		pushd "${DIR}" || die
-		AT_NO_RECURSIVE=1 eautoreconf
-		popd || die
-	done
-
-	# Strip the predefined C(XX)FLAGS.
-	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
-}
-
-src_configure() {
-	MULTIBUILD_VARIANTS=(
-		$(usev gtk)
-		$(usev headless)
-		$(usev sdl)
-	)
-
-	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
-}
-
-multibuild_enable() {
-	if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
-		printf -- "--enable-%s\n" "$2"
-	else
-		printf -- "--disable-%s\n" "$2"
-	fi
-}
-
-multibuild_src_configure() {
-	# Some dependencies lack configure options so prevent them becoming
-	# automagic by using configure cache variables.
-	use pci || export ac_cv_header_pci_pci_h=no
-
-	# Ensure we use giflib, not ungif.
-	export ac_cv_lib_ungif_EGifPutLine=no
-
-	# Append ".variant" to x* programs if building multiple variants.
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
-	else
-		unset xform
-	fi
-
-	econf \
-		--program-transform-name="${xform}" \
-		--disable-arch \
-		$(use_enable debug) \
-		$(use_enable debug debug-gtk3ui) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(multibuild_enable headless headlessui) \
-		--enable-html-docs \
-		$(use_enable ethernet) \
-		$(use_enable opengl hwscale) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable parport libieee1284) \
-		$(multibuild_enable gtk native-gtk3ui) \
-		$(use_enable doc pdf-docs) \
-		$(use_enable portaudio) \
-		--disable-sdlui \
-		$(multibuild_enable sdl sdlui2) \
-		--disable-shared-ffmpeg \
-		--disable-static-ffmpeg \
-		$(multibuild_enable gtk desktop-files) \
-		$(use_with alsa) \
-		$(use_with gif) \
-		$(use_with jpeg) \
-		$(use_with oss) \
-		$(use_with png) \
-		$(use_with pulseaudio pulse) \
-		$(use_with zlib) \
-		$(use_with mpg123) \
-		$(use_with ogg vorbis) \
-		$(use_with flac)
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir emake
-}
-
-src_install() {
-	# Get xdg-desktop-menu to play nicely while doing the install.
-	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
-	XDG_UTILS_INSTALL_MODE=system \
-	XDG_DATA_DIRS="${ED}"/usr/share \
-	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
-		multibuild_foreach_variant run_in_build_dir default
-	rm -f "${ED}"/usr/share/applications/*.cache || die
-	dodoc FEEDBACK
-
-	# Delete the bundled fonts. These could be packaged separately but
-	# they're only for the HTML documentation.
-	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-10-30 13:10 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 16:27 [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/files/, app-emulation/vice/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2021-10-30 13:10 Ionen Wolkens
2020-09-17 16:27 James Le Cuirot
2020-04-14 13:22 James Le Cuirot
2018-11-29 22:04 Andreas Sturmlechner
2016-05-30 20:01 Michael Sterrett
2015-12-29  7:41 Michael Sterrett
2015-11-12  4:07 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox