Author: kwizart Update of /cvs/free/rpms/gpac/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv24512 Modified Files: gpac-0.4.6-ffmpeg.patch gpac.spec .cvsignore sources Removed Files: gpac-0.4.6-libxml2.patch Log Message: - Update to 20100116 - Removed upstreamed patch for system libxml2 - Update ffmpeg patch gpac-0.4.6-ffmpeg.patch: configure | 19 ++++++++++++++++--- modules/ffmpeg_in/Makefile | 6 ++---- 2 files changed, 18 insertions(+), 7 deletions(-) Index: gpac-0.4.6-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6-ffmpeg.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpac-0.4.6-ffmpeg.patch 19 Sep 2009 12:08:42 -0000 1.1 +++ gpac-0.4.6-ffmpeg.patch 17 Jan 2010 00:43:58 -0000 1.2 @@ -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 <libavcodec/avcodec.h> 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 <ffmpeg/avcodec.h> --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 @@ 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 @@ 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) Index: gpac.spec =================================================================== RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gpac.spec 3 Nov 2009 22:42:58 -0000 1.12 +++ gpac.spec 17 Jan 2010 00:43:58 -0000 1.13 @@ -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 @@ 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 @@ %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 @@ %changelog +* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 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 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2009 12:08:42 -0000 1.4 +++ .cvsignore 17 Jan 2010 00:43:58 -0000 1.5 @@ -1 +1 @@ -gpac-20090919.tar.bz2 +gpac-20100116.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/gpac/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2009 12:08:42 -0000 1.4 +++ sources 17 Jan 2010 00:43:58 -0000 1.5 @@ -1 +1 @@ -3211533978e01971f9817ae844536d76 gpac-20090919.tar.bz2 +6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2 --- gpac-0.4.6-libxml2.patch DELETED ---