| 1 |
aballier 08/04/13 20:47:36 |
| 2 |
|
| 3 |
Added: sox-14.0.1-ffmpegheaders.patch |
| 4 |
Log: |
| 5 |
Add a patch to let it build with latest ffmpeg headers layout, bug #215926 |
| 6 |
(Portage version: 2.1.5_rc3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/sox/files/sox-14.0.1-ffmpegheaders.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.0.1-ffmpegheaders.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.0.1-ffmpegheaders.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: sox-14.0.1-ffmpegheaders.patch |
| 15 |
=================================================================== |
| 16 |
Index: sox-14.0.1/configure.ac |
| 17 |
=================================================================== |
| 18 |
--- sox-14.0.1.orig/configure.ac |
| 19 |
+++ sox-14.0.1/configure.ac |
| 20 |
@@ -271,11 +271,16 @@ AC_ARG_WITH(ffmpeg, |
| 21 |
using_ffmpeg=no |
| 22 |
if test "$with_ffmpeg" != "no"; then |
| 23 |
using_ffmpeg=yes |
| 24 |
+ AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h]) |
| 25 |
AC_CHECK_HEADER(ffmpeg/avformat.h, |
| 26 |
[AC_CHECK_LIB(avformat, av_open_input_file, FFMPEG_LIBS="$FFMPEG_LIBS -lavformat", using_ffmpeg=no) |
| 27 |
AC_CHECK_LIB(avutil, av_rescale_q, FFMPEG_LIBS="$FFMPEG_LIBS -lavutil", using_ffmpeg=no) |
| 28 |
AC_CHECK_LIB(avcodec, avcodec_decode_audio2, FFMPEG_LIBS="$FFMPEG_LIBS -lavcodec", using_ffmpeg=no)], |
| 29 |
- using_ffmpeg=no) |
| 30 |
+ [AC_CHECK_HEADER(libavformat/avformat.h, |
| 31 |
+ [AC_CHECK_LIB(avformat, av_open_input_file, FFMPEG_LIBS="$FFMPEG_LIBS -lavformat", using_ffmpeg=no) |
| 32 |
+ AC_CHECK_LIB(avutil, av_rescale_q, FFMPEG_LIBS="$FFMPEG_LIBS -lavutil", using_ffmpeg=no) |
| 33 |
+ AC_CHECK_LIB(avcodec, avcodec_decode_audio2, FFMPEG_LIBS="$FFMPEG_LIBS -lavcodec", using_ffmpeg=no)], |
| 34 |
+ using_ffmpeg=no)]) |
| 35 |
if test "$with_ffmpeg" = "yes" -a "$using_ffmpeg" = "no"; then |
| 36 |
AC_MSG_FAILURE([cannot find ffmpeg]) |
| 37 |
fi |
| 38 |
Index: sox-14.0.1/src/ffmpeg.c |
| 39 |
=================================================================== |
| 40 |
--- sox-14.0.1.orig/src/ffmpeg.c |
| 41 |
+++ sox-14.0.1/src/ffmpeg.c |
| 42 |
@@ -47,7 +47,11 @@ |
| 43 |
#include <stdio.h> |
| 44 |
#include <string.h> |
| 45 |
#include <ctype.h> |
| 46 |
+#if HAVE_LIBAVFORMAT_AVFORMAT_H |
| 47 |
+#include <libavformat/avformat.h> |
| 48 |
+#else |
| 49 |
#include <ffmpeg/avformat.h> |
| 50 |
+#endif |
| 51 |
|
| 52 |
/* Private data for ffmpeg files */ |
| 53 |
typedef struct ffmpeg |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
-- |
| 58 |
gentoo-commits@l.g.o mailing list |
Archives