Punt 0.4.4 patchset

13 files changed, 0 insertions, 1129 deletions

diff --git a/src/patchsets/gpac/0.4.4/010_all_configure.patch b/src/patchsets/gpac/0.4.4/010_all_configure.patch
deleted file mode 100644
index 755451237e..0000000000
--- a/src/patchsets/gpac/0.4.4/010_all_configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gpac-0.4.4/configure
-===================================================================
---- gpac-0.4.4.orig/configure
-+++ gpac-0.4.4/configure
-@@ -149,6 +149,10 @@ echo "  --use-faad=OPT           force F
- echo "  --use-mad=OPT            force MAD OPT=[no,local]"
- echo "  --use-xvid=OPT           force XVID OPT=[no,local]"
- echo "  --use-ffmpeg=OPT         force FFMPEG OPT=[no,local]"
-+echo "  --use-ogg=OPT            force OGG OPT=[no,system,local]"
-+echo "  --use-vorbis=OPT         force vorbis OPT=[no,system,local]"
-+echo "  --use-theora=OPT         force theora OPT=[no,system,local]"
-+echo "  --use-openjpeg=OPT       force openjpeg OPT=[no,system,local]"
- echo ""
- echo "NOTE: The object files are build at the place where configure is launched"
- exit 1
-@@ -862,6 +866,14 @@ for opt do
-   ;;
-   --use-ffmpeg=*) has_ffmpeg=${opt#--use-ffmpeg=}
-   ;;
-+  --use-ogg=*) has_ogg=${opt#--use-ogg=}
-+  ;;
-+  --use-vorbis=*) has_vorbis=${opt#--use-vorbis=}
-+  ;;
-+  --use-theora=*) has_theora=${opt#--use-theora=}
-+  ;;
-+  --use-openjpeg=*) has_openjpeg=${opt#--use-openjpeg=}
-+  ;;
-   --use-png=*) has_png=${opt#--use-png=}
-   ;;
-   esac
diff --git a/src/patchsets/gpac/0.4.4/020_all_nostrip.patch b/src/patchsets/gpac/0.4.4/020_all_nostrip.patch
deleted file mode 100644
index 5928b74530..0000000000
--- a/src/patchsets/gpac/0.4.4/020_all_nostrip.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: gpac-0.4.4/applications/mp4client/Makefile
-===================================================================
---- gpac-0.4.4.orig/applications/mp4client/Makefile
-+++ gpac-0.4.4/applications/mp4client/Makefile
-@@ -50,7 +50,7 @@ clean: 
- 
- install: clean
- 	make -override BUILD_INSTALL=yes all
--	install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
-+	install -c -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
- 
- uninstall:
- 	rm -rf $(prefix)/bin/MP4Client
-Index: gpac-0.4.4/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.4.4.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.4.4/applications/osmo4_wx/Makefile
-@@ -59,13 +59,13 @@ ifeq ($(CONFIG_DARWIN),yes)
- 	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/English.lproj/InfoPlist.strings
- 	cp ./Darwin.Osmo.icns \
- 	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/Osmo.icns
--	install -c -s -m 755 ../../bin/gcc/Osmo4 \
-+	install -c -m 755 ../../bin/gcc/Osmo4 \
- 	      $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
- 	echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
- else
- 	rm -f wxOsmo4.o
- 	make -override BUILD_INSTALL=yes all
--	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin"
-+	install -c -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin"
- endif
- 
- uninstall:
diff --git a/src/patchsets/gpac/0.4.4/030_all_destdir.patch b/src/patchsets/gpac/0.4.4/030_all_destdir.patch
deleted file mode 100644
index df33b36c43..0000000000
--- a/src/patchsets/gpac/0.4.4/030_all_destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gpac-0.4.4/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.4.4.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.4.4/applications/osmo4_wx/Makefile
-@@ -65,7 +65,7 @@ ifeq ($(CONFIG_DARWIN),yes)
- else
- 	rm -f wxOsmo4.o
- 	make -override BUILD_INSTALL=yes all
--	install -c -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin"
-+	install -c -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
- endif
- 
- uninstall:
diff --git a/src/patchsets/gpac/0.4.4/040_all_soname.patch b/src/patchsets/gpac/0.4.4/040_all_soname.patch
deleted file mode 100644
index e5951b3335..0000000000
--- a/src/patchsets/gpac/0.4.4/040_all_soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpac.orig/src/Makefile	2006-07-11 11:53:44.000000000 -0400
-+++ gpac/src/Makefile	2006-08-01 12:58:38.000000000 -0400
-@@ -197,7 +197,7 @@
- $(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render
- 	ar cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	ranlib ../bin/gcc/libgpac_static.a
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-+	$(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
- 
- dep: depend
- 
diff --git a/src/patchsets/gpac/0.4.4/050_all_pic.patch b/src/patchsets/gpac/0.4.4/050_all_pic.patch
deleted file mode 100644
index 9bb2a672ad..0000000000
--- a/src/patchsets/gpac/0.4.4/050_all_pic.patch
+++ /dev/null
@@ -1,760 +0,0 @@
-Index: gpac-0.4.4/configure
-===================================================================
---- gpac-0.4.4.orig/configure
-+++ gpac-0.4.4/configure
-@@ -69,6 +69,8 @@ has_ipv6="no"
- has_dvb4linux="no"
- has_openjpeg="no"
- gprof_build="no"
-+PIC_CFLAGS=""
-+want_pic="no"
- 
- win32="no"
- mingw32="no"
-@@ -121,6 +123,7 @@ echo "  --mozdir=MOZ_PATH        specify
- echo ""
- echo "  --enable-debug           produce debug version"
- echo "  --enable-gprof           enable profiling"
-+echo "  --enable-pic             enable Position Independant Code for shared objects"
- echo "  --track-memory           enables tracking of all memory allocated by gpac"
- echo "  --disable-fragments      disable movie fragments in ISO media support"
- echo "  --disable-opt            disable GCC optimizations"
-@@ -195,7 +198,8 @@ case "$cpu" in
-       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-         cpu="x86_64"
-         #that's a bit crude...
--        CFLAGS="$CFLAGS -fPIC -DPIC"
-+        PIC_CFLAGS="-fPIC -DPIC"
-+        want_pic="yes"
-       fi
-     fi
-   ;;
-@@ -826,6 +830,8 @@ for opt do
-   ;;
-   --enable-gprof) gprof_build="yes";
-   ;;
-+  --enable-pic) PIC_CFLAGS="-fPIC -DPIC"; want_pic="yes";
-+  ;;
-   --disable-opt) no_gcc_opt="yes"
-   ;;
-   --disable-ipv6) has_ipv6="no"
-@@ -1209,6 +1215,8 @@ echo "RANLIB=$ranlib" >> config.mak
- echo "STRIP=$strip" >> config.mak
- echo "OPTFLAGS=$CFLAGS" >> config.mak
- echo "CPPFLAGS=$CPPFLAGS" >> config.mak
-+echo "PIC_CFLAGS=$PIC_CFLAGS" >> config.mak
-+echo "WANT_PIC=$want_pic" >> config.mak
- echo "LDFLAGS=$LDFLAGS" >> config.mak
- echo "SHFLAGS=$SHFLAGS" >> config.mak
- 
-@@ -1422,4 +1430,7 @@ if [ ! -d "./bin/gcc/temp" ]; then
- 	mkdir ./bin/gcc/temp
- fi
- 
-+echo '%.opic : %.c' >> config.mak
-+echo '	$(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak
-+
- echo "Done - type 'make help' for make info, 'make' to build"
-Index: gpac-0.4.4/src/Makefile
-===================================================================
---- gpac-0.4.4.orig/src/Makefile
-+++ gpac-0.4.4/src/Makefile
-@@ -157,6 +157,12 @@ endif
- EXTRALIBS+=$(GPAC_SH_FLAGS)
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- SRCS := $(OBJS:.o=.c) 
- 
- all: lib
-@@ -204,10 +210,10 @@ else
- 	$(CC) $(CFLAGS) -c -o $@ $< 
- endif
- 
--$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render
-+$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(OBJSPIC) isomedia scenegraph mcrypt mediatools sceneman term render
- 	ar cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	ranlib ../bin/gcc/libgpac_static.a
--	$(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-+	$(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
- 
- dep: depend
- 
-Index: gpac-0.4.4/modules/aac_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/aac_in/Makefile
-+++ gpac-0.4.4/modules/aac_in/Makefile
-@@ -37,11 +37,18 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols aac_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/alsa/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/alsa/Makefile
-+++ gpac-0.4.4/modules/alsa/Makefile
-@@ -22,10 +22,16 @@ SRCS := $(OBJS:.o=.c) 
- 
- LIB=gm_alsa.$(DYN_LIB_SUFFIX)
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lasound
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/bifs_dec/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/bifs_dec/Makefile
-+++ gpac-0.4.4/modules/bifs_dec/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols bifs_dec.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/ctx_load/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ctx_load/Makefile
-+++ gpac-0.4.4/modules/ctx_load/Makefile
-@@ -24,11 +24,18 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols ctx_load.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/dummy_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/dummy_in/Makefile
-+++ gpac-0.4.4/modules/dummy_in/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols dummy_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/ffmpeg_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ffmpeg_in/Makefile
-+++ gpac-0.4.4/modules/ffmpeg_in/Makefile
-@@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols ffmpeg_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc $(LOCAL_LIB) $(LINKLIBS) $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/ft_font/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ft_font/Makefile
-+++ gpac-0.4.4/modules/ft_font/Makefile
-@@ -28,11 +28,17 @@ endif
- LINKVAR=-L../../bin/gcc -lgpac $(FT_LIBS)
- 
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKVAR) $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKVAR) $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/img_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/img_in/Makefile
-+++ gpac-0.4.4/modules/img_in/Makefile
-@@ -87,11 +87,17 @@ LINKLIBS+=-lwinmm
- LDFLAGS+=-export-symbols img_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/ismacryp/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ismacryp/Makefile
-+++ gpac-0.4.4/modules/ismacryp/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols ismacryp.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/isom_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/isom_in/Makefile
-+++ gpac-0.4.4/modules/isom_in/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols isom_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/laser_dec/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/laser_dec/Makefile
-+++ gpac-0.4.4/modules/laser_dec/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols laser_dec.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/mp3_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/mp3_in/Makefile
-+++ gpac-0.4.4/modules/mp3_in/Makefile
-@@ -39,11 +39,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols mp3_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/mpegts_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/mpegts_in/Makefile
-+++ gpac-0.4.4/modules/mpegts_in/Makefile
-@@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols mpegts_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/odf_dec/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/odf_dec/Makefile
-+++ gpac-0.4.4/modules/odf_dec/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols odf_dec.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/ogg/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ogg/Makefile
-+++ gpac-0.4.4/modules/ogg/Makefile
-@@ -62,11 +62,17 @@ LDFLAGS+=-export-symbols ogg.def 
- endif
- 
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/oss_audio/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/oss_audio/Makefile
-+++ gpac-0.4.4/modules/oss_audio/Makefile
-@@ -31,10 +31,16 @@ SRCS := $(OBJS:.o=.c) 
- 
- LIB=gm_oss_audio.$(DYN_LIB_SUFFIX)
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/raw_out/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/raw_out/Makefile
-+++ gpac-0.4.4/modules/raw_out/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols raw_out.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/render2d/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/render2d/Makefile
-+++ gpac-0.4.4/modules/render2d/Makefile
-@@ -38,11 +38,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols render2d.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/render3d/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/render3d/Makefile
-+++ gpac-0.4.4/modules/render3d/Makefile
-@@ -44,11 +44,17 @@ LDFLAGS+=-export-symbols render3d.def 
- else
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(LINKFLAGS) $(EXTRALIBS) $(OGL_LIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/rtp_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/rtp_in/Makefile
-+++ gpac-0.4.4/modules/rtp_in/Makefile
-@@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols rtp_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/saf_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/saf_in/Makefile
-+++ gpac-0.4.4/modules/saf_in/Makefile
-@@ -25,11 +25,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols saf_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/sdl_out/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/sdl_out/Makefile
-+++ gpac-0.4.4/modules/sdl_out/Makefile
-@@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols sdl_out.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(SDL_LIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(SDL_LIBS) -L../../bin/gcc -lgpac
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) -c -o $@ $< 
-Index: gpac-0.4.4/modules/soft_raster/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/soft_raster/Makefile
-+++ gpac-0.4.4/modules/soft_raster/Makefile
-@@ -30,11 +30,18 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols rast_soft.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/svg_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/svg_in/Makefile
-+++ gpac-0.4.4/modules/svg_in/Makefile
-@@ -29,11 +29,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols svg_in.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -lz
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/timedtext/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/timedtext/Makefile
-+++ gpac-0.4.4/modules/timedtext/Makefile
-@@ -24,11 +24,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols timedtext.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
-Index: gpac-0.4.4/modules/x11_out/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/x11_out/Makefile
-+++ gpac-0.4.4/modules/x11_out/Makefile
-@@ -47,11 +47,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols  
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -lX11 -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -lX11 -L../../bin/gcc -lgpac
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) -c -o $@ $< 
-Index: gpac-0.4.4/modules/xvid_dec/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/xvid_dec/Makefile
-+++ gpac-0.4.4/modules/xvid_dec/Makefile
-@@ -31,11 +31,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols xvid_dec.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS)
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) -L../../bin/gcc -lgpac $(EXTRALIBS)
- 
- 
- %.o: %.c
-Index: gpac/modules/amr_float_dec/Makefile
-===================================================================
---- gpac.orig/modules/amr_float_dec/Makefile
-+++ gpac/modules/amr_float_dec/Makefile
-@@ -41,11 +41,17 @@ ifeq ($(CONFIG_WIN32),yes)
- LDFLAGS+=-export-symbols amr_float_dec.def 
- endif
- 
-+ifeq ($(WANT_PIC),yes)
-+OBJSPIC=$(OBJS:.o=.opic)
-+else
-+OBJSPIC=$(OBJS)
-+endif
-+
- all: $(LIB)
- 
- 
--$(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+$(LIB): $(OBJSPIC)
-+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
- 
- 
- %.o: %.c
diff --git a/src/patchsets/gpac/0.4.4/060_all_recursivemake.patch b/src/patchsets/gpac/0.4.4/060_all_recursivemake.patch
deleted file mode 100644
index b17b39f277..0000000000
--- a/src/patchsets/gpac/0.4.4/060_all_recursivemake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gpac-0.4.4/applications/mp4client/Makefile
-===================================================================
---- gpac-0.4.4.orig/applications/mp4client/Makefile
-+++ gpac-0.4.4/applications/mp4client/Makefile
-@@ -48,8 +48,8 @@ MP4Client$(EXE): $(OBJS)
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
- 
--install: clean
--	make -override BUILD_INSTALL=yes all
-+install:
-+	$(MAKE) -override BUILD_INSTALL=yes all
- 	install -c -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
- 
- uninstall:
-Index: gpac-0.4.4/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.4.4.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.4.4/applications/osmo4_wx/Makefile
-@@ -64,7 +64,7 @@ ifeq ($(CONFIG_DARWIN),yes)
- 	echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
- else
- 	rm -f wxOsmo4.o
--	make -override BUILD_INSTALL=yes all
-+	$(MAKE) -override BUILD_INSTALL=yes all
- 	install -c -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
- endif
- 
diff --git a/src/patchsets/gpac/0.4.4/070_all_bsd.patch b/src/patchsets/gpac/0.4.4/070_all_bsd.patch
deleted file mode 100644
index 1c132f1193..0000000000
--- a/src/patchsets/gpac/0.4.4/070_all_bsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/configure b/configure
---- a/configure	2007-08-23 12:57:40 +0100
-+++ b/configure	2007-08-23 12:43:11 +0100
-@@ -268,8 +268,6 @@
- FreeBSD)
- make="gmake"
- LDFLAGS="$LDFLAGS -export-dynamic"
--CFLAGS="$CFLAGS -pthread"
--GPAC_SH_FLAGS=-pthread
- freebsd="yes"
- js_flags="-DXP_UNIX -I/usr/include/js"
- ;;
diff --git a/src/patchsets/gpac/0.4.4/080_all_configdefines.patch b/src/patchsets/gpac/0.4.4/080_all_configdefines.patch
deleted file mode 100644
index 6badebf312..0000000000
--- a/src/patchsets/gpac/0.4.4/080_all_configdefines.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: gpac-0.4.4/src/Makefile
-===================================================================
---- gpac-0.4.4.orig/src/Makefile
-+++ gpac-0.4.4/src/Makefile
-@@ -91,6 +91,14 @@ CFLAGS+=-DGPAC_BIG_ENDIAN
- endif
- 
- 
-+#4- flags used in utils/os_divers.c
-+ifeq ($(CONFIG_LINUX), yes)
-+CFLAGS+=-DCONFIG_LINUX
-+endif
-+ifeq ($(CONFIG_FREEBSD), yes)
-+CFLAGS+=-DCONFIG_FREEBSD
-+endif
-+
- ## libgpac scenegraph compilation and linking options
- SCENEGRAPH_CFLAGS=
- ifeq ($(CONFIG_JS),no)
diff --git a/src/patchsets/gpac/0.4.4/090_all_nomodules_segfault.patch b/src/patchsets/gpac/0.4.4/090_all_nomodules_segfault.patch
deleted file mode 100644
index 116eece73e..0000000000
--- a/src/patchsets/gpac/0.4.4/090_all_nomodules_segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gpac/src/utils/module.c
-===================================================================
---- gpac.orig/src/utils/module.c
-+++ gpac/src/utils/module.c
-@@ -52,6 +52,7 @@ GF_EXPORT
- void gf_modules_del(GF_ModuleManager *pm)
- {
- 	ModuleInstance *inst;
-+	if(!pm) return;
- 
- 	/*unload all modules*/
- 	while (gf_list_count(pm->plug_list)) {
diff --git a/src/patchsets/gpac/0.4.4/100_all_ffmpegheaders.patch b/src/patchsets/gpac/0.4.4/100_all_ffmpegheaders.patch
deleted file mode 100644
index 1a8a4a94b6..0000000000
--- a/src/patchsets/gpac/0.4.4/100_all_ffmpegheaders.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: gpac-0.4.4/configure
-===================================================================
---- gpac-0.4.4.orig/configure
-+++ gpac-0.4.4/configure
-@@ -93,6 +93,7 @@ X11_PATH="/usr/X11R6"
- OSS_CFLAGS=""
- OSS_LDFLAGS=""
- is_64="no"
-+FFMPEG_CFLAGS=""
- 
- #Configure Usage
- if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
-@@ -615,6 +616,16 @@ elif $cc -o $TMPO $TMPC -I$local_inc -L$
- has_ffmpeg="local"
- 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 vorbis support
- cat > $TMPC << EOF
-@@ -1276,6 +1287,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 "DISABLE_SVG=$disable_svg" >> config.mak
-Index: gpac-0.4.4/modules/ffmpeg_in/Makefile
-===================================================================
---- gpac-0.4.4.orig/modules/ffmpeg_in/Makefile
-+++ gpac-0.4.4/modules/ffmpeg_in/Makefile
-@@ -2,7 +2,7 @@ include ../../config.mak
- 
- vpath %.c $(SRC_PATH)/modules/ffmpeg_in
- 
--CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include
-+CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include $(FFMPEG_CFLAGS)
- 
- ifeq ($(DEBUGBUILD), yes)
- CFLAGS+=-g
-Index: gpac-0.4.4/modules/ffmpeg_in/ffmpeg_in.h
-===================================================================
---- gpac-0.4.4.orig/modules/ffmpeg_in/ffmpeg_in.h
-+++ gpac-0.4.4/modules/ffmpeg_in/ffmpeg_in.h
-@@ -56,7 +56,11 @@
- 
- 
- /*include FFMPEG APIs*/
-+#if NEW_FFMPEG_LAYOUT
-+#include <libavformat/avformat.h>
-+#else
- #include <ffmpeg/avformat.h>
-+#endif
- 
- /*FFMPEG decoder module */
- typedef struct 
diff --git a/src/patchsets/gpac/0.4.4/110_all_implicitdecls.patch b/src/patchsets/gpac/0.4.4/110_all_implicitdecls.patch
deleted file mode 100644
index 80f4b63a6f..0000000000
--- a/src/patchsets/gpac/0.4.4/110_all_implicitdecls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===================================================================
---- gpac.orig/applications/generators/SVG/svggen.h
-+++ gpac/applications/generators/SVG/svggen.h
-@@ -190,5 +190,16 @@ static _atts generic_attributes[] = {
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
- 
-+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);
- 
- #endif // _SVGGEN_H_
diff --git a/src/patchsets/gpac/0.4.4/120_all_lavc.patch b/src/patchsets/gpac/0.4.4/120_all_lavc.patch
deleted file mode 100644
index ccd14cc721..0000000000
--- a/src/patchsets/gpac/0.4.4/120_all_lavc.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: gpac-0.4.4/modules/ffmpeg_in/ffmpeg_decode.c
-===================================================================
---- gpac-0.4.4.orig/modules/ffmpeg_in/ffmpeg_decode.c
-+++ gpac-0.4.4/modules/ffmpeg_in/ffmpeg_decode.c
-@@ -122,9 +122,17 @@ static GF_Err FFDEC_AttachStream(GF_Base
- 			ffd->ctx->codec_type = CODEC_TYPE_AUDIO;
- 			ffd->ctx->sample_rate = gf_bs_read_u32(bs);
- 			ffd->ctx->channels = gf_bs_read_u16(bs);
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			ffd->ctx->bits_per_sample = gf_bs_read_u16(bs);
-+#else
-+			ffd->ctx->bits_per_coded_sample = gf_bs_read_u16(bs);
-+#endif
- 			/*force 16 bits output*/
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			ffd->ctx->bits_per_sample = 16;
-+#else
-+			ffd->ctx->bits_per_coded_sample = 16;
-+#endif
- 			ffd->ctx->frame_size = gf_bs_read_u16(bs);
- 			ffd->ctx->block_align = gf_bs_read_u16(bs);
- 		} else if (ffd->st==GF_STREAM_VISUAL) {
-@@ -148,13 +156,21 @@ static GF_Err FFDEC_AttachStream(GF_Base
- 			ffd->ctx->sample_rate = gf_bs_read_u16(bs);
- 			ffd->ctx->frame_size = gf_bs_read_u16(bs);
- 			ffd->ctx->channels = gf_bs_read_u8(bs);
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			ffd->ctx->bits_per_sample = gf_bs_read_u8(bs);
-+#else
-+			ffd->ctx->bits_per_coded_sample = gf_bs_read_u8(bs);
-+#endif
- 			/*packed mode*/ gf_bs_read_u8(bs);
- 			/*just in case...*/
- 			if (codec_id == GF_4CC('a', 'm', 'r', ' ')) {
- 			  ffd->ctx->sample_rate = 8000;
- 			  ffd->ctx->channels = 1;
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			  ffd->ctx->bits_per_sample = 16;
-+#else
-+			  ffd->ctx->bits_per_coded_sample = 16;
-+#endif
- 			  ffd->ctx->frame_size = 160;
- 			}
- 		} else if (ffd->st==GF_STREAM_VISUAL) {
-@@ -245,12 +261,17 @@ 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)*/
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 		ffd->out_size = ffd->ctx->bits_per_sample * ffd->ctx->channels * ffd->ctx->frame_size / 8;
- 		if (!ffd->ctx->bits_per_sample) ffd->ctx->bits_per_sample = 16;
-+#else
-+		ffd->out_size = ffd->ctx->bits_per_coded_sample * ffd->ctx->channels * ffd->ctx->frame_size / 8;
-+		if (!ffd->ctx->bits_per_coded_sample) ffd->ctx->bits_per_coded_sample = 16;
-+#endif
- 		if (!ffd->ctx->sample_rate) ffd->ctx->sample_rate = 44100;
- 		if (!ffd->ctx->channels) ffd->ctx->channels = 2;
- 	} else {
-@@ -330,7 +351,11 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- 		capability->cap.valueInt = ffd->ctx->channels;
- 		break;
- 	case GF_CODEC_BITS_PER_SAMPLE:
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 		capability->cap.valueInt = ffd->ctx->bits_per_sample;
-+#else
-+		capability->cap.valueInt = ffd->ctx->bits_per_coded_sample;
-+#endif
- 		break;
- 	case GF_CODEC_BUFFER_MIN:
- 		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 4 : 1;
-@@ -457,11 +482,20 @@ redecode:
- 
- 		/*first config*/
- 		if (!ffd->out_size) {
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			ffd->ctx->bits_per_sample = 16;
- 			ffd->out_size = ffd->ctx->bits_per_sample * ffd->ctx->channels * ffd->ctx->frame_size / 8;
-+#else
-+			ffd->ctx->bits_per_coded_sample = 16;
-+			ffd->out_size = ffd->ctx->bits_per_coded_sample * ffd->ctx->channels * ffd->ctx->frame_size / 8;
-+#endif
- 		}
- 		if (ffd->out_size < (u32) gotpic) {
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			ffd->ctx->bits_per_sample = 16;
-+#else
-+			ffd->ctx->bits_per_coded_sample = 16;
-+#endif
- 			/*looks like relying on frame_size is not a good idea for all codecs, so we use gotpic*/
- 			(*outBufferLength) = ffd->out_size = gotpic;
- 			return GF_BUFFER_TOO_SMALL;
-Index: gpac-0.4.4/modules/ffmpeg_in/ffmpeg_demux.c
-===================================================================
---- gpac-0.4.4.orig/modules/ffmpeg_in/ffmpeg_demux.c
-+++ gpac-0.4.4/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -307,7 +307,11 @@ opaque_audio:
- 			gf_bs_write_u32(bs, dec->codec_id);
- 			gf_bs_write_u32(bs, dec->sample_rate);
- 			gf_bs_write_u16(bs, dec->channels);
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- 			gf_bs_write_u16(bs, dec->bits_per_sample);
-+#else
-+			gf_bs_write_u16(bs, dec->bits_per_coded_sample);
-+#endif
- 			gf_bs_write_u16(bs, dec->frame_size);
- 			gf_bs_write_u16(bs, dec->block_align);
- 
diff --git a/src/patchsets/gpac/0.4.4/series b/src/patchsets/gpac/0.4.4/series
deleted file mode 100644
index eda47c726c..0000000000
--- a/src/patchsets/gpac/0.4.4/series
+++ /dev/null
@@ -1,12 +0,0 @@
-010_all_configure.patch
-020_all_nostrip.patch
-030_all_destdir.patch
-040_all_soname.patch
-050_all_pic.patch
-060_all_recursivemake.patch
-070_all_bsd.patch
-080_all_configdefines.patch
-090_all_nomodules_segfault.patch
-100_all_ffmpegheaders.patch
-110_all_implicitdecls.patch
-120_all_lavc.patch