Mon Feb 23 14:54:37 CET 2009

Author: kwizart

Update of /cvs/free/rpms/gpac/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23378/F-10

Modified Files:
	.cvsignore gpac-0.4.5-libxml2.patch gpac.spec sources 
Added Files:
	gpac-0.4.5-amr.patch gpac-0.4.5-lib64.patch 
	gpac-0.4.5-makefix.patch gpac-0.4.5-soname.patch 
	gpac-ppc64.patch 
Removed Files:
	gpac-0.4.4-soname.patch gpac-0.4.5-shared_amr.patch 
	gpac-0.4.5-system_libdir.patch gpac-0.4.5-timestramps.patch 
	gpac-20080211cvs-gcc43-gnusource.patch 
	gpac-20080211cvs-no-osmozilla.patch 
Log Message:
Update gpac to 0.4.5


gpac-0.4.5-amr.patch:

--- NEW FILE gpac-0.4.5-amr.patch ---
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 <amrnb/sp_dec.h>
+#include <amrnb/d_homing.h>
 /*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
@@ -17,31 +17,7 @@ LDFLAGS+=-pg
 endif
 
 #common obj
-OBJS=amr_in.o amr_dec.o \
-	./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
-	./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
-	./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
-	./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
-	./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
-	./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
-	./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
-	./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
-	./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
-	./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
-	./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
-	./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
-	./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
-	./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
-	./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
-	./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
-	./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
-	./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
-	./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
-	./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
-	./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
-	./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
-	./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
-
+OBJS=amr_in.o amr_dec.o
 
 SRCS := $(OBJS:.o=.c) 
 
@@ -56,11 +32,14 @@ else
 OBJSPIC=$(OBJS)
 endif
 
+AMR_NB_LIBS=-lamrnb
+AMR_WB_LIBS=-lamrwb
+
 all: $(LIB)
 
 
 $(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
 
 
 %.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 <amrnb/interf_dec.h>
 #endif
 
 #ifdef GPAC_HAS_AMR_FT_WB
 /*AMR WB*/
-#include "amr_wb_ft/dec_if.h"
+#include <amrwb/dec_if.h>
 #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
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
 #AMR NB obj
 CFLAGS+=-DGPAC_HAS_AMR_FT
 ifeq ($(CONFIG_AMR_NB_FT), yes)
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
+#OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
+AMR_NB_LIBS=-lamrnb
 endif
 
 
 #AMR WB obj
 CFLAGS+=-DGPAC_HAS_AMR_FT_WB
 ifeq ($(CONFIG_AMR_WB_FT), yes)
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
-	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
-	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
+#OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
+#	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
+#	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
+AMR_WB_LIBS=-lamrwb
 endif
 
 
@@ -51,7 +53,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
 
 
 %.o: %.c

gpac-0.4.5-lib64.patch:

--- NEW FILE gpac-0.4.5-lib64.patch ---
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 <X11/Xlib.h>
 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
 

gpac-0.4.5-makefix.patch:

--- NEW FILE gpac-0.4.5-makefix.patch ---
diff -up gpac/Makefile.makefix gpac/Makefile
--- gpac/Makefile.makefix	2008-10-23 17:40:38.000000000 +0200
+++ gpac/Makefile	2008-12-17 12:10:45.000000000 +0100
@@ -53,9 +53,8 @@ install:
 	install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
 	$(MAKE) -C applications install
 	install -d "$(DESTDIR)$(moddir)"
-	install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
-	rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
-	rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+	install bin/gcc/gm*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
+
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir)
 else
@@ -66,19 +65,18 @@ ifeq ($(CONFIG_DARWIN),yes)
 	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)
-	ldconfig || true
+	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)
 endif
 endif
 	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
 
 uninstall:
@@ -94,17 +92,15 @@ uninstall:
 
 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 -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
 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)/lib"
-	install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
 	install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
 

gpac-0.4.5-soname.patch:

--- NEW FILE gpac-0.4.5-soname.patch ---
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)

gpac-ppc64.patch:

--- NEW FILE gpac-ppc64.patch ---
diff -up gpac/configure~ gpac/configure
--- gpac/configure~	2008-12-17 14:58:05.000000000 +0100
+++ gpac/configure	2008-12-18 23:10:50.000000000 +0100
@@ -236,6 +236,10 @@ case "$cpu" in
   alpha)
     cpu="alpha"
   ;;
