[gentoo-commits] gentoo commit in src/patchsets/gpac/0.4.5: 010_all_picdeps.patch 100_all_ffmpegheaders.patch 110_all_implicitdecls.patch 120_all_newffmpeg.patch 130_all_swscalecall.patch 140_all_paconfig.patch 150_all_ffmpeglink.patch 160_all_externalamr.patch 170_all_xlink.patch series

[Alexis Ballier (aballier)]

aballier    09/01/31 15:08:13

  Added:                010_all_picdeps.patch 100_all_ffmpegheaders.patch
                        110_all_implicitdecls.patch 120_all_newffmpeg.patch
                        130_all_swscalecall.patch 140_all_paconfig.patch
                        150_all_ffmpeglink.patch 160_all_externalamr.patch
                        170_all_xlink.patch series
  Log:
  initial patchset for gpac 0.4.5

Revision  Changes    Path
1.1                  src/patchsets/gpac/0.4.5/010_all_picdeps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/010_all_picdeps.patch?rev=1.1&view=markup
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

Index: 010_all_picdeps.patch
===================================================================
Index: gpac/src/Makefile
===================================================================
--- gpac.orig/src/Makefile
+++ gpac/src/Makefile
@@ -193,16 +193,16 @@ lib: $(LIB)
 
 #there's a bunch of warnings in there, get rid of them
 mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
-mcrypt: $(LIBGPAC_MCRYPT)
+mcrypt: $(LIBGPAC_MCRYPT) $(LIBGPAC_MCRYPT:%.o=%.opic)
 
 scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS)
-scenegraph: $(LIBGPAC_SCENE)
+scenegraph: $(LIBGPAC_SCENE) $(LIBGPAC_SCENE:%.o=%.opic)
 
 mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS)
-mediatools: $(LIBGPAC_MEDIATOOLS)
+mediatools: $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_MEDIATOOLS:%.o=%.opic)
 
 compositor: CFLAGS+=$(COMPOSITOR_CFLAGS)
-compositor: $(LIBGPAC_COMPOSITOR)
+compositor: $(LIBGPAC_COMPOSITOR) $(LIBGPAC_COMPOSITOR:%.o=%.opic)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< 



1.1                  src/patchsets/gpac/0.4.5/100_all_ffmpegheaders.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/100_all_ffmpegheaders.patch?rev=1.1&view=markup
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

Index: 100_all_ffmpegheaders.patch
===================================================================
Index: gpac/configure
===================================================================
--- gpac.orig/configure
+++ gpac/configure
@@ -112,6 +112,7 @@ OSS_CFLAGS=""
 OSS_LDFLAGS=""
 INSTFLAGS=""
 is_64="no"
+FFMPEG_CFLAGS=""
 
 #Configure Usage
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
@@ -578,6 +579,16 @@ if $cc -o $TMPO $TMPC $LINK_SSL 2> /dev/
 has_ssl="yes"
 fi
 
+cat > $TMPC << EOF
+#include <stddef.h>
+#include <libavcodec/avcodec.h>
+int main( void ) { return 0; }
+EOF
+
+if $cc -o $TMPO $TMPC -lz -lavcodec -lavformat 2> /dev/null  ; then
+FFMPEG_CFLAGS="-DNEW_FFMPEG_LAYOUT=1"
+has_ffmpeg="system"
+fi
 
 #look for JPEG support
 cat > $TMPC << EOF
@@ -1573,6 +1584,7 @@ echo "CONFIG_OGG=$has_ogg" >> config.mak
 echo "CONFIG_VORBIS=$has_vorbis" >> config.mak
 echo "CONFIG_THEORA=$has_theora" >> config.mak
 echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak
+echo "FFMPEG_CFLAGS=$FFMPEG_CFLAGS" >> config.mak
 echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
 echo "CONFIG_ALSA=$has_alsa" >> config.mak
 echo "CONFIG_JACK=$has_jack" >> config.mak
Index: gpac/modules/ffmpeg_in/ffmpeg_in.h
===================================================================
--- gpac.orig/modules/ffmpeg_in/ffmpeg_in.h
+++ gpac/modules/ffmpeg_in/ffmpeg_in.h
@@ -56,15 +56,23 @@
 
 
 /*include FFMPEG APIs*/
+#if NEW_FFMPEG_LAYOUT
+#include <libavformat/avformat.h>
+#else
 #include <ffmpeg/avformat.h>
+#endif
 
 void gf_av_vlog(void* avcl, int level, const char *fmt, va_list vl);
 
 
 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(0<<8)+0)
 #define FFMPEG_SWSCALE
