From 5c36022be14736198057bee719215762d69aa52b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 29 May 2010 14:10:47 +0000 Subject: [PATCH] - Rewrite soname patch that is still needed. - Allow --with osmo conditional - Explicitely list binaries. --- .gitignore | 2 +- gpac-0.4.5-amr.patch | 56 ++++--------------- gpac-0.4.5-lib64.patch | 34 ----------- gpac-0.4.5-shared_sggen.patch | 96 -------------------------------- gpac-0.4.5-soname.patch | 11 ---- gpac-0.4.5-system_openjpeg.patch | 36 ------------ gpac-0.4.6-ffmpeg.patch | 11 ++-- gpac-0.4.6-makefix.patch | 15 +++-- gpac-0.4.6-ogl_libs.patch | 12 ---- gpac-0.4.6-osmo.patch | 14 +++++ gpac-0.4.6-soname.patch | 57 +++++++++++++++++++ gpac.spec | 58 ++++++++++--------- sources | 2 +- 13 files changed, 132 insertions(+), 272 deletions(-) delete mode 100644 gpac-0.4.5-lib64.patch delete mode 100644 gpac-0.4.5-shared_sggen.patch delete mode 100644 gpac-0.4.5-soname.patch delete mode 100644 gpac-0.4.5-system_openjpeg.patch delete mode 100644 gpac-0.4.6-ogl_libs.patch create mode 100644 gpac-0.4.6-osmo.patch create mode 100644 gpac-0.4.6-soname.patch diff --git a/.gitignore b/.gitignore index 6149439..48c9686 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gpac-20100116.tar.bz2 +gpac-20100527.tar.bz2 diff --git a/gpac-0.4.5-amr.patch b/gpac-0.4.5-amr.patch index 122e837..edc56c9 100644 --- a/gpac-0.4.5-amr.patch +++ b/gpac-0.4.5-amr.patch @@ -1,20 +1,6 @@ -diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c ---- gpac/modules/amr_dec/amr_dec.c.amr 2008-12-17 12:33:30.000000000 +0100 -+++ gpac/modules/amr_dec/amr_dec.c 2008-12-17 12:33:52.000000000 +0100 -@@ -24,8 +24,8 @@ - - - /*include AMR stuff*/ --#include "amr_nb/sp_dec.h" --#include "amr_nb/d_homing.h" -+#include -+#include - /*remove AMR types to avoid any typedef warning/error*/ - #undef Float - #undef Bool diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile ---- gpac/modules/amr_dec/Makefile.amr 2008-12-17 12:33:42.000000000 +0100 -+++ gpac/modules/amr_dec/Makefile 2008-12-17 12:33:49.000000000 +0100 +--- gpac/modules/amr_dec/Makefile.amr 2010-05-04 05:27:18.000000000 -0600 ++++ gpac/modules/amr_dec/Makefile 2010-05-27 13:02:48.630191469 -0600 @@ -17,31 +17,7 @@ LDFLAGS+=-pg endif @@ -48,8 +34,8 @@ diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile SRCS := $(OBJS:.o=.c) -@@ -56,11 +32,14 @@ else - OBJSPIC=$(OBJS) +@@ -50,11 +26,14 @@ ifeq ($(CONFIG_WIN32),yes) + #LDFLAGS+=-export-symbols amr_dec.def endif +AMR_NB_LIBS=-lamrnb @@ -59,32 +45,14 @@ diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile $(LIB): $(OBJS) -- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac %.o: %.c -diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c ---- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2008-12-17 12:37:26.000000000 +0100 -+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-12-17 12:38:07.000000000 +0100 -@@ -31,12 +31,12 @@ - - #ifdef GPAC_HAS_AMR_FT - /*AMR NB*/ --#include "amr_nb_ft/interf_dec.h" -+#include - #endif - - #ifdef GPAC_HAS_AMR_FT_WB - /*AMR WB*/ --#include "amr_wb_ft/dec_if.h" -+#include - #endif - - /*default size in CU of composition memory for audio*/ diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile ---- gpac/modules/amr_float_dec/Makefile.amr 2008-12-17 12:34:17.000000000 +0100 -+++ gpac/modules/amr_float_dec/Makefile 2008-12-17 12:36:56.000000000 +0100 +--- gpac/modules/amr_float_dec/Makefile.amr 2010-05-04 05:27:21.000000000 -0600 ++++ gpac/modules/amr_float_dec/Makefile 2010-05-27 13:05:42.286191285 -0600 @@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o #AMR NB obj CFLAGS+=-DGPAC_HAS_AMR_FT @@ -108,12 +76,12 @@ diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Make endif -@@ -51,7 +53,7 @@ all: $(LIB) +@@ -45,7 +47,7 @@ all: $(LIB) - $(LIB): $(OBJSPIC) -- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac + $(LIB): $(OBJS) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac %.o: %.c diff --git a/gpac-0.4.5-lib64.patch b/gpac-0.4.5-lib64.patch deleted file mode 100644 index 5ae48d4..0000000 --- a/gpac-0.4.5-lib64.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up gpac/configure.lib64 gpac/configure ---- gpac/configure.lib64 2008-12-17 14:25:31.000000000 +0100 -+++ gpac/configure 2008-12-17 14:26:24.000000000 +0100 -@@ -1126,10 +1126,10 @@ if test "$disable_opengl" = "no" ; then - fi - if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then - has_opengl="yes" -- elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then -+ elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then - has_opengl="yes" - INCL3D="-I$X11_PATH/include" -- LINK3D="-L$X11_PATH/lib $LINK3D" -+ LINK3D="-L$X11_PATH/lib64 $LINK3D" - fi - if test "$has_opengl" = "no" ; then - LINK3D="" -@@ -1186,7 +1186,7 @@ cat > $TMPC << EOF - #include - int main( void ) { return 0; } - EOF --if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then -+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then - has_x11="yes" - - #look for X11 shared memory support -@@ -1198,7 +1198,7 @@ cat > $TMPC << EOF - int main( void ) { return 0; } - EOF - --if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then -+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then - has_x11_shm="yes" - fi - diff --git a/gpac-0.4.5-shared_sggen.patch b/gpac-0.4.5-shared_sggen.patch deleted file mode 100644 index 0d988c9..0000000 --- a/gpac-0.4.5-shared_sggen.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -up gpac/applications/generators/SVG/Makefile.shared gpac/applications/generators/SVG/Makefile ---- gpac/applications/generators/SVG/Makefile.shared 2007-01-09 13:43:57.000000000 +0100 -+++ gpac/applications/generators/SVG/Makefile 2008-02-17 17:56:49.000000000 +0100 -@@ -15,7 +15,7 @@ LDFLAGS+=-pg - endif - - #common obj --OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o -+OBJS= html.o laser.o main.o v1.o v2.o v3.o - - CFLAGS+=-g - LDFLAGS+=-g -@@ -24,10 +24,12 @@ CFLAGS+=$(XML2_CFLAGS) - ifeq ($(CONFIG_WIN32),yes) - EXE=.exe - PROG=SVGGen$(EXE) -+OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o - EXTRALIBS+=-lwsock32 -lz - else - EXT= - PROG=SVGGen -+LIBS=-L../../../bin/gcc/ -lgpac - endif - - SRCS := $(OBJS:.o=.c) -@@ -35,7 +37,7 @@ SRCS := $(OBJS:.o=.c) - all: $(PROG) - - SVGGen$(EXE): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS) - - - %.o: %.c -diff -up gpac/applications/generators/X3D/Makefile.shared gpac/applications/generators/X3D/Makefile ---- gpac/applications/generators/X3D/Makefile.shared 2006-05-24 11:52:52.000000000 +0200 -+++ gpac/applications/generators/X3D/Makefile 2008-02-17 17:56:09.000000000 +0100 -@@ -15,15 +15,16 @@ LDFLAGS+=-pg - endif - - #common obj --OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o -+OBJS= main.o - - ifeq ($(CONFIG_WIN32),yes) - EXE=.exe - PROG=X3DGen$(EXE) -+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o - else --OBJS+=../../../src/utils/os_divers.o - EXT= - PROG=X3DGen -+LIBS=-L../../../bin/gcc/ -lgpac - endif - - SRCS := $(OBJS:.o=.c) -@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c) - all: $(PROG) - - $(PROG): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS) - - - %.o: %.c -diff -up gpac/applications/generators/MPEG4/Makefile.shared gpac/applications/generators/MPEG4/Makefile ---- gpac/applications/generators/MPEG4/Makefile.shared 2006-05-24 11:52:52.000000000 +0200 -+++ gpac/applications/generators/MPEG4/Makefile 2008-02-17 17:55:25.000000000 +0100 -@@ -15,15 +15,16 @@ LDFLAGS+=-pg - endif - - #common obj --OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o -+OBJS= main.o - - ifeq ($(CONFIG_WIN32),yes) - EXE=.exe - PROG=MPEG4Gen$(EXE) -+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o - else --OBJS+=../../../src/utils/os_divers.o - EXT= - PROG=MPEG4Gen -+LIBS=-L../../../bin/gcc/ -lgpac - endif - - SRCS := $(OBJS:.o=.c) -@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c) - all: $(PROG) - - $(PROG): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS) - - - %.o: %.c diff --git a/gpac-0.4.5-soname.patch b/gpac-0.4.5-soname.patch deleted file mode 100644 index a177bfb..0000000 --- a/gpac-0.4.5-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gpac/src/Makefile.soname gpac/src/Makefile ---- gpac/src/Makefile.soname 2008-12-02 15:01:08.000000000 +0100 -+++ gpac/src/Makefile 2008-12-17 11:55:52.000000000 +0100 -@@ -171,6 +171,7 @@ ifeq ($(CONFIG_DARWIN),yes) - LDFLAGS+=-install_name $(prefix)/lib/$(LIB) - endif - EXTRALIBS+=$(GPAC_SH_FLAGS) -+LDFLAGS+="-Wl,-soname,libgpac.so.0" - endif - - ifeq ($(WANT_PIC),yes) diff --git a/gpac-0.4.5-system_openjpeg.patch b/gpac-0.4.5-system_openjpeg.patch deleted file mode 100644 index 0f98d85..0000000 --- a/gpac-0.4.5-system_openjpeg.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up gpac/configure.openjpeg gpac/configure ---- gpac/configure.openjpeg 2008-02-17 15:16:22.000000000 +0100 -+++ gpac/configure 2008-02-17 15:16:31.000000000 +0100 -@@ -526,17 +526,17 @@ fi - #look for OpenJPEG support - cat > $TMPC << EOF - #include --#include -+#include - int main( void ) { return 0; } - EOF - --if $cc -o $TMPO $TMPC -lopenjpeg 2> /dev/null ; then -+if $cc -o $TMPO $TMPC -lopenjpeg -lm -L${libdir} 2> /dev/null ; then - has_openjpeg="system" - elif test "$alt_macosx_dir" != "" ; then - if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib -ljpeg 2> /dev/null ; then - has_openjpeg="system" - fi --elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg 2> /dev/null ; then -+elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg -lm 2> /dev/null ; then - has_openjpeg="local" - fi - -diff -up gpac/modules/img_in/jp2_dec.c.openjpeg gpac/modules/img_in/jp2_dec.c ---- gpac/modules/img_in/jp2_dec.c.openjpeg 2007-09-12 18:47:11.000000000 +0200 -+++ gpac/modules/img_in/jp2_dec.c 2008-02-17 15:16:22.000000000 +0100 -@@ -26,7 +26,7 @@ - - #ifdef GPAC_HAS_JP2 - --#include -+#include - - typedef struct - { diff --git a/gpac-0.4.6-ffmpeg.patch b/gpac-0.4.6-ffmpeg.patch index 52c5ffc..46319ca 100644 --- a/gpac-0.4.6-ffmpeg.patch +++ b/gpac-0.4.6-ffmpeg.patch @@ -49,8 +49,8 @@ diff -up gpac/configure.ffmpeg gpac/configure 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 2009-07-31 09:37:41.000000000 +0200 -+++ gpac/modules/ffmpeg_in/Makefile 2010-01-16 19:09:26.460862249 +0100 +--- 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 @@ -60,13 +60,16 @@ diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile ifeq ($(DEBUGBUILD), yes) CFLAGS+=-g -@@ -15,13 +15,11 @@ LDFLAGS+=-pg +@@ -15,7 +15,7 @@ LDFLAGS+=-pg endif LOCAL_LIB= --LINKLIBS=-lgpac -lavcodec -lavformat -lz +-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 diff --git a/gpac-0.4.6-makefix.patch b/gpac-0.4.6-makefix.patch index 6193d92..707308c 100644 --- a/gpac-0.4.6-makefix.patch +++ b/gpac-0.4.6-makefix.patch @@ -1,7 +1,6 @@ -diff -up gpac/Makefile.makefix gpac/Makefile ---- gpac/Makefile.makefix 2009-07-31 18:43:25.000000000 +0200 -+++ gpac/Makefile 2009-09-01 17:14:20.615499921 +0200 -@@ -60,11 +60,11 @@ install: +--- 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 \ @@ -12,12 +11,12 @@ diff -up gpac/Makefile.makefix gpac/Makefile + 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/ ; \ +- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \ ++ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \ fi - uninstall: -@@ -89,23 +89,25 @@ ifeq ($(CONFIG_DARWIN),yes) + # 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 diff --git a/gpac-0.4.6-ogl_libs.patch b/gpac-0.4.6-ogl_libs.patch deleted file mode 100644 index cb79119..0000000 --- a/gpac-0.4.6-ogl_libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gpac/configure.ogl_libs gpac/configure ---- gpac/configure.ogl_libs 2009-09-19 13:29:46.988993098 +0200 -+++ gpac/configure 2009-09-19 13:33:34.840741932 +0200 -@@ -1319,7 +1319,7 @@ if test "$disable_3d" = "no" ; then - elif test "$darwin" = "yes" ; then - LINK3D="-lgl -lglu" - else -- LINK3D="-lGL -lglut" -+ LINK3D="-lGLU -lGL -lglut" - fi - if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then - has_opengl="yes" diff --git a/gpac-0.4.6-osmo.patch b/gpac-0.4.6-osmo.patch new file mode 100644 index 0000000..ce219f3 --- /dev/null +++ b/gpac-0.4.6-osmo.patch @@ -0,0 +1,14 @@ +--- 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-soname.patch new file mode 100644 index 0000000..9ba52b9 --- /dev/null +++ b/gpac-0.4.6-soname.patch @@ -0,0 +1,57 @@ +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 + + + ##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 + +-LD_SONAME="-Wl,-soname,$(LIB)" +-ifeq ($(CONFIG_DARWIN), yes) +-LD_SONAME= +-endif +- + + 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 +@@ -197,7 +197,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 +@@ -215,7 +215,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 diff --git a/gpac.spec b/gpac.spec index 9325dc3..54f2af6 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,8 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global cvs 20100116 -%global with_osmo 0 +%global cvs 20100527 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 %global geckover 1.9.1 @@ -18,7 +17,7 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.6 -Release: 0.5.cvs%{?cvs}%{?dist} +Release: 0.7.cvs%{?cvs}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ @@ -27,14 +26,12 @@ 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.5-soname.patch +Patch1: gpac-0.4.6-soname.patch 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 #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 +Patch11: gpac-0.4.6-osmo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: ImageMagick @@ -66,6 +63,7 @@ BuildRequires: xmlrpc-c-devel BuildRequires: doxygen BuildRequires: desktop-file-utils %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} +%{?_with_osmo:BuildRequires: gtk+-devel gtk2-devel} %description GPAC is a multimedia framework based on the MPEG-4 Systems standard developed @@ -112,7 +110,7 @@ Requires: %{name}-devel = %{version}-%{release} %description devel-static Static library for gpac. -%if %{with_osmo} +%{?_with_osmo: %package -n %{osmo} Summary: Media player based on gpac Group: Applications/Multimedia @@ -130,7 +128,7 @@ Osmo4 is an MPEG-4 player with the following features: * Support for Advanced Text and Graphics extension of MPEG-4 Systems under standardization. * Frame export to JPG, PNG, BMP. -%endif +} %{?_with_mozilla: %package -n mozilla-%{osmo} @@ -151,13 +149,9 @@ web browsers. %patch0 -p1 -b .makefix %patch1 -p1 -b .soname %patch2 -p1 -b .amr -%if %{_lib} == "lib64" -%patch3 -p1 -b .lib64 -%endif -%patch4 -p1 -b .openjpeg %patch5 -p1 -b .jscflags %patch9 -p1 -b .ffmpeg -%patch10 -p1 -b .ogl_libs +%patch11 -p1 -b .osmo ## kwizart - enable dynamic mode - hardcoded with patch2 # define SONAME number from the first number of gpac version. @@ -180,7 +174,7 @@ rm -rf doc/ipmpx_syntax.bt.origine %configure \ --enable-debug \ --X11-path=%{_prefix} \ - --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \ + --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \ --disable-oss-audio \ %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \ %{?_with_amr:--enable-amr} \ @@ -215,9 +209,9 @@ popd } # Parallele build will fail -make all +make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" #{?_smp_mflags} -make sggen +make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" #{?_smp_mflags} ## kwizart - build doxygen doc for devel @@ -236,7 +230,7 @@ install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/ install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt } -%if %{with_osmo} +%{?_with_osmo: # Desktop menu Osmo4 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications cat > %{osmo}.desktop < - 0.4.6-0.7cvs20100116 +- Rewrite soname patch that is still needed. +- Allow --with osmo conditional +- Explicitely list binaries. + +* Thu May 27 2010 Lucas Jacobs - 0.4.6-0.6cvs20100527 +- Update to 20100527 +- Removed upstreamed lib64, soname, OpenJPEG, OpenGL patches +- Update ffmpeg, makefix and amr patches +- Added patch to build osmo4_wx properly + * Sat Mar 13 2010 Nicolas Chauvet - 0.4.6-0.5.cvs20100116 - Fix CFLAGS for large files rfbz#1116 diff --git a/sources b/sources index 4bd8278..8a11a7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2 +4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2