Fix compile with new ffmpeg header locations, Bug #218101.

(Portage version: 2.1.5_rc9)

3 files changed, 124 insertions, 4 deletions

diff --git a/media-video/dvbcut/ChangeLog b/media-video/dvbcut/ChangeLog
index 5ab68983e006..1c76e79e0666 100644
--- a/media-video/dvbcut/ChangeLog
+++ b/media-video/dvbcut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvbcut
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.9 2007/11/23 22:57:07 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.10 2008/05/10 15:11:07 zzam Exp $
+
+  10 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff, dvbcut-0.5.4-r1.ebuild:
+  Fix compile with new ffmpeg header locations, Bug #218101.
 
   23 Nov 2007; Alexis Ballier <aballier@gentoo.org>
   +files/dvbcut-0.5.4-avformat-api-changes.patch, dvbcut-0.5.4-r1.ebuild:
diff --git a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild b/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
index 5dd0249e1600..bd5db3e1e94c 100644
--- a/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
+++ b/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild,v 1.2 2007/11/23 22:57:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.4-r1.ebuild,v 1.3 2008/05/10 15:11:07 zzam Exp $
 
 inherit qt3 eutils
 
@@ -40,6 +40,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-ffmpeg-compat2.patch"
 	epatch "${FILESDIR}/${P}-ffmpeg-compat3.patch"
 	epatch "${FILESDIR}/${P}-avformat-api-changes.patch"
+
+	if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then
+		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326.diff"
+	fi
 }
 
 src_compile() {
diff --git a/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff
new file mode 100644
index 000000000000..e5f1fe225fbf
--- /dev/null
+++ b/media-video/dvbcut/files/dvbcut-0.5.4-ffmpeg-0.4.9_p20080326.diff
@@ -0,0 +1,112 @@
+diff -ru dvbcut-0.5.4-orig/src/avframe.h dvbcut-0.5.4/src/avframe.h
+--- dvbcut-0.5.4-orig/src/avframe.h	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/avframe.h	2008-05-10 16:54:14.084008546 +0200
+@@ -20,9 +20,9 @@
+ #define _DVBCUT_AVFRAME_H
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #ifdef HAVE_LIB_SWSCALE
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ }
+ 
+diff -ru dvbcut-0.5.4-orig/src/lavfmuxer.cpp dvbcut-0.5.4/src/lavfmuxer.cpp
+--- dvbcut-0.5.4-orig/src/lavfmuxer.cpp	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/lavfmuxer.cpp	2008-05-10 16:55:13.324030353 +0200
+@@ -17,7 +17,7 @@
+ */
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ #include <string.h>
+ #include <utility>
+diff -ru dvbcut-0.5.4-orig/src/lavfmuxer.h dvbcut-0.5.4/src/lavfmuxer.h
+--- dvbcut-0.5.4-orig/src/lavfmuxer.h	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/lavfmuxer.h	2008-05-10 16:55:43.134010915 +0200
+@@ -20,7 +20,7 @@
+ #define _DVBCUT_LAVFMUXER_H
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ #include "mpgfile.h"
+ #include "muxer.h"
+diff -ru dvbcut-0.5.4-orig/src/main.cpp dvbcut-0.5.4/src/main.cpp
+--- dvbcut-0.5.4-orig/src/main.cpp	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/main.cpp	2008-05-10 16:58:17.424008441 +0200
+@@ -28,7 +28,7 @@
+ 
+ #include <qapplication.h>
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ #include <qimage.h>
+ #include <qsettings.h>
+diff -ru dvbcut-0.5.4-orig/src/mpgfile.h dvbcut-0.5.4/src/mpgfile.h
+--- dvbcut-0.5.4-orig/src/mpgfile.h	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/mpgfile.h	2008-05-10 16:55:03.334007370 +0200
+@@ -20,7 +20,7 @@
+ #define _DVBCUT_MPGFILE_H
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include <string>
+diff -ru dvbcut-0.5.4-orig/src/playaudio.cpp dvbcut-0.5.4/src/playaudio.cpp
+--- dvbcut-0.5.4-orig/src/playaudio.cpp	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/playaudio.cpp	2008-05-10 16:58:26.614013343 +0200
+@@ -20,7 +20,7 @@
+ #include <stdio.h>
+ #include <ao/ao.h>
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include "playaudio.h"
+diff -ru dvbcut-0.5.4-orig/src/psfile.cpp dvbcut-0.5.4/src/psfile.cpp
+--- dvbcut-0.5.4-orig/src/psfile.cpp	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/psfile.cpp	2008-05-10 16:58:44.414009258 +0200
+@@ -21,7 +21,7 @@
+ #include "stream.h"
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
+diff -ru dvbcut-0.5.4-orig/src/streamdata.h dvbcut-0.5.4/src/streamdata.h
+--- dvbcut-0.5.4-orig/src/streamdata.h	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/streamdata.h	2008-05-10 16:54:54.624010142 +0200
+@@ -22,7 +22,7 @@
+ #include <string>
+ #include <list>
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include "port.h"
+diff -ru dvbcut-0.5.4-orig/src/tsfile.cpp dvbcut-0.5.4/src/tsfile.cpp
+--- dvbcut-0.5.4-orig/src/tsfile.cpp	2008-05-10 16:53:51.834017093 +0200
++++ dvbcut-0.5.4/src/tsfile.cpp	2008-05-10 16:58:35.974008055 +0200
+@@ -23,7 +23,7 @@
+ #include <utility>
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
+