Author: kwizart Update of /cvs/free/rpms/gpac/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6176/devel Modified Files: .cvsignore gpac-snapshot.sh gpac.spec sources Added Files: gpac-0.4.6_15-soname.patch Removed Files: gpac-0.4.6-ffmpeg.patch gpac-0.4.6-makefix.patch gpac-0.4.6-noldflag.patch gpac-0.4.6-osmo.patch gpac-0.4.6-soname.patch Log Message: Update to 20110915 gpac-0.4.6_15-soname.patch: Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) --- NEW FILE gpac-0.4.6_15-soname.patch --- diff -up gpac/src/Makefile.soname gpac/src/Makefile --- 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 -LIB=libgpac.$(DYN_LIB_SUFFIX) +LIBGPAC=libgpac.$(DYN_LIB_SUFFIX) +LIBGPAC_SOVERSION=".0" +LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION) +LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)" ifeq ($(CONFIG_WIN32),yes) #LDFLAGS+=-export-symbols libgpac.def +LD_SONAME= else ifeq ($(CONFIG_DARWIN),yes) -LDFLAGS+=-install_name $(prefix)/lib/$(LIB) +LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC) +LD_SONAME= endif EXTRALIBS+=$(GPAC_SH_FLAGS) endif @@ -181,7 +186,7 @@ SRCS := $(OBJS:.o=.c) all: lib -lib: $(LIB) +lib: $(LIBGPAC) #there's a bunch of warnings in there, get rid of them mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" @@ -200,7 +205,7 @@ compositor: $(LIBGPAC_COMPOSITOR) $(CC) $(CFLAGS) -c -o $@ $< -$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS) +$(LIBGPAC): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS) ifeq ($(CONFIG_DARWIN),yes) libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS) ranlib ../bin/gcc/libgpac_static.a @@ -218,7 +223,7 @@ depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend clean: - rm -f $(OBJS) ../bin/gcc/$(LIB) + rm -f $(OBJS) ../bin/gcc/$(LIBGPAC) rm -rf ../bin/gcc/libgpac_static.a distclean: clean Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 May 2010 14:10:47 -0000 1.6 +++ .cvsignore 22 Sep 2011 21:12:11 -0000 1.7 @@ -1 +1 @@ -gpac-20100527.tar.bz2 +gpac-20110915.tar.bz2 Index: gpac-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/gpac/devel/gpac-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpac-snapshot.sh 3 Aug 2008 14:29:51 -0000 1.1 +++ gpac-snapshot.sh 22 Sep 2011 21:12:14 -0000 1.2 @@ -12,12 +12,10 @@ 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 Index: gpac.spec =================================================================== RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gpac.spec 14 Jul 2011 21:22:48 -0000 1.27 +++ gpac.spec 22 Sep 2011 21:12:14 -0000 1.28 @@ -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 @@ %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 @@ %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 @@ %changelog +* Thu Sep 22 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.4.6-0.15cvs20110915 +- Update to 20110915 + * Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.4.6-0.14.cvs20100527 - Rebuild Index: sources =================================================================== RCS file: /cvs/free/rpms/gpac/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 29 May 2010 14:10:47 -0000 1.6 +++ sources 22 Sep 2011 21:12:14 -0000 1.7 @@ -1 +1 @@ -4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2 +ff3420b29b433d7ff2cf3eb4906149ac gpac-20110915.tar.bz2 --- gpac-0.4.6-ffmpeg.patch DELETED --- --- gpac-0.4.6-makefix.patch DELETED --- --- gpac-0.4.6-noldflag.patch DELETED --- --- gpac-0.4.6-osmo.patch DELETED --- --- gpac-0.4.6-soname.patch DELETED ---