1 |
yngwin 08/04/14 01:12:20 |
2 |
|
3 |
Added: transcode-1.1.0_alpha7-new-ffmpeg-headers.patch |
4 |
Log: |
5 |
Adding latest transcode-1.1.0_alpha for testing with new ffmpeg (hardmasked) |
6 |
(Portage version: 2.1.5_rc3) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/transcode/files/transcode-1.1.0_alpha7-new-ffmpeg-headers.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: transcode-1.1.0_alpha7-new-ffmpeg-headers.patch |
15 |
=================================================================== |
16 |
diff -burN transcode-1.1.0alpha7.orig/configure.in transcode-1.1.0alpha7/configure.in |
17 |
--- transcode-1.1.0alpha7.orig/configure.in 2008-01-27 16:22:30.000000000 +0100 |
18 |
+++ transcode-1.1.0alpha7/configure.in 2008-04-14 02:09:54.000000000 +0200 |
19 |
@@ -598,14 +598,14 @@ |
20 |
esac], |
21 |
[enable_libavcodec_static=no]) |
22 |
LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs libavcodec)" |
23 |
-TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/avcodec.h], |
24 |
+TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [libavcodec/avcodec.h], |
25 |
avcodec, avcodec_thread_init, libavcodec, [http://www.ffmpeg.org/]) |
26 |
if test x"$have_libavcodec" = x"yes" ; then |
27 |
save_CPPFLAGS="$CPPFLAGS" |
28 |
CPPFLAGS="$CPPFLAGS $LIBAVCODEC_CFLAGS" |
29 |
AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
30 |
#include <stdio.h> |
31 |
-#include <ffmpeg/avcodec.h> |
32 |
+#include <libavcodec/avcodec.h> |
33 |
int |
34 |
main() |
35 |
{ |
36 |
@@ -625,8 +625,8 @@ |
37 |
[LIBAVCODEC_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`" |
38 |
LIBAVCODEC_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"], |
39 |
[AC_MSG_RESULT([failed]) |
40 |
- TC_PKG_ERROR(libavcodec, ffmpeg/avcodec.h, required, FFmpeg, [http://www.ffmpeg.org], |
41 |
- [cannot compile ffmpeg/avcodec.h])], |
42 |
+ TC_PKG_ERROR(libavcodec, libavcodec/avcodec.h, required, FFmpeg, [http://www.ffmpeg.org], |
43 |
+ [cannot compile libavcodec/avcodec.h])], |
44 |
[AC_MSG_RESULT([cross compiling; assumed OK...]) |
45 |
LIBAVCODEC_VERSION="" |
46 |
LIBAVCODEC_BUILD=""]) |
47 |
@@ -637,7 +637,7 @@ |
48 |
save_LIBS="$LIBS" |
49 |
dnl $_w_libavcodec_l comes from TC_PKG_CHECK() |
50 |
LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $LIBAVCODEC_EXTRA_LIBS" |
51 |
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffmpeg/avcodec.h>],[[ |
52 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libavcodec/avcodec.h>],[[ |
53 |
AVCodecContext *ctx = (void *)0; |
54 |
avcodec_thread_init(ctx, 0); |
55 |
]])], |
56 |
@@ -665,15 +665,15 @@ |
57 |
esac], |
58 |
[enable_libavformat_static=no]) |
59 |
LIBAVFORMAT_EXTRA_LIBS="$LIBAVFORMAT_EXTRA_LIBS $($PKG_CONFIG --libs libavformat)" |
60 |
-TC_PKG_CHECK(libavformat, required, LIBAVFORMAT, no, [ffmpeg/avformat.h], |
61 |
+TC_PKG_CHECK(libavformat, required, LIBAVFORMAT, no, [libavformat/avformat.h], |
62 |
avformat, av_register_all, libavformat, [http://www.ffmpeg.org/]) |
63 |
if test x"$have_libavformat" = x"yes" ; then |
64 |
save_CPPFLAGS="$CPPFLAGS" |
65 |
CPPFLAGS="$CPPFLAGS $LIBAVFORMAT_CFLAGS" |
66 |
AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
67 |
#include <stdio.h> |
68 |
-#include <ffmpeg/avformat.h> |
69 |
-#include <ffmpeg/avcodec.h> |
70 |
+#include <libavformat/avformat.h> |
71 |
+#include <libavcodec/avcodec.h> |
72 |
int |
73 |
main() |
74 |
{ |
75 |
@@ -693,8 +693,8 @@ |
76 |
[LIBAVFORMAT_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`" |
77 |
LIBAVFORMAT_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"], |
78 |
[AC_MSG_RESULT([failed]) |
79 |
- TC_PKG_ERROR(libavformat, ffmpeg/avformat.h, required, FFmpeg, [http://www.ffmpeg.org], |
80 |
- [cannot compile ffmpeg/avformat.h])], |
81 |
+ TC_PKG_ERROR(libavformat, libavformat/avformat.h, required, FFmpeg, [http://www.ffmpeg.org], |
82 |
+ [cannot compile libavformat/avformat.h])], |
83 |
[AC_MSG_RESULT([cross compiling; assumed OK...]) |
84 |
LIBAVCODEC_VERSION="" |
85 |
LIBAVCODEC_BUILD=""]) |
86 |
@@ -705,7 +705,7 @@ |
87 |
save_LIBS="$LIBS" |
88 |
dnl $_w_libavcodec_l comes from TC_PKG_CHECK() |
89 |
LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $w_libavformat_l${deflib}/libavformat.a $LIBAVFORMAT_EXTRA_LIBS" |
90 |
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffmpeg/avcodec.h>],[[ |
91 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libavcodec/avcodec.h>],[[ |
92 |
av_register_all(); |
93 |
]])], |
94 |
[LIBAVFORMAT_LIBS="$LIBS $w_libavcodec_l${deflib}/libavcodec.a $w_libavformat_l${deflib}/libavformat.a $LIBAVFORMAT_EXTRA_LIBS"], |
95 |
diff -burN transcode-1.1.0alpha7.orig/export/ffmpeg_cfg.h transcode-1.1.0alpha7/export/ffmpeg_cfg.h |
96 |
--- transcode-1.1.0alpha7.orig/export/ffmpeg_cfg.h 2006-04-17 17:48:43.000000000 +0200 |
97 |
+++ transcode-1.1.0alpha7/export/ffmpeg_cfg.h 2008-04-14 02:10:29.000000000 +0200 |
98 |
@@ -2,7 +2,7 @@ |
99 |
#define __FFMPEG_CFG_H |
100 |
|
101 |
#include "libtc/cfgfile.h" |
102 |
-#include <ffmpeg/avcodec.h> |
103 |
+#include <libavcodec/avcodec.h> |
104 |
|
105 |
//char *lavc_param_vcodec = "mpeg4"; |
106 |
//extern int lavc_param_vbitrate; |
107 |
diff -burN transcode-1.1.0alpha7.orig/filter/filter_resample.c transcode-1.1.0alpha7/filter/filter_resample.c |
108 |
--- transcode-1.1.0alpha7.orig/filter/filter_resample.c 2007-06-06 22:37:16.000000000 +0200 |
109 |
+++ transcode-1.1.0alpha7/filter/filter_resample.c 2008-04-14 02:12:20.000000000 +0200 |
110 |
@@ -37,7 +37,7 @@ |
111 |
#include "libtc/optstr.h" |
112 |
#include "libtc/tcmodule-plugin.h" |
113 |
|
114 |
-#include <ffmpeg/avcodec.h> |
115 |
+#include <libavcodec/avcodec.h> |
116 |
|
117 |
typedef struct |
118 |
{ |
119 |
diff -burN transcode-1.1.0alpha7.orig/libtc/tcavcodec.h transcode-1.1.0alpha7/libtc/tcavcodec.h |
120 |
--- transcode-1.1.0alpha7.orig/libtc/tcavcodec.h 2007-08-08 19:53:33.000000000 +0200 |
121 |
+++ transcode-1.1.0alpha7/libtc/tcavcodec.h 2008-04-14 02:13:42.000000000 +0200 |
122 |
@@ -27,9 +27,9 @@ |
123 |
#include "config.h" |
124 |
#endif |
125 |
|
126 |
-#include <ffmpeg/avformat.h> |
127 |
-#include <ffmpeg/avcodec.h> |
128 |
-#include <ffmpeg/avutil.h> |
129 |
+#include <libavformat/avformat.h> |
130 |
+#include <libavcodec/avcodec.h> |
131 |
+#include <libavutil/avutil.h> |
132 |
|
133 |
/*************************************************************************/ |
134 |
|
135 |
diff -burN transcode-1.1.0alpha7.orig/configure.in transcode-1.1.0alpha7/configure.in |
136 |
--- transcode-1.1.0alpha7.orig/configure.in 2008-04-14 02:27:10.000000000 +0200 |
137 |
+++ transcode-1.1.0alpha7/configure.in 2008-04-14 02:32:52.000000000 +0200 |
138 |
@@ -822,7 +822,7 @@ |
139 |
dnl libpostproc |
140 |
dnl |
141 |
LIBPOSTPROC_EXTRA_LIBS="$LIBPOSTPROC_EXTRA_LIBS $($PKG_CONFIG --libs libpostproc)" |
142 |
-TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, [postproc/postprocess.h], |
143 |
+TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, [libpostproc/postprocess.h], |
144 |
postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/]) |
145 |
TC_PKG_HAVE(libpostproc, LIBPOSTPROC) |
146 |
|
147 |
|
148 |
|
149 |
|
150 |
-- |
151 |
gentoo-commits@l.g.o mailing list |