+  ppc64)
+    cpu="powerpc"
+    libdir="lib64"
+  ;;
   "Power Macintosh"|ppc)
     cpu="powerpc"
   ;;


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 14:29:51 -0000	1.2
+++ .cvsignore	23 Feb 2009 13:54:36 -0000	1.3
@@ -1 +1 @@
-gpac-20080217.tar.bz2
+gpac-0.4.5-repack.tar.bz2

gpac-0.4.5-libxml2.patch:

Index: gpac-0.4.5-libxml2.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/gpac-0.4.5-libxml2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.5-libxml2.patch	3 Aug 2008 14:29:51 -0000	1.1
+++ gpac-0.4.5-libxml2.patch	23 Feb 2009 13:54:36 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile
---- gpac/applications/generators/SVG/Makefile.libxml2	2008-02-17 19:12:02.000000000 +0100
-+++ gpac/applications/generators/SVG/Makefile	2008-02-17 19:12:41.000000000 +0100
+--- gpac/applications/generators/SVG/Makefile.libxml2	2008-12-17 12:59:23.000000000 +0100
++++ gpac/applications/generators/SVG/Makefile	2008-12-17 12:59:23.000000000 +0100
 @@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c) 
  all: $(PROG)
  
@@ -11,19 +11,19 @@
  
  %.o: %.c
 diff -up gpac/configure.libxml2 gpac/configure
---- gpac/configure.libxml2	2008-02-17 19:13:07.000000000 +0100
-+++ gpac/configure	2008-02-17 20:09:09.000000000 +0100
-@@ -59,6 +59,7 @@ has_oss_audio="no"
- has_alsa="no"
+--- gpac/configure.libxml2	2008-12-17 12:59:23.000000000 +0100
++++ gpac/configure	2008-12-17 13:02:37.000000000 +0100
+@@ -68,6 +68,7 @@ has_alsa="no"
+ has_jack="no"
  has_x11="no"
  has_x11_shm="no"
 +has_libxml2="no"
+ has_x11_xv="no"
  disable_svg="no"
  no_gcc_opt="no"
- use_fixed_point="no"
-@@ -892,6 +893,15 @@ for opt do
-   esac
- done
+@@ -901,6 +902,15 @@ fi
+ fi
+ #end wx test
  
 +# If svg isn't disabled
 +if test "$disable_svg" != "yes"; then
@@ -35,17 +35,17 @@
 +  fi
 +fi
  
- #look for X11 shared memory support
+ # look for IPv6
  cat > $TMPC << EOF
-@@ -1256,6 +1266,11 @@ echo "CONFIG_FFMPEG=$has_ffmpeg" >> conf
- echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
- echo "CONFIG_ALSA=$has_alsa" >> config.mak
+@@ -1579,6 +1589,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 "HAS_OPENGL=$has_opengl" >> config.mak
- if test "$has_opengl" = "yes" ; then
-   echo "OGL_LIBS=$LINK3D" >> config.mak
+ echo "GPAC_USE_TINYGL=$has_tinygl" >> config.mak
+ echo "OGL_INCLS=$INCL3D" >> config.mak
+ if test "$disable_svg" = "yes" ; then


Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/gpac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpac.spec	8 Sep 2008 16:45:45 -0000	1.2
+++ gpac.spec	23 Feb 2009 13:54:36 -0000	1.3
@@ -7,9 +7,7 @@
 #        - Fix unused-direct-shlib-dependency on libgpac
 
 %define osmo          Osmo4
-%define cvs           20080217
-%define with_amr      0
-%define with_mozilla  0
+#define cvs           20080217
 %define with_static   1
 %define with_osmo     0
 # Mozilla stuff fails. It's completely disabled for now.
