1 |
aballier 09/01/31 15:08:13 |
2 |
|
3 |
Added: 010_all_picdeps.patch 100_all_ffmpegheaders.patch |
4 |
110_all_implicitdecls.patch 120_all_newffmpeg.patch |
5 |
130_all_swscalecall.patch 140_all_paconfig.patch |
6 |
150_all_ffmpeglink.patch 160_all_externalamr.patch |
7 |
170_all_xlink.patch series |
8 |
Log: |
9 |
initial patchset for gpac 0.4.5 |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 src/patchsets/gpac/0.4.5/010_all_picdeps.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/010_all_picdeps.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/010_all_picdeps.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: 010_all_picdeps.patch |
18 |
=================================================================== |
19 |
Index: gpac/src/Makefile |
20 |
=================================================================== |
21 |
--- gpac.orig/src/Makefile |
22 |
+++ gpac/src/Makefile |
23 |
@@ -193,16 +193,16 @@ lib: $(LIB) |
24 |
|
25 |
#there's a bunch of warnings in there, get rid of them |
26 |
mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include |
27 |
-mcrypt: $(LIBGPAC_MCRYPT) |
28 |
+mcrypt: $(LIBGPAC_MCRYPT) $(LIBGPAC_MCRYPT:%.o=%.opic) |
29 |
|
30 |
scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS) |
31 |
-scenegraph: $(LIBGPAC_SCENE) |
32 |
+scenegraph: $(LIBGPAC_SCENE) $(LIBGPAC_SCENE:%.o=%.opic) |
33 |
|
34 |
mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS) |
35 |
-mediatools: $(LIBGPAC_MEDIATOOLS) |
36 |
+mediatools: $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_MEDIATOOLS:%.o=%.opic) |
37 |
|
38 |
compositor: CFLAGS+=$(COMPOSITOR_CFLAGS) |
39 |
-compositor: $(LIBGPAC_COMPOSITOR) |
40 |
+compositor: $(LIBGPAC_COMPOSITOR) $(LIBGPAC_COMPOSITOR:%.o=%.opic) |
41 |
|
42 |
%.o: %.c |
43 |
$(CC) $(CFLAGS) -c -o $@ $< |
44 |
|
45 |
|
46 |
|
47 |
1.1 src/patchsets/gpac/0.4.5/100_all_ffmpegheaders.patch |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/100_all_ffmpegheaders.patch?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/100_all_ffmpegheaders.patch?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: 100_all_ffmpegheaders.patch |
53 |
=================================================================== |
54 |
Index: gpac/configure |
55 |
=================================================================== |
56 |
--- gpac.orig/configure |
57 |
+++ gpac/configure |
58 |
@@ -112,6 +112,7 @@ OSS_CFLAGS="" |
59 |
OSS_LDFLAGS="" |
60 |
INSTFLAGS="" |
61 |
is_64="no" |
62 |
+FFMPEG_CFLAGS="" |
63 |
|
64 |
#Configure Usage |
65 |
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then |
66 |
@@ -578,6 +579,16 @@ if $cc -o $TMPO $TMPC $LINK_SSL 2> /dev/ |
67 |
has_ssl="yes" |
68 |
fi |
69 |
|
70 |
+cat > $TMPC << EOF |
71 |
+#include <stddef.h> |
72 |
+#include <libavcodec/avcodec.h> |
73 |
+int main( void ) { return 0; } |
74 |
+EOF |
75 |
+ |
76 |
+if $cc -o $TMPO $TMPC -lz -lavcodec -lavformat 2> /dev/null ; then |
77 |
+FFMPEG_CFLAGS="-DNEW_FFMPEG_LAYOUT=1" |
78 |
+has_ffmpeg="system" |
79 |
+fi |
80 |
|
81 |
#look for JPEG support |
82 |
cat > $TMPC << EOF |
83 |
@@ -1573,6 +1584,7 @@ echo "CONFIG_OGG=$has_ogg" >> config.mak |
84 |
echo "CONFIG_VORBIS=$has_vorbis" >> config.mak |
85 |
echo "CONFIG_THEORA=$has_theora" >> config.mak |
86 |
echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak |
87 |
+echo "FFMPEG_CFLAGS=$FFMPEG_CFLAGS" >> config.mak |
88 |
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak |
89 |
echo "CONFIG_ALSA=$has_alsa" >> config.mak |
90 |
echo "CONFIG_JACK=$has_jack" >> config.mak |
91 |
Index: gpac/modules/ffmpeg_in/ffmpeg_in.h |
92 |
=================================================================== |
93 |
--- gpac.orig/modules/ffmpeg_in/ffmpeg_in.h |
94 |
+++ gpac/modules/ffmpeg_in/ffmpeg_in.h |
95 |
@@ -56,15 +56,23 @@ |
96 |
|
97 |
|
98 |
/*include FFMPEG APIs*/ |
99 |
+#if NEW_FFMPEG_LAYOUT |
100 |
+#include <libavformat/avformat.h> |
101 |
+#else |
102 |
#include <ffmpeg/avformat.h> |
103 |
+#endif |
104 |
|
105 |
void gf_av_vlog(void* avcl, int level, const char *fmt, va_list vl); |
106 |
|
107 |
|
108 |
#if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0) |
109 |
#define FFMPEG_SWSCALE |
110 |
+#if NEW_FFMPEG_LAYOUT |
111 |
+#include <libswscale/swscale.h> |
112 |
+#else |
113 |
#include <ffmpeg/swscale.h> |
114 |
#endif |
115 |
+#endif |
116 |
|
117 |
/*FFMPEG decoder module */ |
118 |
typedef struct |
119 |
Index: gpac/modules/ffmpeg_in/Makefile |
120 |
=================================================================== |
121 |
--- gpac.orig/modules/ffmpeg_in/Makefile |
122 |
+++ gpac/modules/ffmpeg_in/Makefile |
123 |
@@ -2,7 +2,7 @@ include ../../config.mak |
124 |
|
125 |
vpath %.c $(SRC_PATH)/modules/ffmpeg_in |
126 |
|
127 |
-CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include |
128 |
+CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include $(FFMPEG_CFLAGS) |
129 |
|
130 |
ifeq ($(DEBUGBUILD), yes) |
131 |
CFLAGS+=-g |
132 |
|
133 |
|
134 |
|
135 |
1.1 src/patchsets/gpac/0.4.5/110_all_implicitdecls.patch |
136 |
|
137 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/110_all_implicitdecls.patch?rev=1.1&view=markup |
138 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/110_all_implicitdecls.patch?rev=1.1&content-type=text/plain |
139 |
|
140 |
Index: 110_all_implicitdecls.patch |
141 |
=================================================================== |
142 |
Index: gpac/applications/generators/SVG/svggen.h |
143 |
=================================================================== |
144 |
--- gpac.orig/applications/generators/SVG/svggen.h |
145 |
+++ gpac/applications/generators/SVG/svggen.h |
146 |
@@ -107,6 +107,17 @@ typedef struct { |
147 |
} SVGGenAttrGrp; |
148 |
|
149 |
|
150 |
+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name); |
151 |
+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine); |
152 |
+void generateSVGCode_V1(GF_List *svg_elements); |
153 |
+void generate_laser_tables_da(GF_List *atts); |
154 |
+void generate_laser_tables(GF_List *svg_elements); |
155 |
+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start); |
156 |
+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start); |
157 |
+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]); |
158 |
+void generate_table(GF_List *elements); |
159 |
+void generateSVGCode_V2(GF_List *svg_elements); |
160 |
+void generateSVGCode_V3(GF_List *svg_elements); |
161 |
|
162 |
/******************************************* |
163 |
* Structures needed for static allocation * |
164 |
|
165 |
|
166 |
|
167 |
1.1 src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch |
168 |
|
169 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?rev=1.1&view=markup |
170 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?rev=1.1&content-type=text/plain |
171 |
|
172 |
Index: 120_all_newffmpeg.patch |
173 |
=================================================================== |
174 |
Index: gpac/modules/ffmpeg_in/ffmpeg_decode.c |
175 |
=================================================================== |
176 |
--- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c |
177 |
+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c |
178 |
@@ -241,7 +241,7 @@ static GF_Err FFDEC_AttachStream(GF_Base |
179 |
|
180 |
/*setup audio streams*/ |
181 |
if (ffd->st==GF_STREAM_AUDIO) { |
182 |
- if ((ffd->codec->type == CODEC_ID_MP3LAME) || (ffd->codec->type == CODEC_ID_MP2)) { |
183 |
+ if ((ffd->codec->type == CODEC_ID_MP3) || (ffd->codec->type == CODEC_ID_MP2)) { |
184 |
ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576; |
185 |
} |
186 |
/*may be 0 (cfg not known yet)*/ |
187 |
|
188 |
|
189 |
|
190 |
1.1 src/patchsets/gpac/0.4.5/130_all_swscalecall.patch |
191 |
|
192 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?rev=1.1&view=markup |
193 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?rev=1.1&content-type=text/plain |
194 |
|
195 |
Index: 130_all_swscalecall.patch |
196 |
=================================================================== |
197 |
Index: gpac/modules/ffmpeg_in/ffmpeg_decode.c |
198 |
=================================================================== |
199 |
--- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c |
200 |
+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c |
201 |
@@ -643,7 +643,7 @@ redecode: |
202 |
NULL, NULL, NULL); |
203 |
|
204 |
if (ffd->sws_ctx) |
205 |
- sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height->codec->height, pict.data, pict.linesize); |
206 |
+ sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height, pict.data, pict.linesize); |
207 |
|
208 |
#endif |
209 |
|
210 |
|
211 |
|
212 |
|
213 |
1.1 src/patchsets/gpac/0.4.5/140_all_paconfig.patch |
214 |
|
215 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/140_all_paconfig.patch?rev=1.1&view=markup |
216 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/140_all_paconfig.patch?rev=1.1&content-type=text/plain |
217 |
|
218 |
Index: 140_all_paconfig.patch |
219 |
=================================================================== |
220 |
Index: gpac/configure |
221 |
=================================================================== |
222 |
--- gpac.orig/configure |
223 |
+++ gpac/configure |
224 |
@@ -1503,7 +1503,6 @@ fi |
225 |
if test "$cpu" = "x86" ; then |
226 |
echo "TARGET_ARCH_X86=yes" >> config.mak |
227 |
elif test "$cpu" = "armv4l" ; then |
228 |
-echo "CONFIG_PULSEAUDIO=$has_pulseaudio" >> config.mak |
229 |
echo "TARGET_ARCH_ARMV4L=yes" >> config.mak |
230 |
elif test "$cpu" = "alpha" ; then |
231 |
echo "TARGET_ARCH_ALPHA=yes" >> config.mak |
232 |
@@ -1588,6 +1587,7 @@ echo "FFMPEG_CFLAGS=$FFMPEG_CFLAGS" >> c |
233 |
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak |
234 |
echo "CONFIG_ALSA=$has_alsa" >> config.mak |
235 |
echo "CONFIG_JACK=$has_jack" >> config.mak |
236 |
+echo "CONFIG_PULSEAUDIO=$has_pulseaudio" >> config.mak |
237 |
echo "CONFIG_A52=$has_a52" >> config.mak |
238 |
|
239 |
echo "DISABLE_SVG=$disable_svg" >> config.mak |
240 |
|
241 |
|
242 |
|
243 |
1.1 src/patchsets/gpac/0.4.5/150_all_ffmpeglink.patch |
244 |
|
245 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/150_all_ffmpeglink.patch?rev=1.1&view=markup |
246 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/150_all_ffmpeglink.patch?rev=1.1&content-type=text/plain |
247 |
|
248 |
Index: 150_all_ffmpeglink.patch |
249 |
=================================================================== |
250 |
Index: gpac/modules/ffmpeg_in/Makefile |
251 |
=================================================================== |
252 |
--- gpac.orig/modules/ffmpeg_in/Makefile |
253 |
+++ gpac/modules/ffmpeg_in/Makefile |
254 |
@@ -15,7 +15,7 @@ LDFLAGS+=-pg |
255 |
endif |
256 |
|
257 |
LOCAL_LIB= |
258 |
-LINKLIBS=-lgpac -lavcodec -lavformat -lz |
259 |
+LINKLIBS=-lgpac -lavcodec -lavformat -lswscale -lz |
260 |
|
261 |
#common obj |
262 |
OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o |
263 |
|
264 |
|
265 |
|
266 |
1.1 src/patchsets/gpac/0.4.5/160_all_externalamr.patch |
267 |
|
268 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/160_all_externalamr.patch?rev=1.1&view=markup |
269 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/160_all_externalamr.patch?rev=1.1&content-type=text/plain |
270 |
|
271 |
Index: 160_all_externalamr.patch |
272 |
=================================================================== |
273 |
Index: gpac/modules/amr_float_dec/Makefile |
274 |
=================================================================== |
275 |
--- gpac.orig/modules/amr_float_dec/Makefile |
276 |
+++ gpac/modules/amr_float_dec/Makefile |
277 |
@@ -20,18 +20,10 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o |
278 |
|
279 |
#AMR NB obj |
280 |
CFLAGS+=-DGPAC_HAS_AMR_FT |
281 |
-ifeq ($(CONFIG_AMR_NB_FT), yes) |
282 |
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o |
283 |
-endif |
284 |
|
285 |
|
286 |
#AMR WB obj |
287 |
CFLAGS+=-DGPAC_HAS_AMR_FT_WB |
288 |
-ifeq ($(CONFIG_AMR_WB_FT), yes) |
289 |
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \ |
290 |
- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \ |
291 |
- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o |
292 |
-endif |
293 |
|
294 |
|
295 |
SRCS := $(OBJS:.o=.c) |
296 |
@@ -51,7 +43,7 @@ all: $(LIB) |
297 |
|
298 |
|
299 |
$(LIB): $(OBJSPIC) |
300 |
- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac |
301 |
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lamrnb -lamrwb |
302 |
|
303 |
|
304 |
%.o: %.c |
305 |
Index: gpac/modules/amr_float_dec/amr_float_dec.c |
306 |
=================================================================== |
307 |
--- gpac.orig/modules/amr_float_dec/amr_float_dec.c |
308 |
+++ gpac/modules/amr_float_dec/amr_float_dec.c |
309 |
@@ -31,12 +31,12 @@ |
310 |
|
311 |
#ifdef GPAC_HAS_AMR_FT |
312 |
/*AMR NB*/ |
313 |
-#include "amr_nb_ft/interf_dec.h" |
314 |
+#include <amrnb/interf_dec.h> |
315 |
#endif |
316 |
|
317 |
#ifdef GPAC_HAS_AMR_FT_WB |
318 |
/*AMR WB*/ |
319 |
-#include "amr_wb_ft/dec_if.h" |
320 |
+#include <amrwb/dec_if.h> |
321 |
#endif |
322 |
|
323 |
/*default size in CU of composition memory for audio*/ |
324 |
|
325 |
|
326 |
|
327 |
1.1 src/patchsets/gpac/0.4.5/170_all_xlink.patch |
328 |
|
329 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/170_all_xlink.patch?rev=1.1&view=markup |
330 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/170_all_xlink.patch?rev=1.1&content-type=text/plain |
331 |
|
332 |
Index: 170_all_xlink.patch |
333 |
=================================================================== |
334 |
Index: gpac/modules/x11_out/Makefile |
335 |
=================================================================== |
336 |
--- gpac.orig/modules/x11_out/Makefile |
337 |
+++ gpac/modules/x11_out/Makefile |
338 |
@@ -34,19 +34,19 @@ endif |
339 |
|
340 |
ifeq ($(USE_X11_XV), yes) |
341 |
CFLAGS+=-DGPAC_HAS_X11_XV |
342 |
-LDFLAGS+=-lXv |
343 |
+LDLIBS+=-lXv |
344 |
endif |
345 |
|
346 |
ifeq ($(USE_X11_SHM), yes) |
347 |
CFLAGS+=-DGPAC_HAS_X11_SHM |
348 |
-LDFLAGS+=-lXext |
349 |
+LDLIBS+=-lXext |
350 |
endif |
351 |
|
352 |
ifeq ($(HAS_OPENGL), yes) |
353 |
ifeq ($(GPAC_USE_TINYGL), yes) |
354 |
else |
355 |
#CFLAGS +=-DGPAC_HAS_OPENGL |
356 |
-LDFLAGS+=-lGL |
357 |
+LDLIBS+=-lGL |
358 |
#LDFLAGS+=-lTinyGL -L$(SRC_PATH)../../TinyGL/lib/ |
359 |
endif |
360 |
endif |
361 |
@@ -71,7 +71,7 @@ all: $(LIB) |
362 |
|
363 |
|
364 |
$(LIB): $(OBJSPIC) |
365 |
- $(CC) $(SHFLAGS) $(LDFLAGS) -lX11 -L../../bin/gcc -lgpac -o ../../bin/gcc/$@ $(OBJSPIC) |
366 |
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac $(LDLIBS) |
367 |
|
368 |
%.o: %.c |
369 |
$(CC) $(CFLAGS) -c -o $@ $< |
370 |
|
371 |
|
372 |
|
373 |
1.1 src/patchsets/gpac/0.4.5/series |
374 |
|
375 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.1&view=markup |
376 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.1&content-type=text/plain |
377 |
|
378 |
Index: series |
379 |
=================================================================== |
380 |
010_all_picdeps.patch |
381 |
100_all_ffmpegheaders.patch |
382 |
110_all_implicitdecls.patch |
383 |
120_all_newffmpeg.patch |
384 |
130_all_swscalecall.patch |
385 |
140_all_paconfig.patch |
386 |
150_all_ffmpeglink.patch |
387 |
160_all_externalamr.patch |
388 |
170_all_xlink.patch |