diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-07-03 14:22:13 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-07-03 14:22:13 +0000 |
| commit | 94866e2042c3b59b505810ea3ccc6799d41e56f2 (patch) | |
| tree | 9e5539427624f521d16cfa3b3e4ca316571ab672 /media-plugins | |
| parent | alpha/ia64/x86 stable (diff) | |
| download | gentoo-2-94866e2042c3b59b505810ea3ccc6799d41e56f2.tar.gz gentoo-2-94866e2042c3b59b505810ea3ccc6799d41e56f2.tar.bz2 gentoo-2-94866e2042c3b59b505810ea3ccc6799d41e56f2.zip | |
Added patch to compile with ffmpeg-0.4.9_p20070616-r1
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'media-plugins')
4 files changed, 38 insertions, 3 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog index fe736e3b4ad7..4215e2b5a6c9 100644 --- a/media-plugins/vdr-softdevice/ChangeLog +++ b/media-plugins/vdr-softdevice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-softdevice # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.40 2007/05/15 21:24:26 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.41 2007/07/03 14:22:13 zzam Exp $ + + 03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/patches-0.4.0/new-ffmpeg-extern-c.diff, files/patches-0.4.0/series, + vdr-softdevice-0.4.0.20070515.ebuild: + Added patch to compile with ffmpeg-0.4.9_p20070616-r1 *vdr-softdevice-0.4.0.20070515 (15 May 2007) diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff new file mode 100644 index 000000000000..e4fca0bd738c --- /dev/null +++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff @@ -0,0 +1,28 @@ +Index: softdevice-cvs/configure +=================================================================== +--- softdevice-cvs.orig/configure ++++ softdevice-cvs/configure +@@ -173,9 +173,11 @@ test_ffmpeg() + ffmpeg="yes"; + cat > ${TMPC} << EOF + #define __STDC_CONSTANT_MACROS ++extern "C" { + #include <stdlib.h> + #include <avcodec.h> + #include <avformat.h> ++} + int main(void) { + /* if ( avcodec_build() != LIBAVCODEC_BUILD ) { + fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD); +@@ -249,9 +251,11 @@ test_swscale() + cat > ${TMPC} << EOF + #define __STDC_CONSTANT_MACROS + #include <stdlib.h> ++extern "C" { + #include <avcodec.h> + #include <avformat.h> + #include <swscale.h> ++} + int main(void) { + /* if ( avcodec_build() != LIBAVCODEC_BUILD ) { + fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD); diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series index f4d49416df58..3e52f157fc9e 100644 --- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series +++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series @@ -1 +1,2 @@ +new-ffmpeg-extern-c.diff shm-fullscreen-parameter.diff diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild index 8ab61c117710..bddee44070d9 100644 --- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild +++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.1 2007/05/15 21:24:26 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.2 2007/07/03 14:22:13 zzam Exp $ inherit vdr-plugin versionator @@ -55,7 +55,8 @@ DEPEND="${RDEPEND} DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )" PATCHES=" - ${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff" + ${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff + ${FILESDIR}/patches-0.4.0/new-ffmpeg-extern-c.diff" pkg_setup() { vdr-plugin_pkg_setup |