From 5ab1ef97105a732c23ac091321585cb4c7346e8b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 22 Sep 2011 21:12:11 +0000 Subject: [PATCH] Update to 20110915 --- .gitignore | 2 +- gpac-0.4.6-ffmpeg.patch | 80 ------------------- gpac-0.4.6-makefix.patch | 51 ------------ gpac-0.4.6-noldflag.patch | 12 --- gpac-0.4.6-osmo.patch | 14 ---- ...soname.patch => gpac-0.4.6_15-soname.patch | 21 ++--- gpac-snapshot.sh | 8 +- gpac.spec | 21 ++--- sources | 2 +- 9 files changed, 19 insertions(+), 192 deletions(-) delete mode 100644 gpac-0.4.6-ffmpeg.patch delete mode 100644 gpac-0.4.6-makefix.patch delete mode 100644 gpac-0.4.6-noldflag.patch delete mode 100644 gpac-0.4.6-osmo.patch rename gpac-0.4.6-soname.patch => gpac-0.4.6_15-soname.patch (77%) diff --git a/.gitignore b/.gitignore index 48c9686..d1cbeba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gpac-20100527.tar.bz2 +gpac-20110915.tar.bz2 diff --git a/gpac-0.4.6-ffmpeg.patch b/gpac-0.4.6-ffmpeg.patch deleted file mode 100644 index 46319ca..0000000 --- a/gpac-0.4.6-ffmpeg.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up gpac/configure.ffmpeg gpac/configure ---- 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 -+if $cc $TMPO $ffmpeg_cflags -c $TMPC 2> /dev/null ; then - old_ffmpeg_inc="no" - else - -@@ -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 $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 $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then - has_ffmpeg="local" - echo OK - fi -@@ -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 -+if test x$has_ffmpeg != x ; then -+ echo "FFMPEG_CFLAGS=$ffmpeg_cflags" >> config.mak -+ echo "FFMPEG_LFLAGS=$ffmpeg_lflags" >> config.mak -+fi - - echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak - 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 2010-05-21 01:49:31.000000000 -0600 -+++ gpac/modules/ffmpeg_in/Makefile 2010-05-27 13:17:56.052191678 -0600 -@@ -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 -@@ -15,7 +15,7 @@ LDFLAGS+=-pg - endif - - LOCAL_LIB= --LINKLIBS=-lgpac -lavcodec -lavformat -lavutil -lz -+LINKLIBS=-lgpac -lz $(FFMPEG_LFLAGS) - - #darwin needs bz2 - ifeq ($(CONFIG_DARWIN),yes) -@@ -25,8 +25,6 @@ endif - #old ffmpeg lib - ifeq ($(CONFIG_FFMPEG_OLD), yes) - CFLAGS+=-DFFMPEG_OLD_HEADERS --else --LINKLIBS+=-lswscale - endif - - #common obj diff --git a/gpac-0.4.6-makefix.patch b/gpac-0.4.6-makefix.patch deleted file mode 100644 index 707308c..0000000 --- a/gpac-0.4.6-makefix.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gpac/Makefile.makefix 2010-05-05 09:18:35.000000000 -0600 -+++ gpac/Makefile 2010-05-27 12:19:54.051316154 -0600 -@@ -60,11 +60,11 @@ - install -d "$(DESTDIR)$(mandir)" - install -d "$(DESTDIR)$(mandir)/man1" - if [ -d doc ] ; then \ -- install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ ; \ -- install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \ -- install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \ -+ install -pm 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ ; \ -+ install -pm 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \ -+ install -pm 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \ - install -d "$(DESTDIR)$(prefix)/share/gpac" ; \ -- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \ -+ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \ - fi - - # install -d "$(DESTDIR)$(prefix)/share/gpac/gui" ; \ -@@ -97,23 +97,25 @@ - install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX) - else -- install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) -- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX) -+ install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION) -+ ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX) -+ifeq ($(DESTDIR)$(prefix),$(prefix)) - ldconfig || true - endif - endif -+endif - - install-lib: - mkdir -p "$(DESTDIR)$(prefix)/include/gpac" -- install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" -+ install -pm 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" - mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" -- install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" -+ install -pm 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" - mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" -- install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" -- install -m 644 $(SRC_PATH)/config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h" -+ install -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" -+ install -pm 644 $(SRC_PATH)/config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h" - ifeq ($(GPAC_ENST), yes) - mkdir -p "$(DESTDIR)$(prefix)/include/gpac/enst" -- install -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" -+ install -pm 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" - endif - mkdir -p "$(DESTDIR)$(prefix)/$(libdir)" - install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)" diff --git a/gpac-0.4.6-noldflag.patch b/gpac-0.4.6-noldflag.patch deleted file mode 100644 index 2abe239..0000000 --- a/gpac-0.4.6-noldflag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gpac/configure.noldflag gpac/configure ---- gpac/configure.noldflag 2011-03-10 16:15:56.887459002 +0100 -+++ gpac/configure 2011-03-10 16:58:50.029459001 +0100 -@@ -143,7 +143,7 @@ extralibs="-lm" - bigendian="no" - SHFLAGS=-shared - need_inet_aton="no" --LDFLAGS="$LDFLAGS -Wl --warn-common" -+#LDFLAGS="$LDFLAGS -Wl --warn-common" - CFLAGS="" - CPPFLAGS="" - GPAC_SH_FLAGS=-lpthread diff --git a/gpac-0.4.6-osmo.patch b/gpac-0.4.6-osmo.patch deleted file mode 100644 index ce219f3..0000000 --- a/gpac-0.4.6-osmo.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gpac/configure.osmo 2010-05-27 13:25:30.365191378 -0600 -+++ gpac/configure 2010-05-27 14:03:08.494369924 -0600 -@@ -1007,6 +1016,11 @@ wx_cflags=`wx-config --cppflags core, ba - wx_lflags=`wx-config --libs core, base` - fi - -+if test "$has_wx" = "yes"; then -+wx_lflags="${wx_lflags} `gtk-config --libs`" -+wx_lflags="${wx_lflags} `pkg-config --libs gdk-2.0` -lstdc++" -+fi -+ - if test "$darwin" = "yes" ; then - wx_lflags="-Wl,-bind_at_load $wx_lflags -lstdc++" #10.4 needs it, not sure about 10.3 - fi diff --git a/gpac-0.4.6-soname.patch b/gpac-0.4.6_15-soname.patch similarity index 77% rename from gpac-0.4.6-soname.patch rename to gpac-0.4.6_15-soname.patch index 9ba52b9..cb9fd6c 100644 --- a/gpac-0.4.6-soname.patch +++ b/gpac-0.4.6_15-soname.patch @@ -1,7 +1,7 @@ diff -up gpac/src/Makefile.soname gpac/src/Makefile ---- gpac/src/Makefile.soname 2010-05-29 15:48:35.000000000 +0200 -+++ gpac/src/Makefile 2010-05-29 15:57:23.000000000 +0200 -@@ -158,27 +158,27 @@ endif +--- gpac/src/Makefile.soname 2011-09-22 22:52:41.453724213 +0200 ++++ gpac/src/Makefile 2011-09-22 22:56:31.621576300 +0200 +@@ -158,12 +158,17 @@ endif ##libgpac library output @@ -21,14 +21,7 @@ diff -up gpac/src/Makefile.soname gpac/src/Makefile endif EXTRALIBS+=$(GPAC_SH_FLAGS) endif - --LD_SONAME="-Wl,-soname,$(LIB)" --ifeq ($(CONFIG_DARWIN), yes) --LD_SONAME= --endif -- - - SRCS := $(OBJS:.o=.c) +@@ -181,7 +186,7 @@ SRCS := $(OBJS:.o=.c) all: lib @@ -36,8 +29,8 @@ diff -up gpac/src/Makefile.soname gpac/src/Makefile +lib: $(LIBGPAC) #there's a bunch of warnings in there, get rid of them - mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include -@@ -197,7 +197,7 @@ compositor: $(LIBGPAC_COMPOSITOR) + mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" +@@ -200,7 +205,7 @@ compositor: $(LIBGPAC_COMPOSITOR) $(CC) $(CFLAGS) -c -o $@ $< @@ -46,7 +39,7 @@ diff -up gpac/src/Makefile.soname gpac/src/Makefile ifeq ($(CONFIG_DARWIN),yes) libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS) ranlib ../bin/gcc/libgpac_static.a -@@ -215,7 +215,7 @@ depend: +@@ -218,7 +223,7 @@ depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend clean: diff --git a/gpac-snapshot.sh b/gpac-snapshot.sh index 6dd5f6a..dcc3ae3 100644 --- a/gpac-snapshot.sh +++ b/gpac-snapshot.sh @@ -12,12 +12,10 @@ cleanup() { unset CDPATH pwd=$(pwd) -cvs=$(date +%Y%m%d) +svn=$(date +%Y%m%d) cd "$tmp" -cvs -z3 -d:pserver:anonymous@gpac.cvs.sourceforge.net:/cvsroot/gpac co -P gpac -find . -type d -name CVS -print0 | xargs -0r rm -rf -chmod 755 gpac/configure +svn export http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac rm -rf gpac/extra_lib/ -tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac +tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac cd - >/dev/null diff --git a/gpac.spec b/gpac.spec index bc08288..1ee8acc 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global cvs 20100527 +%global cvs 20110915 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 %global geckover 2.0.0 @@ -17,22 +17,16 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.6 -Release: 0.14.cvs%{?cvs}%{?dist} +Release: 0.15.svn%{?cvs}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ #Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{cvs}.tar.bz2 Source9: gpac-snapshot.sh -#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853860&group_id=84101 -Patch0: gpac-0.4.6-makefix.patch -Patch1: gpac-0.4.6-soname.patch +Patch1: gpac-0.4.6_15-soname.patch Patch2: gpac-0.4.5-amr.patch Patch5: gpac-0.4.6-js_cflags.patch -#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101 -Patch9: gpac-0.4.6-ffmpeg.patch -Patch11: gpac-0.4.6-osmo.patch -Patch12: gpac-0.4.6-noldflag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: ImageMagick @@ -148,13 +142,9 @@ web browsers. %prep %setup -q -n gpac -%patch0 -p1 -b .makefix %patch1 -p1 -b .soname %patch2 -p1 -b .amr %patch5 -p1 -b .jscflags -%patch9 -p1 -b .ffmpeg -%patch11 -p1 -b .osmo -%patch12 -p1 -b .noldflag ## kwizart - enable dynamic mode - hardcoded with patch2 # define SONAME number from the first number of gpac version. @@ -224,7 +214,7 @@ popd %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install install-lib +make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p" %{?_with_mozilla: ## kwizart - Install osmozilla plugin - make instmoz disabled. @@ -336,6 +326,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 22 2011 Nicolas Chauvet - 0.4.6-0.15cvs20110915 +- Update to 20110915 + * Thu Jul 14 2011 Nicolas Chauvet - 0.4.6-0.14.cvs20100527 - Rebuild diff --git a/sources b/sources index 8a11a7e..657a323 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2 +ff3420b29b433d7ff2cf3eb4906149ac gpac-20110915.tar.bz2