From 3292903aa690ce88723b56bab17593fbee8c43e1 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 13 Dec 2011 18:23:07 +0000 Subject: [PATCH] Add patch to build with newer ffmpeg from Michael (kensington) (bug #394341) Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- app-emulation/vice/ChangeLog | 6 ++- app-emulation/vice/Manifest | 19 ++------ app-emulation/vice/files/vice-2.3-libav.patch | 47 +++++++++++++++++++ app-emulation/vice/vice-2.3.ebuild | 6 ++- 4 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 app-emulation/vice/files/vice-2.3-libav.patch 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 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 -vice-2.2.ebuild, -files/vice-2.2-xshm.patch: diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 522b5ea27ffb..358cf45f4645 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,19 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX vice-2.3-libav.patch 1615 RMD160 4a55939bb57a70cf211bafaeb94ac977d2ffd9ba SHA1 4040ef15d88178b3e4be47b530822be472ed5ea5 SHA256 291aed241bfef7549f0b79e674fd60541cdfd02a881c2fd45bad3ebafaa451f0 AUX vice-2.3-notexi.patch 395 RMD160 7826ca7349482120daea173be5c838ff00d3776c SHA1 9fcb7442b97db56ecb16d5b0c8c11387f9434581 SHA256 15897692063aac52306082f5ce933a17ba94ecfe8a5c3b65f72db62d478cefbc DIST vice-2.3.tar.gz 11602378 RMD160 056e48ffedfaecd470892c73b97af89c1e002ff9 SHA1 5e7e1a375a4ca8c4895dc1552162955fdffce296 SHA256 b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e -EBUILD vice-2.3.ebuild 2901 RMD160 fd8bfb9492bd89d4aaece9ebcdb3565b577eb7da SHA1 a3e75d11fcf615cdad3ac1ee26d0ce16d0c5fc0c SHA256 827e1ef6703108c70e35448e7d7abc98a2e39e1fa448db6350d9ef4a75f0b4c6 -MISC ChangeLog 10317 RMD160 eeb982f2cb96841840a8abce064e1fb385dc848e SHA1 f02250b8596eec84ce859f6294dde8cb3e4f0f96 SHA256 54e44437784c7640d37deaadbf881a09d91e0fd0810f81d7e025bcbb8c035121 +EBUILD vice-2.3.ebuild 2940 RMD160 6e46d27c1557d43c6b034c4747545dd04a8c60f6 SHA1 fa317fc281eedcc5960d8824e3e4853e05444fea SHA256 0f52f9ac91cf84b84010a73bbf2404fe453ef1cd8c79a57c2d6039adf724c49c +MISC ChangeLog 10500 RMD160 56899ef1c476c4a0dab2581b22ae22e64a64dd4d SHA1 99ed24fa7f5fc07ee9e97a454904f659bba601a6 SHA256 196e446cf94f065d2c3962a730529689761264794c61866ac897fbca3e27fc16 MISC metadata.xml 355 RMD160 2be86be120d60193f7debc4eac5b87274ea71d0e SHA1 47edf967eca28ee36ba41788a9f2f55330b6a1b4 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQEcBAEBAgAGBQJOu0fUAAoJEEdUh39IaPFNXdcH/2qY+5HQnmZeMIELCoIkJPNw -x3U08fGiao7rRSkJY3p8PBYStugapla6bZ2TVt/89eunnU52y/kgQBWQUtvODRbJ -IiE4UUvK405I5Fh+iRUTah0QbK8OhAuXkSDDhrlNKc4a6L/SwAMyW2MtFqZ3V9Bb -yN8LRrx2KyksnmKmXjAf2fji6OlqFn+jDpZOyeS2X2pxHM7HqlVwmtCEdh1/2q6N -UNEvmpgeVu4pKVbKD1AvRZQF3n9dxI1nWvYSu6Q5lrFinWrZrYElimMcemG+YHoN -J3tOx8eglLMqDi7BmBEQlDu0O0P13Cd9QQtcdd09yCvrWpzmIAORm0K9yH3kruI= -=EtN+ ------END PGP SIGNATURE----- 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 \ -- 2.26.2