Add app-cdr/k3b-1.0.5-r6.

[overlay.git] / app-cdr / k3b / files / k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch

diff --git a/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
new file mode 100644 (file)
index 0000000..dc9bee0
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
@@ -0,0 +1,100 @@
+diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in        2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/configure.in     2008-07-07 20:39:13.000000000 +0200
+@@ -574,12 +574,12 @@
+       AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+       AC_LANG_SAVE
+       AC_LANG_CPLUSPLUS
+       AC_COMPILE_IFELSE( 
+               extern "C" {
+-              #include <ffmpeg/avformat.h>
+-              #include <ffmpeg/avcodec.h>
++              #include <libavformat/avformat.h>
++              #include <libavcodec/avcodec.h>
+               }
+ 
+               int main() {
+                 AVFormatContext* fc = 0;
+                 AVPacket* p = 0;
+@@ -589,12 +589,12 @@
+       [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+       OLD_LIBS=$LIBS
+       LIBS="-lavformat -lavcodec $LIBS"
+       AC_LINK_IFELSE( 
+               extern "C" {
+-              #include <ffmpeg/avformat.h>
+-              #include <ffmpeg/avcodec.h>
++              #include <libavformat/avformat.h>
++              #include <libavcodec/avcodec.h>
+               }
+ 
+               int main() {
+                 AVFormatContext* fc = 0;
+                 AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in      2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in   2008-07-07 20:43:02.000000000 +0200
+@@ -19,12 +19,12 @@
+       AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+       AC_LANG_SAVE
+       AC_LANG_CPLUSPLUS
+       AC_COMPILE_IFELSE( 
+               extern "C" {
+-              #include <ffmpeg/avformat.h>
+-              #include <ffmpeg/avcodec.h>
++              #include <libavformat/avformat.h>
++              #include <libavcodec/avcodec.h>
+               }
+ 
+               int main() {
+                 AVFormatContext* fc = 0;
+                 AVPacket* p = 0;
+@@ -34,12 +34,12 @@
+       [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+       OLD_LIBS=$LIBS
+       LIBS="-lavformat -lavcodec $LIBS"
+       AC_LINK_IFELSE( 
+               extern "C" {
+-              #include <ffmpeg/avformat.h>
+-              #include <ffmpeg/avcodec.h>
++              #include <libavformat/avformat.h>
++              #include <libavcodec/avcodec.h>
+               }
+ 
+               int main() {
+                 AVFormatContext* fc = 0;
+                 AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp      2008-07-07 20:45:07.000000000 +0200
+@@ -20,11 +20,11 @@
+ 
+ #include <kdebug.h>
+ #include <k3bpluginfactory.h>
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include <math.h>
+ 
+ 
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp      2008-07-07 20:44:02.000000000 +0200
+@@ -16,12 +16,12 @@
+ #include <config.h>
+ 
+ #include "k3bffmpegwrapper.h"
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include <string.h>
+ 
+ #include <klocale.h>