X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=app-cdr%2Fk3b%2Ffiles%2Fk3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch;fp=app-cdr%2Fk3b%2Ffiles%2Fk3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch;h=dc9bee0d07693239f54cf0bf7510f1f981443520;hb=bfddecd5da91a74e695fdb1e535481b764f52d35;hp=0000000000000000000000000000000000000000;hpb=809e43b0c9a43a81d3545c6ac2cf1e810cb50106;p=overlay.git 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 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 +- #include ++ #include ++ #include + } + + 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 +- #include ++ #include ++ #include + } + + 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 +- #include ++ #include ++ #include + } + + 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 +- #include ++ #include ++ #include + } + + 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 + #include + + extern "C" { +-#include ++#include + } + + #include + + +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 + + #include "k3bffmpegwrapper.h" + + extern "C" { +-#include +-#include ++#include ++#include + } + + #include + + #include