From acd6d5b02e3ca5b6b66d00feb1463e5d6a24bb59 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 17 Jan 2010 00:43:58 +0000 Subject: [PATCH] - Update to 20100116 - Removed upstreamed patch for system libxml2 - Update ffmpeg patch --- .gitignore | 2 +- gpac-0.4.6-ffmpeg.patch | 62 +++++++++++++++----------------- gpac-0.4.6-libxml2.patch | 76 ---------------------------------------- gpac.spec | 14 ++++---- sources | 2 +- 5 files changed, 37 insertions(+), 119 deletions(-) delete mode 100644 gpac-0.4.6-libxml2.patch diff --git a/.gitignore b/.gitignore index b512d5f..6149439 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gpac-20090919.tar.bz2 +gpac-20100116.tar.bz2 diff --git a/gpac-0.4.6-ffmpeg.patch b/gpac-0.4.6-ffmpeg.patch index 4a216db..52c5ffc 100644 --- a/gpac-0.4.6-ffmpeg.patch +++ b/gpac-0.4.6-ffmpeg.patch @@ -1,49 +1,43 @@ diff -up gpac/configure.ffmpeg gpac/configure ---- gpac/configure.ffmpeg 2009-09-01 16:50:50.270496559 +0200 -+++ gpac/configure 2009-09-01 17:59:05.902493824 +0200 -@@ -808,25 +808,19 @@ cat > $TMPC << EOF +--- gpac/configure.ffmpeg 2010-01-16 19:09:26.451865570 +0100 ++++ gpac/configure 2010-01-16 19:19:49.604861370 +0100 +@@ -852,12 +852,21 @@ fi + + #look for FFMPEG support + ++if pkg-config --exists libavcodec libavformat libswscale 2> /dev/null ; then ++ ffmpeg_cflags=`pkg-config --cflags libavcodec libavformat libswscale libavutil` ++ ffmpeg_lflags=`pkg-config --libs libavcodec libavformat libswscale libavutil` ++ has_ffmpeg="system" ++else ++ ffmpeg_cflags=`` ++ ffmpeg_lflags=`-lz -lavcodec -lavformat` ++fi ++ + cat > $TMPC << EOF + #include int main( void ) { return 0; } EOF -if $cc $TMPO -c $TMPC 2> /dev/null ; then --old_ffmpeg_inc="no" -+if pkg-config --exists libavcodec libavformat libswscale 2> /dev/null ; then -+ ffmpeg_cflags=`pkg-config --cflags libavcodec libavformat libswscale` -+ ffmpeg_lflags=`pkg-config --libs libavcodec libavformat libswscale` -+ has_ffmpeg="system" ++if $cc $TMPO $ffmpeg_cflags -c $TMPC 2> /dev/null ; then + old_ffmpeg_inc="no" else -- --old_ffmpeg_inc="yes" -- --cat > $TMPC << EOF --#include --int main( void ) { return 0; } --EOF -- --fi -- -+ ffmpeg_cflags= -+ ffmpeg_lflags=`-lavcodec -lavformat` + +@@ -872,10 +881,10 @@ fi + if test "$cross_prefix" != "" ; then - if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz -lavcodec -lavformat -lavutil 2> /dev/null ; then -+ if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz $ffmpeg_lflags -lavutil 2> /dev/null ; then ++ if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then has_ffmpeg="system" else - if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz -lavcodec -lavformat 2> /dev/null ; then -+ if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz $ffmpeg_lflags 2> /dev/null ; then ++ if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then has_ffmpeg="local" + echo OK fi - fi -@@ -841,6 +835,7 @@ else - has_ffmpeg="local" - fi - fi -+fi - - #look for vorbis support - cat > $TMPC << EOF -@@ -1912,6 +1907,10 @@ echo "CONFIG_VORBIS=$has_vorbis" >> conf +@@ -1978,6 +1987,10 @@ echo "CONFIG_VORBIS=$has_vorbis" >> conf echo "CONFIG_THEORA=$has_theora" >> config.mak echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak @@ -56,7 +50,7 @@ diff -up gpac/configure.ffmpeg gpac/configure echo "CONFIG_ALSA=$has_alsa" >> config.mak diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile --- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2009-07-31 09:37:41.000000000 +0200 -+++ gpac/modules/ffmpeg_in/Makefile 2009-09-01 17:49:55.333497907 +0200 ++++ gpac/modules/ffmpeg_in/Makefile 2010-01-16 19:09:26.460862249 +0100 @@ -2,7 +2,7 @@ include ../../config.mak vpath %.c $(SRC_PATH)/modules/ffmpeg_in @@ -71,7 +65,7 @@ diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile LOCAL_LIB= -LINKLIBS=-lgpac -lavcodec -lavformat -lz -+LINKLIBS=-lgpac $(FFMPEG_LFLAGS) -lz ++LINKLIBS=-lgpac -lz $(FFMPEG_LFLAGS) #old ffmpeg lib ifeq ($(CONFIG_FFMPEG_OLD), yes) diff --git a/gpac-0.4.6-libxml2.patch b/gpac-0.4.6-libxml2.patch deleted file mode 100644 index 8fc90c7..0000000 --- a/gpac-0.4.6-libxml2.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile ---- gpac/applications/generators/SVG/Makefile.libxml2 2009-09-01 16:12:48.317745990 +0200 -+++ gpac/applications/generators/SVG/Makefile 2009-09-01 16:14:27.221497909 +0200 -@@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c) - all: $(PROG) - - SVGGen$(EXE): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LIBS) $(EXTRALIBS) - - - %.o: %.c -diff -up gpac/applications/generators/SVG/Makefile.shared.libxml2 gpac/applications/generators/SVG/Makefile.shared ---- gpac/applications/generators/SVG/Makefile.shared.libxml2 2008-11-24 09:40:04.000000000 +0100 -+++ gpac/applications/generators/SVG/Makefile.shared 2009-09-01 16:20:46.049498877 +0200 -@@ -35,7 +35,7 @@ SRCS := $(OBJS:.o=.c) - all: $(PROG) - - SVGGen$(EXE): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LIBS) $(EXTRALIBS) - - - %.o: %.c -diff -up gpac/applications/testapps/loadcompare/Makefile.libxml2 gpac/applications/testapps/loadcompare/Makefile ---- gpac/applications/testapps/loadcompare/Makefile.libxml2 2008-11-24 09:56:20.000000000 +0100 -+++ gpac/applications/testapps/loadcompare/Makefile 2009-09-01 16:21:19.341500133 +0200 -@@ -29,7 +29,7 @@ else - EXT= - PROG=LoadCompare - #LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS) -lz --LINKFLAGS+=-lgpac -lz $(XML2_LFLAGS) -+LINKFLAGS+=-lgpac -lz $(XML2_LIBS) - endif - - -diff -up gpac/configure.libxml2 gpac/configure ---- gpac/configure.libxml2 2009-09-01 16:15:10.226496731 +0200 -+++ gpac/configure 2009-09-01 16:18:23.287494600 +0200 -@@ -87,6 +87,7 @@ has_ipv6="no" - has_dvb4linux="no" - has_xmlrpc="no" - has_openjpeg="no" -+has_libxml2="no" - gprof_build="no" - PIC_CFLAGS="" - want_pic="no" -@@ -980,6 +981,16 @@ fi - fi - #end wx test - -+# If svg isn't disabled -+if test "$disable_svg" != "yes"; then -+# Then we check libxm2 presence via pkg-config -+ if pkg-config libxml-2.0 --exists > /dev/null 2>&1 ; then -+ libxml2_cflags=`pkg-config libxml-2.0 --cflags` -+ libxml2_lib_flags=`pkg-config libxml-2.0 --libs` -+ has_libxml2="yes" -+ fi -+fi -+ - - # look for IPv6 - cat > $TMPC << EOF -@@ -1908,6 +1919,11 @@ echo "CONFIG_JACK=$has_jack" >> config.m - echo "CONFIG_A52=$has_a52" >> config.mak - - echo "DISABLE_SVG=$disable_svg" >> config.mak -+echo "HAS_LIBXML2=$has_libxml2" >> config.mak -+if test "$has_libxml2" = "yes"; then -+ echo "XML2_CFLAGS=$libxml2_cflags" >> config.mak -+ echo "XML2_LIBS=$libxml2_lib_flags" >> config.mak -+fi - echo "GPAC_USE_TINYGL=$has_tinygl" >> config.mak - echo "OGL_INCLS=$INCL3D" >> config.mak - diff --git a/gpac.spec b/gpac.spec index d2d28aa..c8e2c12 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global cvs 20090919 +%global cvs 20100116 %global with_osmo 0 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 @@ -18,7 +18,7 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.6 -Release: 0.2.cvs%{?cvs}%{?dist} +Release: 0.3.cvs%{?cvs}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ @@ -32,9 +32,6 @@ Patch2: gpac-0.4.5-amr.patch Patch3: gpac-0.4.5-lib64.patch Patch4: gpac-0.4.5-system_openjpeg.patch Patch5: gpac-0.4.6-js_cflags.patch -Patch6: gpac-0.4.5-shared_sggen.patch -#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853856&group_id=84101 -Patch7: gpac-0.4.6-libxml2.patch #https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101 Patch9: gpac-0.4.6-ffmpeg.patch Patch10: gpac-0.4.6-ogl_libs.patch @@ -159,8 +156,6 @@ web browsers. %endif %patch4 -p1 -b .openjpeg %patch5 -p1 -b .jscflags -%patch6 -p1 -b .shared -%patch7 -p1 -b .libxml2 %patch9 -p1 -b .ffmpeg %patch10 -p1 -b .ogl_libs @@ -337,6 +332,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 16 2010 Nicolas Chauvet - 0.4.6-0.3cvs20100116 +- Update to 20100116 +- Removed upstreamed patch for system libxml2 +- Update ffmpeg patch + * Tue Nov 3 2009 kwizart < kwizart at gmail.com > - 0.4.6-0.2cvs20090919 - Attempt to fix rfbz#270 diff --git a/sources b/sources index 22d2fc3..4bd8278 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3211533978e01971f9817ae844536d76 gpac-20090919.tar.bz2 +6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2