summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-12-13 18:23:07 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-12-13 18:23:07 +0000
commitfaf42f19254993fb62454e3eff78fe245fafb3ed (patch)
tree59059210022b8ffe5ce3fcdca327d2811cef1114 /app-emulation
parentChanged static use flag to static-libs. Removed || die from emake. (diff)
downloadgentoo-2-faf42f19254993fb62454e3eff78fe245fafb3ed.tar.gz
gentoo-2-faf42f19254993fb62454e3eff78fe245fafb3ed.tar.bz2
gentoo-2-faf42f19254993fb62454e3eff78fe245fafb3ed.zip
Add patch to build with newer ffmpeg from Michael (kensington) (bug #394341)
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vice/ChangeLog6
-rw-r--r--app-emulation/vice/files/vice-2.3-libav.patch47
-rw-r--r--app-emulation/vice/vice-2.3.ebuild6
3 files changed, 56 insertions, 3 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index 03ee73ab6c0b..2e9a8d7dad8f 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/vice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.79 2011/11/10 03:42:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.80 2011/12/13 18:23:07 mr_bones_ Exp $
+
+ 13 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> vice-2.3.ebuild,
+ +files/vice-2.3-libav.patch:
+ Add patch to build with newer ffmpeg from Michael (kensington) (bug #394341)
10 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -vice-2.2.ebuild,
-files/vice-2.2-xshm.patch:
diff --git a/app-emulation/vice/files/vice-2.3-libav.patch b/app-emulation/vice/files/vice-2.3-libav.patch
new file mode 100644
index 000000000000..6d8f7dac7962
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.3-libav.patch
@@ -0,0 +1,47 @@
+--- src/gfxoutputdrv/ffmpegdrv.c
++++ src/gfxoutputdrv/ffmpegdrv.c
+@@ -342,7 +342,7 @@
+
+ c = st->codec;
+ c->codec_id = ffmpegdrv_fmt->audio_codec;
+- c->codec_type = CODEC_TYPE_AUDIO;
++ c->codec_type = AVMEDIA_TYPE_AUDIO;
+ c->sample_fmt = SAMPLE_FMT_S16;
+
+ /* put sample parameters */
+@@ -370,7 +370,7 @@
+ pkt.size = (*ffmpeglib.p_avcodec_encode_audio)(c,
+ audio_outbuf, audio_outbuf_size, audio_in->buffer);
+ pkt.pts = c->coded_frame->pts;
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = audio_st->index;
+ pkt.data = audio_outbuf;
+
+@@ -559,7 +559,7 @@
+
+ c = st->codec;
+ c->codec_id = ffmpegdrv_fmt->video_codec;
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = video_bitrate;
+@@ -819,7 +819,7 @@
+ if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+ AVPacket pkt;
+ (*ffmpeglib.p_av_init_packet)(&pkt);
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = video_st->index;
+ pkt.data = (uint8_t*)picture;
+ pkt.size = sizeof(AVPicture);
+@@ -840,7 +840,7 @@
+ (*ffmpeglib.p_av_init_packet)(&pkt);
+ pkt.pts = c->coded_frame->pts;
+ if (c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = video_st->index;
+ pkt.data = video_outbuf;
+ pkt.size = out_size;
diff --git a/app-emulation/vice/vice-2.3.ebuild b/app-emulation/vice/vice-2.3.ebuild
index 3f36b2bf1f2e..ed96271c2336 100644
--- a/app-emulation/vice/vice-2.3.ebuild
+++ b/app-emulation/vice/vice-2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.4 2011/10/24 04:12:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.5 2011/12/13 18:23:07 mr_bones_ Exp $
EAPI=2
inherit autotools eutils games
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
src_prepare() {
- epatch "${FILESDIR}"/${P}-notexi.patch
+ epatch \
+ "${FILESDIR}"/${P}-notexi.patch \
+ "${FILESDIR}"/${P}-libav.patch
sed -i \
-e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \
man/vice.1 \