@@ -21,26 +19,26 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.4.5
-Release:     0.5.%{cvs}cvs%{?dist}
+Release:     3%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
-#Source0:    http://downloads.sourceforge.net/gpac/gpac-0.4.4.tar.gz
-Source0:     http://rpms.kwizart.net/fedora/SOURCES/gpac-%{cvs}.tar.bz2
-Source10:    %{name}-snapshot.sh
-Patch0:      gpac-20080211cvs-gcc43-gnusource.patch
-Patch1:      gpac-20080211cvs-no-osmozilla.patch
-Patch2:      gpac-0.4.4-soname.patch
-Patch3:      gpac-0.4.5-system_libdir.patch
+#Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
+Source0:     http://rpms.kwizart.net/fedora/SOURCE/gpac-%{version}-repack.tar.bz2
+Source9:     gpac-snapshot.sh
+Patch0:      gpac-0.4.5-makefix.patch
+Patch1:      gpac-0.4.5-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.5-timestramps.patch
 Patch6:      gpac-0.4.5-shared_sggen.patch
 Patch7:      gpac-0.4.5-libxml2.patch
-Patch8:      gpac-0.4.5-shared_amr.patch
+Patch8:      gpac-ppc64.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 BuildRequires:  ImageMagick
 BuildRequires:  SDL-devel
+BuildRequires:  a52dec-devel
 BuildRequires:  librsvg2-devel >= 2.5.0
 BuildRequires:  libGLU-devel
 BuildRequires:  freeglut-devel
@@ -54,21 +52,18 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  openjpeg-devel
+BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
+BuildRequires:  libXv-devel
 BuildRequires:  wxGTK-devel
-%if %{with_mozilla}
-BuildRequires:  gecko-devel >= %{geckoverver}
-BuildRequires:  js-devel
-%endif
+BuildRequires:  xmlrpc-c-devel
+%{?_with_mozilla:BuildRequires: gecko-devel}
 BuildRequires:  doxygen
 BuildRequires:  desktop-file-utils
-%if %{with_amr}
-BuildRequires: amrnb-devel
-BuildRequires: amrwb-devel
-%endif
+%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 
 %description
 GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
@@ -131,7 +126,7 @@
   * Frame export to JPG, PNG, BMP.
 %endif
 
-%if %{with_mozilla}
+%{?_with_mozilla:
 %package -n mozilla-%{osmo}
 Summary:  Osmo Media Player plugin for Mozilla compatible web browsers
 Group:    Applications/Multimedia  
@@ -143,47 +138,26 @@
 %description -n mozilla-%{osmo}
 This package contains the OSMO Media Player plugin for Mozilla compatible
 web browsers.
-%endif
+}
 
 %prep
 %setup -q -n gpac
-pushd src
-%patch0 -b .patch0
-popd
-pushd applications
-%patch1 -b .patch1
-popd
-%patch2 -p1 -b .soname
-%patch3 -p1 -b .libdir
+%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 .timestramps
 %patch6 -p1 -b .shared
 %patch7 -p1 -b .libxml2
-%patch8 -p1 -b .amr
+%patch8 -p1 -b .ppc64
 
 ## kwizart - enable dynamic mode - hardcoded with patch2
 # define SONAME number from the first number of gpac version.
 #define soname libgpac.so.0
 #sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
 
-
-## lib64 compatible - hardcoded with patch3
-## kwizart - lib64 compatible - modified 
-#sed -i -e 's|lGLU|lGLU -L%{_libdir}|g' configure
-#sed -i -e 's|$(prefix)/lib/gpac|%{_libdir}/gpac|' configure
-#sed -i -e 's|$(prefix)/lib|%{_libdir}|' Makefile
-#sed -i -e 's|$(prefix)/include|%{_includedir}|' Makefile
-#sed -i -e 's|$(prefix)/lib/$(LIB)|%{_libdir}/$(LIB)|' Makefile
-#ifarch x86_64 ia64 ppc64
-#sed -i -e 's|is_64="no"|is_64="yes"|' configure
-#endif
-
-# Fix openjpeg detection and built - hardcoded with patch4
-#sed -i.openjpeg -e 's|openjpeg.h|openjpeg/openjpeg.h|' configure modules/img_in/jp2_dec.c
-
-# Fix compat-wxGTK26 use -  seems unneeded but 
-# sed -i -e 's|wx-config|wx-2.6-config|' configure
-
 # Update doxygen
 pushd doc
 doxygen -u
@@ -204,25 +178,17 @@
 %build
 %configure \
   --enable-debug \
-  --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1" \
-  --libdir=%{_libdir} \
+  --X11-path=%{_prefix} \
+  --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
   --disable-oss-audio \
