| 1 |
aballier 08/04/01 21:06:47 |
| 2 |
|
| 3 |
Added: xdtv-2.4.0-ffmpegheaders.patch |
| 4 |
Log: |
| 5 |
add a patch to allow building against latest ffmpeg |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/xdtv/files/xdtv-2.4.0-ffmpegheaders.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xdtv-2.4.0-ffmpegheaders.patch |
| 15 |
=================================================================== |
| 16 |
Index: xdtv-2.4.0/configure.in |
| 17 |
=================================================================== |
| 18 |
--- xdtv-2.4.0.orig/configure.in |
| 19 |
+++ xdtv-2.4.0/configure.in |
| 20 |
@@ -1035,6 +1035,11 @@ if test "x$enable_ffmpeg" != "xno"; then |
| 21 |
if test "x$with_external_ffmpeg" = "xyes"; then |
| 22 |
|
| 23 |
PKG_CHECK_MODULES([FFMPEG], [libavcodec libavformat], enable_ffmpeg=yes, enable_ffmpeg=no) |
| 24 |
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) |
| 25 |
+ AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) |
| 26 |
+ AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) |
| 27 |
+ AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h]) |
| 28 |
+ |
| 29 |
|
| 30 |
if test "x$enable_ffmpeg" = "xyes"; then |
| 31 |
echo "*** A modern and external ffmpeg library was found: we use it ***" |
| 32 |
Index: xdtv-2.4.0/src/container-ffmpeg.c |
| 33 |
=================================================================== |
| 34 |
--- xdtv-2.4.0.orig/src/container-ffmpeg.c |
| 35 |
+++ xdtv-2.4.0/src/container-ffmpeg.c |
| 36 |
@@ -23,8 +23,16 @@ |
| 37 |
|
| 38 |
#ifdef HAVE_FFMPEG |
| 39 |
#if LIBAVCODEC_BUILD >= 4754 |
| 40 |
+#if HAVE_LIBAVCODEC_AVCODEC_H |
| 41 |
+#include <libavcodec/avcodec.h> |
| 42 |
+#else |
| 43 |
# include "avcodec.h" |
| 44 |
+#endif |
| 45 |
+#if HAVE_LIBAVFORMAT_AVFORMAT_H |
| 46 |
+#include <libavformat/avformat.h> |
| 47 |
+#else |
| 48 |
# include "avformat.h" |
| 49 |
+#endif |
| 50 |
|
| 51 |
static AVOutputFormat *av_output_fmt = NULL; |
| 52 |
static AVFormatContext *oc=NULL; |
| 53 |
Index: xdtv-2.4.0/src/container.h |
| 54 |
=================================================================== |
| 55 |
--- xdtv-2.4.0.orig/src/container.h |
| 56 |
+++ xdtv-2.4.0/src/container.h |
| 57 |
@@ -14,8 +14,12 @@ |
| 58 |
#include "strtab.h" |
| 59 |
|
| 60 |
#ifdef HAVE_FFMPEG |
| 61 |
+#if HAVE_LIBAVCODEC_AVCODEC_H |
| 62 |
+# include <libavcodec/avcodec.h> |
| 63 |
+#else |
| 64 |
# include "avcodec.h" |
| 65 |
#endif |
| 66 |
+#endif |
| 67 |
|
| 68 |
enum { |
| 69 |
AVI_BUILTIN, |
| 70 |
Index: xdtv-2.4.0/src/divx.h |
| 71 |
=================================================================== |
| 72 |
--- xdtv-2.4.0.orig/src/divx.h |
| 73 |
+++ xdtv-2.4.0/src/divx.h |
| 74 |
@@ -31,11 +31,19 @@ |
| 75 |
#include "container.h" |
| 76 |
|
| 77 |
#ifdef HAVE_FFMPEG |
| 78 |
+#if HAVE_LIBAVCODEC_AVCODEC_H |
| 79 |
+#include <libavcodec/avcodec.h> |
| 80 |
+#else |
| 81 |
# include "avcodec.h" |
| 82 |
+#endif |
| 83 |
#if LIBAVCODEC_BUILD >= 4754 |
| 84 |
+#if HAVE_LIBAVFORMAT_AVFORMAT_H |
| 85 |
+#include <libavformat/avformat.h> |
| 86 |
+#else |
| 87 |
# include "avformat.h" |
| 88 |
#endif |
| 89 |
#endif |
| 90 |
+#endif |
| 91 |
|
| 92 |
#ifdef HAVE_XVID |
| 93 |
# include <xvid.h> |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
-- |
| 98 |
gentoo-commits@l.g.o mailing list |
Archives