+#if NEW_FFMPEG_LAYOUT
+#include <libswscale/swscale.h>
+#else
 #include <ffmpeg/swscale.h>
 #endif
+#endif
 
 /*FFMPEG decoder module */
 typedef struct 
Index: gpac/modules/ffmpeg_in/Makefile
===================================================================
--- gpac.orig/modules/ffmpeg_in/Makefile
+++ gpac/modules/ffmpeg_in/Makefile
@@ -2,7 +2,7 @@ include ../../config.mak
 
 vpath %.c $(SRC_PATH)/modules/ffmpeg_in
 
-CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include
+CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include $(FFMPEG_CFLAGS)
 
 ifeq ($(DEBUGBUILD), yes)
 CFLAGS+=-g



1.1                  src/patchsets/gpac/0.4.5/110_all_implicitdecls.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/110_all_implicitdecls.patch?rev=1.1&view=markup
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

Index: 110_all_implicitdecls.patch
===================================================================
Index: gpac/applications/generators/SVG/svggen.h
===================================================================
--- gpac.orig/applications/generators/SVG/svggen.h
+++ gpac/applications/generators/SVG/svggen.h
@@ -107,6 +107,17 @@ typedef struct {
 } SVGGenAttrGrp;
 
 
+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
+void generateSVGCode_V1(GF_List *svg_elements);
+void generate_laser_tables_da(GF_List *atts);
+void generate_laser_tables(GF_List *svg_elements);
+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
+void generate_table(GF_List *elements);
+void generateSVGCode_V2(GF_List *svg_elements);
+void generateSVGCode_V3(GF_List *svg_elements);
 
 /*******************************************
  * Structures needed for static allocation *



1.1                  src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/120_all_newffmpeg.patch?rev=1.1&view=markup
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

Index: 120_all_newffmpeg.patch
===================================================================
Index: gpac/modules/ffmpeg_in/ffmpeg_decode.c
===================================================================
--- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c
+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c
@@ -241,7 +241,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
 
 	/*setup audio streams*/
 	if (ffd->st==GF_STREAM_AUDIO) {
-		if ((ffd->codec->type == CODEC_ID_MP3LAME) || (ffd->codec->type == CODEC_ID_MP2)) {
+		if ((ffd->codec->type == CODEC_ID_MP3) || (ffd->codec->type == CODEC_ID_MP2)) {
 			ffd->ctx->frame_size = (ffd->ctx->sample_rate > 24000) ? 1152 : 576;
 		}
 		/*may be 0 (cfg not known yet)*/



1.1                  src/patchsets/gpac/0.4.5/130_all_swscalecall.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/130_all_swscalecall.patch?rev=1.1&view=markup
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

Index: 130_all_swscalecall.patch
===================================================================
Index: gpac/modules/ffmpeg_in/ffmpeg_decode.c
===================================================================
--- gpac.orig/modules/ffmpeg_in/ffmpeg_decode.c
+++ gpac/modules/ffmpeg_in/ffmpeg_decode.c
@@ -643,7 +643,7 @@ redecode:
         	                NULL, NULL, NULL);
 			
 			if (ffd->sws_ctx)
-				sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height->codec->height, pict.data, pict.linesize);
+				sws_scale(ffd->sws_ctx, ffd->frame->data, ffd->frame->linesize, 0, ffd->ctx->height, pict.data, pict.linesize);
 
 #endif
 



1.1                  src/patchsets/gpac/0.4.5/140_all_paconfig.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/140_all_paconfig.patch?rev=1.1&view=markup
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

Index: 140_all_paconfig.patch
===================================================================
Index: gpac/configure
===================================================================
--- gpac.orig/configure
+++ gpac/configure
@@ -1503,7 +1503,6 @@ fi
 if test "$cpu" = "x86" ; then
   echo "TARGET_ARCH_X86=yes" >> config.mak
 elif test "$cpu" = "armv4l" ; then
-echo "CONFIG_PULSEAUDIO=$has_pulseaudio" >> config.mak
   echo "TARGET_ARCH_ARMV4L=yes" >> config.mak
 elif test "$cpu" = "alpha" ; then
   echo "TARGET_ARCH_ALPHA=yes" >> config.mak
@@ -1588,6 +1587,7 @@ echo "FFMPEG_CFLAGS=$FFMPEG_CFLAGS" >> c
 echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
 echo "CONFIG_ALSA=$has_alsa" >> config.mak
 echo "CONFIG_JACK=$has_jack" >> config.mak
+echo "CONFIG_PULSEAUDIO=$has_pulseaudio" >> config.mak
 echo "CONFIG_A52=$has_a52" >> config.mak
 
 echo "DISABLE_SVG=$disable_svg" >> config.mak



