| 1 |
aballier 08/06/20 23:43:00 |
| 2 |
|
| 3 |
Modified: series |
| 4 |
Added: 080_all_ffmpegheaders.patch |
| 5 |
Log: |
| 6 |
add a patch to build against latest ffmpeg |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 src/patchsets/gnusound/0.7.4/series |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gnusound/0.7.4/series?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gnusound/0.7.4/series?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gnusound/0.7.4/series?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: series |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gnusound/0.7.4/series,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- series 20 Jun 2008 22:15:58 -0000 1.2 |
| 22 |
+++ series 20 Jun 2008 23:43:00 -0000 1.3 |
| 23 |
@@ -6,3 +6,4 @@ |
| 24 |
050_all_flac-1.1.3.patch |
| 25 |
060_all_ffmpeg.patch |
| 26 |
070_all_gtk212.patch |
| 27 |
+080_all_ffmpegheaders.patch |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 src/patchsets/gnusound/0.7.4/080_all_ffmpegheaders.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gnusound/0.7.4/080_all_ffmpegheaders.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gnusound/0.7.4/080_all_ffmpegheaders.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: 080_all_ffmpegheaders.patch |
| 37 |
=================================================================== |
| 38 |
Index: gnusound-0.7.4/configure.ac |
| 39 |
=================================================================== |
| 40 |
--- gnusound-0.7.4.orig/configure.ac |
| 41 |
+++ gnusound-0.7.4/configure.ac |
| 42 |
@@ -184,10 +184,13 @@ dnl FFMPEG |
| 43 |
AC_ARG_ENABLE(ffmpeg, AC_HELP_STRING([--disable-ffmpeg], [disable support for ffmpeg (default=autodetect)]), [ enable_ffmpeg=$enableval ], [ enable_ffmpeg=yes ]) |
| 44 |
|
| 45 |
if test "x$enable_ffmpeg" = "xyes"; then |
| 46 |
-AC_CHECK_HEADER([ffmpeg/avformat.h], |
| 47 |
+AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h], |
| 48 |
[AC_CHECK_LIB([avformat], [av_open_input_file], |
| 49 |
[AC_DEFINE(HAVE_FFMPEG) |
| 50 |
- echo "-lavformat -lavcodec -lm $use" > ${module_path}/.file_ffmpeg.cflags |
| 51 |
+ extrainc="" |
| 52 |
+ AC_CHECK_HEADER([libavcodec/avcodec.h],extrainc="$extrainc -DLIBAVCODEC_AVCODEC_H=1",[]) |
| 53 |
+ AC_CHECK_HEADER([libavformat/avformat.h],extrainc="$extrainc -DLIBAVFORMAT_AVFORMAT_H=1",[]) |
| 54 |
+ echo "-lavformat -lavcodec -lm $use $extrainc" > ${module_path}/.file_ffmpeg.cflags |
| 55 |
file_drivers="ffmpeg $file_drivers"], |
| 56 |
[echo > ${module_path}/.file_ffmpeg.cflags], [-lavcodec -lm])]) |
| 57 |
fi |
| 58 |
Index: gnusound-0.7.4/modules/file_ffmpeg.c |
| 59 |
=================================================================== |
| 60 |
--- gnusound-0.7.4.orig/modules/file_ffmpeg.c |
| 61 |
+++ gnusound-0.7.4/modules/file_ffmpeg.c |
| 62 |
@@ -37,8 +37,16 @@ |
| 63 |
#warning "Not building ffmpeg support." |
| 64 |
#else |
| 65 |
|
| 66 |
+#if LIBAVCODEC_AVCODEC_H |
| 67 |
+#include <libavcodec/avcodec.h> |
| 68 |
+#else |
| 69 |
#include <ffmpeg/avformat.h> |
| 70 |
+#endif |
| 71 |
+#if LIBAVFORMAT_AVFORMAT_H |
| 72 |
+#include <libavformat/avformat.h> |
| 73 |
+#else |
| 74 |
#include <ffmpeg/avcodec.h> |
| 75 |
+#endif |
| 76 |
|
| 77 |
struct ffmpeg_data { |
| 78 |
AVFormatContext *format_context; |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
-- |
| 83 |
gentoo-commits@l.g.o mailing list |
Archives