* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/
@ 2015-10-19 15:37 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2015-10-19 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 28c4db4acc36d174c11bdd0c4a1a2b342510568c
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 15:35:39 2015 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 15:36:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c4db4a
app-emulation/vice: Fix format-security Bug #560838
Package-Manager: portage-2.2.20.1
app-emulation/vice/files/vice-2.4.20-format.patch | 20 ++++++++++++++++++++
app-emulation/vice/vice-2.4.20.ebuild | 1 +
2 files changed, 21 insertions(+)
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/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild
index 7bf5976..1ee7dc6 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@@ -88,6 +88,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-autotools.patch \
+ "${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-xf86extensions.patch
sed -i \
-e 's/building//' \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/
@ 2015-11-10 8:02 Michael Sterrett
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett @ 2015-11-10 8:02 UTC (permalink / raw
To: gentoo-commits
commit: c41c56e371b9d37548ad78b7a4127c668971c2b3
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 08:01:44 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 08:02:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41c56e3
version bump; clean old
Package-Manager: portage-2.2.20.1
app-emulation/vice/Manifest | 2 +-
app-emulation/vice/files/vice-2.4.20-format.patch | 20 --------------------
.../vice/files/vice-2.4.20-xf86extensions.patch | 15 ---------------
...-autotools.patch => vice-2.4.22-autotools.patch} | 0
app-emulation/vice/metadata.xml | 1 -
.../vice/{vice-2.4.20.ebuild => vice-2.4.22.ebuild} | 21 +++++++++------------
6 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index bb31cd0..7c68c74 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,2 @@
-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-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/files/vice-2.4.20-autotools.patch b/app-emulation/vice/files/vice-2.4.22-autotools.patch
similarity index 100%
rename from app-emulation/vice/files/vice-2.4.20-autotools.patch
rename to app-emulation/vice/files/vice-2.4.22-autotools.patch
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 9364cf9..242aab2 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -5,7 +5,6 @@
<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.22.ebuild
similarity index 90%
rename from app-emulation/vice/vice-2.4.20.ebuild
rename to app-emulation/vice/vice-2.4.22.ebuild
index 1ee7dc6..407949c 100644
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -11,12 +11,12 @@ 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"
+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="?? ( gtk2 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
GTK_COMMON="
x11-libs/pango
@@ -53,13 +53,13 @@ RDEPEND="
x11-libs/libXext
sys-libs/readline
)
- gtk2? (
+ gtk? (
x11-libs/gtk+:2
vte? ( x11-libs/vte:0 )
x11-libs/gtkglext
${GTK_COMMON}
)
- !sdl? ( !gtk2? (
+ !sdl? ( !gtk? (
x11-libs/libXmu
x11-libs/libXpm
x11-libs/libXt
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sdl? (
fullscreen? ( x11-proto/xf86vidmodeproto )
- !gtk2? (
+ !gtk? (
x11-libs/libICE
x11-libs/libSM
)
@@ -86,10 +86,7 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-autotools.patch \
- "${FILESDIR}"/${P}-format.patch \
- "${FILESDIR}"/${P}-xf86extensions.patch
+ epatch "${FILESDIR}"/${P}-autotools.patch
sed -i \
-e 's/building//' \
doc/Makefile.am || die
@@ -132,10 +129,10 @@ src_configure() {
# 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
+ if use gtk ; then
use vte || append-libs -lX11
fi
- gui_arg+=" $(use_enable gtk2 gnomeui)"
+ gui_arg+=" $(use_enable gtk gnomeui)"
#gui_arg+=" $(use_enable gtk3 gnomeui3)"
gui_arg+=" $(use_enable Xaw3d xaw3d)"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/
@ 2017-01-26 22:57 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-01-26 22:57 UTC (permalink / raw
To: gentoo-commits
commit: ace68147247dbdbe28003b6ec89614f3d4787c39
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 10:40:08 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 22:50:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace68147
app-emulation/vice: Fix compiling with '>=media-video/ffmpeg-3'.
Add a patch to allow compiling '2.4.27-r2' with 'ffmpeg-3' installed.
Backported from: https://sourceforge.net/p/vice-emu/code/31580/
Also change 'PATCH' to 'PATCHES'.
Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2759
.../vice/files/vice-31580-ffmpeg-build.patch | 64 ++++++++++++++++++++++
app-emulation/vice/vice-2.4.27-r2.ebuild | 8 ++-
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
new file mode 100644
index 00000000..82dc342
--- /dev/null
+++ b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
@@ -0,0 +1,64 @@
+# Patch to fix compiling with ffmpeg-3.
+# Backported from: https://sourceforge.net/p/vice-emu/code/31580/
+
+--- /src/gfxoutputdrv/ffmpeglib.h
++++ /src/gfxoutputdrv/ffmpeglib.h
+@@ -76,6 +76,14 @@
+ #define AVCodecID CodecID
+ #endif
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
++#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
++#define VICE_AV_PixelFormat PixelFormat
++#else
++#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
++#define VICE_AV_PixelFormat AVPixelFormat
++#endif
++
+ /* avcodec fucntions */
+ typedef void(*av_init_packet_t)(AVPacket *pkt);
+ typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
+@@ -118,7 +126,7 @@
+
+ /* swscale functions */
+ typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
+- enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat,
++ enum VICE_AV_PixelFormat srcFormat, int dstW, int dstH, enum VICE_AV_PixelFormat dstFormat,
+ int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
+ typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
+ typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* srcSlice[],
+
+--- /src/gfxoutputdrv/ffmpegdrv.c
++++ /src/gfxoutputdrv/ffmpegdrv.c
+@@ -671,8 +671,8 @@
+ picture is needed too. It is then converted to the required
+ output format */
+ video_st.tmp_frame = NULL;
+- if (c->pix_fmt != PIX_FMT_RGB24) {
+- video_st.tmp_frame = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, c->width, c->height);
++ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
++ video_st.tmp_frame = ffmpegdrv_alloc_picture(VICE_AV_PIX_FMT_RGB24, c->width, c->height);
+ if (!video_st.tmp_frame) {
+ log_debug("ffmpegdrv: could not allocate temporary picture");
+ return -1;
+@@ -769,9 +769,9 @@
+
+ #ifdef HAVE_FFMPEG_SWSCALE
+ /* setup scaler */
+- if (c->pix_fmt != PIX_FMT_RGB24) {
++ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+ sws_ctx = VICE_P_SWS_GETCONTEXT
+- (video_width, video_height, PIX_FMT_RGB24,
++ (video_width, video_height, VICE_AV_PIX_FMT_RGB24,
+ video_width, video_height, c->pix_fmt,
+ SWS_BICUBIC,
+ NULL, NULL, NULL);
+@@ -948,7 +948,7 @@
+
+ c = video_st.st->codec;
+
+- if (c->pix_fmt != PIX_FMT_RGB24) {
++ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+ ffmpegdrv_fill_rgb_image(screenshot, video_st.tmp_frame);
+
+ if (sws_ctx != NULL) {
diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild b/app-emulation/vice/vice-2.4.27-r2.ebuild
index 2782d0f..0791ebb 100644
--- a/app-emulation/vice/vice-2.4.27-r2.ebuild
+++ b/app-emulation/vice/vice-2.4.27-r2.ebuild
@@ -85,12 +85,18 @@ DEPEND="${RDEPEND}
x11-proto/videoproto
nls? ( sys-devel/gettext )"
-PATCH=(
+PATCHES=(
"${FILESDIR}"/${P}-autotools.patch
)
#"${FILESDIR}"/vice_rath.txt
src_prepare() {
+ if use ffmpeg && has_version ">=media-video/ffmpeg-3" ; then
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-31580-ffmpeg-build.patch
+ )
+ fi
+
default
sed -i \
-e 's/building//' \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/
@ 2018-03-28 18:36 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2018-03-28 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 2d4843bd31a8d55d4594e8d167226d35c4c34cfd
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 18:35:01 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 18:35:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4843bd
app-emulation/vice: Drop old
Package-Manager: Portage-2.3.26, Repoman-2.3.7
app-emulation/vice/Manifest | 3 -
.../vice/files/vice-2.4.22-autotools.patch | 11 --
.../vice/files/vice-2.4.27-autotools.patch | 11 --
.../vice/files/vice-31580-ffmpeg-build.patch | 64 --------
app-emulation/vice/vice-2.4.22.ebuild | 169 -------------------
app-emulation/vice/vice-2.4.27-r2.ebuild | 179 ---------------------
app-emulation/vice/vice-2.4.27-r3.ebuild | 178 --------------------
app-emulation/vice/vice-2.4.27.ebuild | 169 -------------------
app-emulation/vice/vice-2.4.31.ebuild | 173 --------------------
9 files changed, 957 deletions(-)
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index ff495dc9e4d..cf78f5afb3d 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,4 +1 @@
-DIST vice-2.4.22.tar.gz 25180343 BLAKE2B 9c48539b0ec1604a196211819c43c7cdba970cee404b64fbaa1957bb8167ae9f7f108ba0f54ef0ef82314331694dfc5f6bca0d569ee940d6531ed49cd7bb2ffa SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975
-DIST vice-2.4.27.tar.gz 25561665 BLAKE2B 36e8460ef1e4aed9f83caf2b46924766d6830368c947ddfee68ecf992685f950db9e433238b61c34691dadb719ede4e9c5cc7104279e06140e347b04eb8a97a3 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec
-DIST vice-2.4.31.tar.gz 25898329 BLAKE2B 113be451d322f21488f23711ce971ff7a83538d3dfd516138fec84f27e4933025bbba8cbbc627111aadad437ab7805491286760b4fe9db915307922d00dba27f SHA512 eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94
DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
diff --git a/app-emulation/vice/files/vice-2.4.22-autotools.patch b/app-emulation/vice/files/vice-2.4.22-autotools.patch
deleted file mode 100644
index 7bebd2800ef..00000000000
--- a/app-emulation/vice/files/vice-2.4.22-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.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-31580-ffmpeg-build.patch b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
deleted file mode 100644
index 82dc3421218..00000000000
--- a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# Patch to fix compiling with ffmpeg-3.
-# Backported from: https://sourceforge.net/p/vice-emu/code/31580/
-
---- /src/gfxoutputdrv/ffmpeglib.h
-+++ /src/gfxoutputdrv/ffmpeglib.h
-@@ -76,6 +76,14 @@
- #define AVCodecID CodecID
- #endif
-
-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
-+#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
-+#define VICE_AV_PixelFormat PixelFormat
-+#else
-+#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
-+#define VICE_AV_PixelFormat AVPixelFormat
-+#endif
-+
- /* avcodec fucntions */
- typedef void(*av_init_packet_t)(AVPacket *pkt);
- typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
-@@ -118,7 +126,7 @@
-
- /* swscale functions */
- typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
-- enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat,
-+ enum VICE_AV_PixelFormat srcFormat, int dstW, int dstH, enum VICE_AV_PixelFormat dstFormat,
- int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
- typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
- typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* srcSlice[],
-
---- /src/gfxoutputdrv/ffmpegdrv.c
-+++ /src/gfxoutputdrv/ffmpegdrv.c
-@@ -671,8 +671,8 @@
- picture is needed too. It is then converted to the required
- output format */
- video_st.tmp_frame = NULL;
-- if (c->pix_fmt != PIX_FMT_RGB24) {
-- video_st.tmp_frame = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, c->width, c->height);
-+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
-+ video_st.tmp_frame = ffmpegdrv_alloc_picture(VICE_AV_PIX_FMT_RGB24, c->width, c->height);
- if (!video_st.tmp_frame) {
- log_debug("ffmpegdrv: could not allocate temporary picture");
- return -1;
-@@ -769,9 +769,9 @@
-
- #ifdef HAVE_FFMPEG_SWSCALE
- /* setup scaler */
-- if (c->pix_fmt != PIX_FMT_RGB24) {
-+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
- sws_ctx = VICE_P_SWS_GETCONTEXT
-- (video_width, video_height, PIX_FMT_RGB24,
-+ (video_width, video_height, VICE_AV_PIX_FMT_RGB24,
- video_width, video_height, c->pix_fmt,
- SWS_BICUBIC,
- NULL, NULL, NULL);
-@@ -948,7 +948,7 @@
-
- c = video_st.st->codec;
-
-- if (c->pix_fmt != PIX_FMT_RGB24) {
-+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
- ffmpegdrv_fill_rgb_image(screenshot, video_st.tmp_frame);
-
- if (sws_ctx != NULL) {
diff --git a/app-emulation/vice/vice-2.4.22.ebuild b/app-emulation/vice/vice-2.4.22.ebuild
deleted file mode 100644
index d03e3365e83..00000000000
--- a/app-emulation/vice/vice-2.4.22.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 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
-}
diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild b/app-emulation/vice/vice-2.4.27-r2.ebuild
deleted file mode 100644
index 3ebd21b27dd..00000000000
--- a/app-emulation/vice/vice-2.4.27-r2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-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 ~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 )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-autotools.patch
-)
- #"${FILESDIR}"/vice_rath.txt
-
-src_prepare() {
- if use ffmpeg && has_version ">=media-video/ffmpeg-3" ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-31580-ffmpeg-build.patch
- )
- fi
-
- 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() {
- DOCS="FEEDBACK"
- default
-}
diff --git a/app-emulation/vice/vice-2.4.27-r3.ebuild b/app-emulation/vice/vice-2.4.27-r3.ebuild
deleted file mode 100644
index be11e99dd48..00000000000
--- a/app-emulation/vice/vice-2.4.27-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs flag-o-matic xdg-utils
-
-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 ~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 )"
-
-PATCH=(
- "${FILESDIR}"/${P}-autotools.patch
-)
- #"${FILESDIR}"/vice_rath.txt
-
-src_prepare() {
- # See https://bugs.gentoo.org/599576
- xdg_environment_reset
-
- 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() {
- DOCS="FEEDBACK"
- default
-}
diff --git a/app-emulation/vice/vice-2.4.27.ebuild b/app-emulation/vice/vice-2.4.27.ebuild
deleted file mode 100644
index fa039a36415..00000000000
--- a/app-emulation/vice/vice-2.4.27.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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
-}
diff --git a/app-emulation/vice/vice-2.4.31.ebuild b/app-emulation/vice/vice-2.4.31.ebuild
deleted file mode 100644
index f36bb6969d3..00000000000
--- a/app-emulation/vice/vice-2.4.31.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-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 ~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 )"
-
-PATCH=(
- "${FILESDIR}"/${P}-autotools.patch
-)
- #"${FILESDIR}"/vice_rath.txt
-
-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() {
- DOCS="FEEDBACK"
- default
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/
@ 2020-04-05 22:05 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2020-04-05 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 64eba6176be0318351a64c50fa588d957948bf13
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 5 21:46:14 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 5 22:04:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64eba617
app-emulation/vice: Bump 3.4 to rev 37605, add SDL2 pkg-config patch
This includes GCC 10 fixes.
Closes: https://bugs.gentoo.org/710990
Package-Manager: Portage-2.3.96, Repoman-2.3.20
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 | 179 +++++++++++++++++++++++++
3 files changed, 209 insertions(+)
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index fbe27e05301..5aaf0e57602 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
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-pkg-config.patch b/app-emulation/vice/files/vice-pkg-config.patch
new file mode 100644
index 00000000000..d29eff252fb
--- /dev/null
+++ b/app-emulation/vice/files/vice-pkg-config.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000000..46da7890406
--- /dev/null
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -0,0 +1,179 @@
+# 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="http://vice-emu.sourceforge.net/"
+#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 libav 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? (
+ libav? ( media-video/libav:= )
+ !libav? ( 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] 5+ messages in thread
end of thread, other threads:[~2020-04-05 22:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-28 18:36 [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-04-05 22:05 James Le Cuirot
2017-01-26 22:57 David Seifert
2015-11-10 8:02 Michael Sterrett
2015-10-19 15:37 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox