1 |
yngwin 08/08/06 22:37:30 |
2 |
|
3 |
Added: ffmpeg-headers.patch |
4 |
Log: |
5 |
Adding patch to detect new ffmpeg headers location. Thanks to Rafał Mużyło and Martin von Gagern in bug 218088. |
6 |
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-hg1 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-plugins/alsa-plugins/files/ffmpeg-headers.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/alsa-plugins/files/ffmpeg-headers.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/alsa-plugins/files/ffmpeg-headers.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: ffmpeg-headers.patch |
15 |
=================================================================== |
16 |
diff -ru alsa-plugins-1.0.17.orig/a52/pcm_a52.c alsa-plugins-1.0.17/a52/pcm_a52.c |
17 |
--- alsa-plugins-1.0.17.orig/a52/pcm_a52.c 2008-08-06 18:28:39.000000000 +0200 |
18 |
+++ alsa-plugins-1.0.17/a52/pcm_a52.c 2008-08-06 18:28:54.000000000 +0200 |
19 |
@@ -18,6 +18,7 @@ |
20 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 |
*/ |
22 |
|
23 |
+#include "config.h" |
24 |
#include <stdio.h> |
25 |
#include <string.h> |
26 |
#define __USE_XOPEN |
27 |
@@ -25,7 +26,11 @@ |
28 |
#include <alsa/asoundlib.h> |
29 |
#include <alsa/pcm_external.h> |
30 |
#include <alsa/pcm_plugin.h> |
31 |
+#ifdef HAVE_FFMPEG_AVCODEC_H |
32 |
#include <ffmpeg/avcodec.h> |
33 |
+#elif defined(HAVE_LIBAVCODEC_AVCODEC_H) |
34 |
+#include <libavcodec/avcodec.h> |
35 |
+#endif |
36 |
|
37 |
struct a52_ctx { |
38 |
snd_pcm_ioplug_t io; |
39 |
diff -ru alsa-plugins-1.0.17.orig/configure.in alsa-plugins-1.0.17/configure.in |
40 |
--- alsa-plugins-1.0.17.orig/configure.in 2008-08-06 18:28:39.000000000 +0200 |
41 |
+++ alsa-plugins-1.0.17/configure.in 2008-08-06 18:31:00.000000000 +0200 |
42 |
@@ -77,7 +77,7 @@ |
43 |
if test "x$enable_avcodec" != "xno"; then |
44 |
AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) |
45 |
if test x$HAVE_AVCODEC = xyes; then |
46 |
- AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no]) |
47 |
+ AC_CHECK_HEADERS([ffmpeg/avcodec.h], , [AC_CHECK_HEADERS([libavcodec/avcodec.h], , [HAVE_AVCODEC=no])]) |
48 |
fi |
49 |
fi |
50 |
AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) |
51 |
diff -ru alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c |
52 |
--- alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c 2008-08-06 18:28:39.000000000 +0200 |
53 |
+++ alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c 2008-08-06 18:28:54.000000000 +0200 |
54 |
@@ -16,10 +16,15 @@ |
55 |
* Lesser General Public License for more details. |
56 |
*/ |
57 |
|
58 |
+#include "config.h" |
59 |
#include <stdio.h> |
60 |
#include <alsa/asoundlib.h> |
61 |
#include <alsa/pcm_rate.h> |
62 |
+#ifdef HAVE_FFMPEG_AVCODEC_H |
63 |
#include <ffmpeg/avcodec.h> |
64 |
+#elif defined(HAVE_LIBAVCODEC_AVCODEC_H) |
65 |
+#include <libavcodec/avcodec.h> |
66 |
+#endif |
67 |
#include "gcd.h" |
68 |
|
69 |
static int filter_size = 16; |