subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-emulation\/vice\/, app\-emulation\/vice\/files\/"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

2020-04-05 Thread James Le Cuirot

commit: 64eba6176be0318351a64c50fa588d957948bf13
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr  5 21:46:14 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr  5 22:04:55 2020 +
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  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 000..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 000..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 )
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

2018-03-28 Thread Pacho Ramos

commit: 2d4843bd31a8d55d4594e8d167226d35c4c34cfd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Mar 28 18:35:01 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Mar 28 18:35:01 2018 +
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..000
--- 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..000
--- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

2017-01-26 Thread David Seifert

commit: ace68147247dbdbe28003b6ec89614f3d4787c39
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Nov  6 10:40:08 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 22:50:30 2017 +
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 ..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//' \

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

2015-11-10 Thread Michael Sterrett

commit: c41c56e371b9d37548ad78b7a4127c668971c2b3
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Nov 10 08:01:44 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Nov 10 08:02:04 2015 +
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..000
--- 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..000
--- 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 
- #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 @@

Enable ethernet emulation
Enable the ability to run 
fullscreen
-   Use GTK+2 for GUI instead of GTK+3
Enable extra monitor features
Use media-libs/libsdl for 
sound support
Enable support for x11-libs/vte in 
the GTK+ interface

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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

2015-10-19 Thread Alfredo Tupone

commit: 28c4db4acc36d174c11bdd0c4a1a2b342510568c
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Mon Oct 19 15:35:39 2015 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Oct 19 15:36:16 2015 +
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 000..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//' \

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/, app-emulation/vice/files/

5 matches

Site Navigation

Mail list logo

Footer information