1.1                  src/patchsets/gpac/0.4.5/150_all_ffmpeglink.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/150_all_ffmpeglink.patch?rev=1.1&view=markup
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

Index: 150_all_ffmpeglink.patch
===================================================================
Index: gpac/modules/ffmpeg_in/Makefile
===================================================================
--- gpac.orig/modules/ffmpeg_in/Makefile
+++ gpac/modules/ffmpeg_in/Makefile
@@ -15,7 +15,7 @@ LDFLAGS+=-pg
 endif
 
 LOCAL_LIB=
-LINKLIBS=-lgpac -lavcodec -lavformat -lz
+LINKLIBS=-lgpac -lavcodec -lavformat -lswscale -lz
 
 #common obj
 OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o



1.1                  src/patchsets/gpac/0.4.5/160_all_externalamr.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/160_all_externalamr.patch?rev=1.1&view=markup
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

Index: 160_all_externalamr.patch
===================================================================
Index: gpac/modules/amr_float_dec/Makefile
===================================================================
--- gpac.orig/modules/amr_float_dec/Makefile
+++ gpac/modules/amr_float_dec/Makefile
@@ -20,18 +20,10 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
 
 #AMR NB obj
 CFLAGS+=-DGPAC_HAS_AMR_FT
-ifeq ($(CONFIG_AMR_NB_FT), yes)
-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
-endif
 
 
 #AMR WB obj
 CFLAGS+=-DGPAC_HAS_AMR_FT_WB
-ifeq ($(CONFIG_AMR_WB_FT), yes)
-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 \
-	./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 \
-	./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 
-endif
 
 
 SRCS := $(OBJS:.o=.c) 
@@ -51,7 +43,7 @@ all: $(LIB)
 
 
 $(LIB): $(OBJSPIC)
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lamrnb -lamrwb
 
 
 %.o: %.c
Index: gpac/modules/amr_float_dec/amr_float_dec.c
===================================================================
--- gpac.orig/modules/amr_float_dec/amr_float_dec.c
+++ gpac/modules/amr_float_dec/amr_float_dec.c
@@ -31,12 +31,12 @@
 
 #ifdef GPAC_HAS_AMR_FT
 /*AMR NB*/
-#include "amr_nb_ft/interf_dec.h"
+#include <amrnb/interf_dec.h>
 #endif
 
 #ifdef GPAC_HAS_AMR_FT_WB
 /*AMR WB*/
-#include "amr_wb_ft/dec_if.h"
+#include <amrwb/dec_if.h>
 #endif
 
 /*default size in CU of composition memory for audio*/



1.1                  src/patchsets/gpac/0.4.5/170_all_xlink.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/170_all_xlink.patch?rev=1.1&view=markup
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

Index: 170_all_xlink.patch
===================================================================
Index: gpac/modules/x11_out/Makefile
===================================================================
--- gpac.orig/modules/x11_out/Makefile
+++ gpac/modules/x11_out/Makefile
@@ -34,19 +34,19 @@ endif
 
 ifeq ($(USE_X11_XV), yes)
 CFLAGS+=-DGPAC_HAS_X11_XV
-LDFLAGS+=-lXv
+LDLIBS+=-lXv
 endif
 
 ifeq ($(USE_X11_SHM), yes)
 CFLAGS+=-DGPAC_HAS_X11_SHM
-LDFLAGS+=-lXext
+LDLIBS+=-lXext
 endif
 
 ifeq ($(HAS_OPENGL), yes)
 ifeq ($(GPAC_USE_TINYGL), yes)
 else
 #CFLAGS +=-DGPAC_HAS_OPENGL
-LDFLAGS+=-lGL
+LDLIBS+=-lGL
 #LDFLAGS+=-lTinyGL -L$(SRC_PATH)../../TinyGL/lib/ 
 endif
 endif
@@ -71,7 +71,7 @@ all: $(LIB)
 
 
 $(LIB): $(OBJSPIC)
-	$(CC) $(SHFLAGS) $(LDFLAGS) -lX11 -L../../bin/gcc -lgpac -o ../../bin/gcc/$@ $(OBJSPIC)
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac $(LDLIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $< 



1.1                  src/patchsets/gpac/0.4.5/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gpac/0.4.5/series?rev=1.1&content-type=text/plain

Index: series
===================================================================
010_all_picdeps.patch
100_all_ffmpegheaders.patch
110_all_implicitdecls.patch
120_all_newffmpeg.patch
130_all_swscalecall.patch
140_all_paconfig.patch
150_all_ffmpeglink.patch
160_all_externalamr.patch
170_all_xlink.patch