summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-07-03 15:01:30 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-07-03 15:01:30 +0000
commita2d42a7270bbc2ec16df542f476146f34c5124b5 (patch)
treefc8d39f3b88b53edc3bb8464be8785580d5a9509 /media-video/noad
parentAdded a little workaround to prevent drbd crashes. (diff)
downloadgentoo-2-a2d42a7270bbc2ec16df542f476146f34c5124b5.tar.gz
gentoo-2-a2d42a7270bbc2ec16df542f476146f34c5124b5.tar.bz2
gentoo-2-a2d42a7270bbc2ec16df542f476146f34c5124b5.zip
Added patch to compile with ffmpeg-0.4.9_p20070616-r1
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'media-video/noad')
-rw-r--r--media-video/noad/ChangeLog7
-rw-r--r--media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff14
-rw-r--r--media-video/noad/files/patches-0.6.0/series1
-rw-r--r--media-video/noad/noad-0.6.0-r9.ebuild3
4 files changed, 23 insertions, 2 deletions
diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d51a9552abc3..bbaf375d0509 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/noad
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.28 2007/06/12 16:04:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.29 2007/07/03 15:01:30 zzam Exp $
+
+ 03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/patches-0.6.0/new-ffmpeg-extern-c.diff, files/patches-0.6.0/series,
+ noad-0.6.0-r9.ebuild:
+ Added patch to compile with ffmpeg-0.4.9_p20070616-r1
12 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
files/0.6.0-r7/record-50-noad.sh:
diff --git a/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff b/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
new file mode 100644
index 000000000000..5726cab796c3
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
@@ -0,0 +1,14 @@
+Index: noad-0.6.0/audiotools.cpp
+===================================================================
+--- noad-0.6.0.orig/audiotools.cpp
++++ noad-0.6.0/audiotools.cpp
+@@ -3,7 +3,9 @@
+ #ifdef HAVE_LIBAVCODEC
+
+ #include "mpeg2wrap.h"
++extern "C" {
+ #include "avcodec.h"
++}
+
+ #define MIN_LOWVALS 3
+ #define CUT_VAL 10
diff --git a/media-video/noad/files/patches-0.6.0/series b/media-video/noad/files/patches-0.6.0/series
index 1753631f9bde..67c440e7bf58 100644
--- a/media-video/noad/files/patches-0.6.0/series
+++ b/media-video/noad/files/patches-0.6.0/series
@@ -4,3 +4,4 @@ cflags.diff
framesize.diff
delete-while-scanning.diff
fix-osd.patch
+new-ffmpeg-extern-c.diff
diff --git a/media-video/noad/noad-0.6.0-r9.ebuild b/media-video/noad/noad-0.6.0-r9.ebuild
index 048ada8cb606..a2d4cce175af 100644
--- a/media-video/noad/noad-0.6.0-r9.ebuild
+++ b/media-video/noad/noad-0.6.0-r9.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-video/noad/noad-0.6.0-r9.ebuild,v 1.2 2007/05/27 16:46:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r9.ebuild,v 1.3 2007/07/03 15:01:30 zzam Exp $
WANT_AUTOMAKE="latest"
WANT_AUTOCONF="latest"
@@ -33,6 +33,7 @@ src_unpack() {
epatch ${FILESDIR}/patches-${PV}/delete-while-scanning.diff
epatch ${FILESDIR}/patches-${PV}/fix-osd.patch
epatch ${FILESDIR}/patches-${PV}/hangcheck.diff
+ epatch ${FILESDIR}/patches-${PV}/new-ffmpeg-extern-c.diff
rm configure
eautoreconf