-%if %with_mozilla
-  --mozdir=%{_libdir}/mozilla/plugins \
-%endif
-%if %{with_amr}
-  --enable-amr \
-%endif
+%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
+%{?_with_amr:--enable-amr} \
   --disable-static
 
-#  --extra-cflags '-fshort-wchar -I/usr/include/xulrunner-sdk-1.9pre/stable -I/usr/include/nspr4' \
-  # ^ pkg-config libxul --cflags
-
-
 ##
 ## Osmo-zila plugin.
 ##
-%if %{with_mozilla}
+%{?_with_mozilla:
 #
 # Rebuild osmozilla.xpt
 pushd applications/osmozilla
@@ -245,7 +211,7 @@
 #    -I%{_includedir}/firefox-%{mozver}/xpcom    \
 #    -I%{_includedir}/nspr4/ $INCLUDES"       \
 #  install
-%endif
+}
 
 # Parallele build will fail
 make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
@@ -262,12 +228,12 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install install-lib
 
-%if %{with_mozilla}
+%{?_with_mozilla:
 ## kwizart - Install osmozilla plugin - make instmoz disabled.
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/{plugins,components}
 install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nposmozilla.so
 install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
-%endif
+}
 
 %if %{with_osmo}
 # Desktop menu Osmo4
@@ -279,13 +245,13 @@
 Comment=MPEG-4 Media Player
 Exec=%{osmo}
 Terminal=false
-Icon=%{osmo}.xpm
+Icon=%{osmo}
 Type=Application
 Encoding=UTF-8
-Categories=Application;AudioVideo;Player;
+Categories=AudioVideo;Player;
 EOF
 
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
   %{osmo}.desktop
@@ -298,13 +264,9 @@
 %endif
 
 ## kwizart - rpmlint gpac no-ldconfig-symlink
-mv  $RPM_BUILD_ROOT%{_libdir}/libgpac-%{version}-DEV.so $RPM_BUILD_ROOT%{_libdir}/libgpac.so.%{version}
 ln -sf  libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
 ln -sf  libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
 
-# Don't provide libgpac.so twice
-rm -rf  $RPM_BUILD_ROOT%{_libdir}/gpac/libgpac.so
-
 #Install generated sggen binaries
 for b in MPEG4 SVG X3D; do
   pushd applications/generators/${b}
@@ -312,6 +274,9 @@
   popd
 done
 
+#Fix doxygen timestamp
+touch -r Changelog doc/html/*
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -343,12 +308,12 @@
 %{_datadir}/pixmaps/%{osmo}.xpm
 %endif
 
-%if %{with_mozilla}
+%{?_with_mozilla:
 %files -n mozilla-%{osmo}
 %defattr(-,root,root)
 %{_libdir}/mozilla/plugins/nposmozilla.so
 %{_libdir}/mozilla/components/nposmozilla.xpt
-%endif
+}
 
 %files devel
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
@@ -366,6 +331,19 @@
 %endif
 
 %changelog
+* Sun Dec 28 2008 kwizart < kwizart at gmail.com > - 0.4.5-3
+- Fix -devel doc timestamp which leads to multilib conflict 
+  ( RPM Fusion #270 )
+
+* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.4.5-2
+- Fix for ppc64
+
+* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-1
+- Update to 0.4.5 (final)
+- Drop upstreamed patches - Rewrite some
+- Add More BR.
+- Conditionalize --with mozilla amr
+
 * Mon Sep  8 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.5.20080217cvs
 - Fix for Large File Support (was livna #2075 )
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 14:29:51 -0000	1.2
+++ sources	23 Feb 2009 13:54:36 -0000	1.3
@@ -1 +1 @@
-dd56cf8f1ffe3431813ec3954b93b31d  gpac-20080217.tar.bz2
+adf9be7956cf35b01dd14bd622e16e86  gpac-0.4.5-repack.tar.bz2


--- gpac-0.4.4-soname.patch DELETED ---


--- gpac-0.4.5-shared_amr.patch DELETED ---


--- gpac-0.4.5-system_libdir.patch DELETED ---


--- gpac-0.4.5-timestramps.patch DELETED ---


--- gpac-20080211cvs-gcc43-gnusource.patch DELETED ---


--- gpac-20080211cvs-no-osmozilla.patch DELETED ---

