Thorsten Leemhuis
17 years ago
parent
ee2a5adbbd
commit
22e0f701d3
@ -0,0 +1 @@
|
|||||||
|
gpac-20080217.tar.bz2
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
diff -up gpac/src/Makefile.soname gpac/src/Makefile
|
||||||
|
--- gpac/src/Makefile.soname 2008-02-17 13:56:20.000000000 +0100
|
||||||
|
+++ gpac/src/Makefile 2008-02-17 13:56:20.000000000 +0100
|
||||||
|
@@ -159,6 +159,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)
|
||||||
@ -0,0 +1,51 @@
|
|||||||
|
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
|
||||||
|
@@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
|
||||||
|
all: $(PROG)
|
||||||
|
|
||||||
|
SVGGen$(EXE): $(OBJS)
|
||||||
|
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS)
|
||||||
|
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LIBS) $(EXTRALIBS)
|
||||||
|
|
||||||
|
|
||||||
|
%.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"
|
||||||
|
has_x11="no"
|
||||||
|
has_x11_shm="no"
|
||||||
|
+has_libxml2="no"
|
||||||
|
disable_svg="no"
|
||||||
|
no_gcc_opt="no"
|
||||||
|
use_fixed_point="no"
|
||||||
|
@@ -892,6 +893,15 @@ for opt do
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
+# If svg isn't disabled
|
||||||
|
+if test "$disable_svg" != "yes"; then
|
||||||
|
+# Then we check libxm2 presence via pkg-config
|
||||||
|
+ if pkg-config libxml-2.0 --exists > /dev/null 2>&1 ; then
|
||||||
|
+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
|
||||||
|
+ libxml2_lib_flags=`pkg-config libxml-2.0 --libs`
|
||||||
|
+ has_libxml2="yes"
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
#look for X11 shared memory support
|
||||||
|
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
|
||||||
|
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
|
||||||
@ -0,0 +1,141 @@
|
|||||||
|
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-02-17 23:43:55.000000000 +0100
|
||||||
|
+++ gpac/modules/amr_dec/amr_dec.c 2008-02-17 23:44:20.000000000 +0100
|
||||||
|
@@ -29,8 +29,8 @@
|
||||||
|
#include <gpac/modules/service.h>
|
||||||
|
#include <gpac/constants.h>
|
||||||
|
|
||||||
|
-#include "amr_nb/sp_dec.h"
|
||||||
|
-#include "amr_nb/d_homing.h"
|
||||||
|
+#include <amrnb/sp_dec.h>
|
||||||
|
+#include <amrnb/d_homing.h>
|
||||||
|
|
||||||
|
|
||||||
|
/*default size in CU of composition memory for audio*/
|
||||||
|
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
|
||||||
|
--- gpac/modules/amr_dec/Makefile.amr 2008-02-17 23:39:25.000000000 +0100
|
||||||
|
+++ gpac/modules/amr_dec/Makefile 2008-02-17 23:43:23.000000000 +0100
|
||||||
|
@@ -17,30 +17,30 @@ 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
|
||||||
|
+# ./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
|
||||||
|
|
||||||
|
|
||||||
|
SRCS := $(OBJS:.o=.c)
|
||||||
|
@@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic)
|
||||||
|
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/Makefile.amr gpac/modules/amr_float_dec/Makefile
|
||||||
|
--- gpac/modules/amr_float_dec/Makefile.amr 2008-02-17 23:26:57.000000000 +0100
|
||||||
|
+++ gpac/modules/amr_float_dec/Makefile 2008-02-17 23:35:00.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
|
||||||
|
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 2006-12-13 16:12:05.000000000 +0100
|
||||||
|
+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-02-17 23:38:03.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*/
|
||||||
@ -0,0 +1,96 @@
|
|||||||
|
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
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
diff -up gpac/Makefile.libdir gpac/Makefile
|
||||||
|
--- gpac/Makefile.libdir 2007-08-28 14:51:16.000000000 +0200
|
||||||
|
+++ gpac/Makefile 2008-02-17 14:47:22.000000000 +0100
|
||||||
|
@@ -63,11 +63,11 @@ ifeq ($(DEBUGBUILD),no)
|
||||||
|
$(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
endif
|
||||||
|
ifeq ($(CONFIG_DARWIN),yes)
|
||||||
|
- install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
|
||||||
|
- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
+ install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
|
||||||
|
+ ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
else
|
||||||
|
- install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
|
||||||
|
- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
+ install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
|
||||||
|
+ ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
ldconfig || true
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
@@ -98,7 +98,7 @@ install-lib:
|
||||||
|
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules"
|
||||||
|
install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
|
||||||
|
mkdir -p "$(DESTDIR)$(prefix)/lib"
|
||||||
|
- install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
|
||||||
|
+ install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)"
|
||||||
|
|
||||||
|
uninstall-lib:
|
||||||
|
rm -rf "$(prefix)/include/gpac/internal"
|
||||||
|
diff -up gpac/configure.libdir gpac/configure
|
||||||
|
--- gpac/configure.libdir 2007-10-25 11:39:51.000000000 +0200
|
||||||
|
+++ gpac/configure 2008-02-17 14:53:30.000000000 +0100
|
||||||
|
@@ -106,6 +106,7 @@ EOF
|
||||||
|
echo "GPAC configuration options:"
|
||||||
|
echo " --help print this message"
|
||||||
|
echo " --prefix=PREFIX install in PREFIX [$prefix]"
|
||||||
|
+echo " --libdir=LIBDIR system libs in DIR [$libdir]"
|
||||||
|
echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
|
||||||
|
echo ""
|
||||||
|
echo " --source-path=PATH path of source code [$source_path]"
|
||||||
|
@@ -167,6 +168,8 @@ for opt do
|
||||||
|
case "$opt" in
|
||||||
|
--prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
|
||||||
|
;;
|
||||||
|
+ --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
|
||||||
|
+ ;;
|
||||||
|
--mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
|
||||||
|
;;
|
||||||
|
--source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
|
||||||
|
@@ -479,7 +482,7 @@ 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/lib -L${libdir} 2> /dev/null ; then
|
||||||
|
has_opengl="yes"
|
||||||
|
fi
|
||||||
|
|
||||||
|
@@ -895,7 +898,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/lib -L${libdir} 2> /dev/null ; then
|
||||||
|
has_x11="yes"
|
||||||
|
|
||||||
|
#look for X11 shared memory support
|
||||||
|
@@ -1173,8 +1176,9 @@ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "prefix=$prefix" >> config.mak
|
||||||
|
+echo "libdir=$libdir" >> config.mak
|
||||||
|
echo "DESTDIR=$DESTDIR" >> config.mak
|
||||||
|
-echo "moddir=$prefix/lib/gpac" >> config.mak
|
||||||
|
+echo "moddir=$libdir/gpac" >> config.mak
|
||||||
|
echo "mandir=$mandir" >> config.mak
|
||||||
|
echo "MAKE=$make" >> config.mak
|
||||||
|
echo "CC=$cc" >> config.mak
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
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 <stdio.h>
|
||||||
|
-#include <openjpeg.h>
|
||||||
|
+#include <openjpeg/openjpeg.h>
|
||||||
|
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 <openjpeg.h>
|
||||||
|
+#include <openjpeg/openjpeg.h>
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
diff -up gpac/Makefile.timestramps gpac/Makefile
|
||||||
|
--- gpac/Makefile.timestramps 2008-02-17 15:34:31.000000000 +0100
|
||||||
|
+++ gpac/Makefile 2008-02-17 15:36:34.000000000 +0100
|
||||||
|
@@ -54,8 +54,8 @@ install:
|
||||||
|
$(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)
|
||||||
|
+ #rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
|
||||||
|
+ #rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
|
||||||
|
ifeq ($(CONFIG_WIN32),yes)
|
||||||
|
install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib
|
||||||
|
else
|
||||||
|
@@ -73,11 +73,11 @@ endif
|
||||||
|
endif
|
||||||
|
install -d "$(DESTDIR)$(mandir)"
|
||||||
|
install -d "$(DESTDIR)$(mandir)/man1"
|
||||||
|
- 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/
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
$(MAKE) -C applications uninstall
|
||||||
|
@@ -92,11 +92,11 @@ 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"
|
||||||
|
mkdir -p "$(DESTDIR)$(prefix)/lib"
|
||||||
|
install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)"
|
||||||
|
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- Makefile.old 2008-02-11 18:31:29.000000000 -0500
|
||||||
|
+++ Makefile 2008-02-11 18:15:30.000000000 -0500
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
vpath %.c $(SRC_PATH)/src
|
||||||
|
|
||||||
|
-CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include
|
||||||
|
+CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include -D_GNU_SOURCE=1
|
||||||
|
|
||||||
|
ifeq ($(DEBUGBUILD), yes)
|
||||||
|
CFLAGS+=-g
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
--- Makefile.old 2008-02-11 18:27:28.000000000 -0500
|
||||||
|
+++ Makefile 2008-02-11 18:28:13.000000000 -0500
|
||||||
|
@@ -11,13 +11,13 @@
|
||||||
|
|
||||||
|
V4STUDIODIR=
|
||||||
|
INSTDIRS=mp4client
|
||||||
|
-ifeq ($(TARGET_ARCH_ARMV4L),yes)
|
||||||
|
-else
|
||||||
|
-ifeq ($(CONFIG_LINUX),yes)
|
||||||
|
-INSTDIRS+=osmozilla
|
||||||
|
-APPDIRS+=osmozilla
|
||||||
|
-endif
|
||||||
|
-endif
|
||||||
|
+#ifeq ($(TARGET_ARCH_ARMV4L),yes)
|
||||||
|
+#else
|
||||||
|
+#ifeq ($(CONFIG_LINUX),yes)
|
||||||
|
+#INSTDIRS+=osmozilla
|
||||||
|
+#APPDIRS+=osmozilla
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
ifeq ($(USE_WXWIDGETS), yes)
|
||||||
|
APPDIRS+=osmo4_wx
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
tmp=$(mktemp -d)
|
||||||
|
|
||||||
|
trap cleanup EXIT
|
||||||
|
cleanup() {
|
||||||
|
set +e
|
||||||
|
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
unset CDPATH
|
||||||
|
pwd=$(pwd)
|
||||||
|
cvs=$(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
|
||||||
|
rm -rf gpac/extra_lib/
|
||||||
|
tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac
|
||||||
|
cd - >/dev/null
|
||||||
@ -0,0 +1,446 @@
|
|||||||
|
# Todo: - Patch-in xulrunner support within configure with pkg-config support.
|
||||||
|
# - Add pkg-config support for libs detection.
|
||||||
|
# - Add pkg-config support generated form configure for gpac (same as ffmpeg).
|
||||||
|
# - Make it support swscaler enabled ffmpeg (at least test it - upstream).
|
||||||
|
# - Debug Osmo4 (don't even work).
|
||||||
|
# - Submit and import patches upstream.
|
||||||
|
# - Fix unused-direct-shlib-dependency on libgpac
|
||||||
|
|
||||||
|
%define osmo Osmo4
|
||||||
|
%define cvs 20080217
|
||||||
|
%define with_amr 0
|
||||||
|
%define with_mozilla 0
|
||||||
|
%define with_static 1
|
||||||
|
%define with_osmo 0
|
||||||
|
# Mozilla stuff fails. It's completely disabled for now.
|
||||||
|
%define mozver 3.0
|
||||||
|
%define geckover 1.9
|
||||||
|
%define xuldir %{_datadir}/idl/xulrunner-sdk-1.9pre
|
||||||
|
%define xulbindir %{_libdir}/xulrunner-%{geckover}pre
|
||||||
|
|
||||||
|
Name: gpac
|
||||||
|
Summary: MPEG-4 multimedia framework
|
||||||
|
Version: 0.4.5
|
||||||
|
Release: 0.4.%{cvs}cvs%{?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
|
||||||
|
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
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
|
||||||
|
|
||||||
|
BuildRequires: ImageMagick
|
||||||
|
BuildRequires: SDL-devel
|
||||||
|
BuildRequires: librsvg2-devel >= 2.5.0
|
||||||
|
BuildRequires: libGLU-devel
|
||||||
|
BuildRequires: freeglut-devel
|
||||||
|
BuildRequires: freetype-devel >= 2.1.4
|
||||||
|
BuildRequires: faad2-devel
|
||||||
|
BuildRequires: libjpeg-devel
|
||||||
|
BuildRequires: libpng-devel >= 1.2.5
|
||||||
|
BuildRequires: libmad-devel
|
||||||
|
BuildRequires: xvidcore-devel >= 1.0.0
|
||||||
|
BuildRequires: ffmpeg-devel
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: openjpeg-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
|
||||||
|
BuildRequires: libXt-devel
|
||||||
|
BuildRequires: libXpm-devel
|
||||||
|
BuildRequires: wxGTK-devel
|
||||||
|
%if %{with_mozilla}
|
||||||
|
BuildRequires: gecko-devel >= %{geckoverver}
|
||||||
|
BuildRequires: js-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: doxygen
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
%if %{with_amr}
|
||||||
|
BuildRequires: amrnb-devel
|
||||||
|
BuildRequires: amrwb-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
|
||||||
|
from scratch in ANSI C. The original development goal is to provide a clean,
|
||||||
|
small and flexible alternative to the MPEG-4 Systems reference software.
|
||||||
|
|
||||||
|
GPAC features the integration of recent multimedia standards (SVG/SMIL, VRML,
|
||||||
|
X3D, SWF, 3GPP(2) tools and more) into a single framework. GPAC also features
|
||||||
|
MPEG-4 Systems encoders/multiplexers, publishing tools for content distribution
|
||||||
|
for MP4 and 3GPP(2) files and many tools for scene descriptions
|
||||||
|
(MPEG4 <-> VRML <-> X3D converters, SWF -> MPEG-4, etc).
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: Library for %{name}
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
|
||||||
|
%description libs
|
||||||
|
The %{name}-libs package contains library for %{name}.
|
||||||
|
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development libraries and files for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
%if %{with_static}
|
||||||
|
%else
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Development libraries and files for gpac.
|
||||||
|
|
||||||
|
%if %{with_static}
|
||||||
|
%package devel-static
|
||||||
|
Summary: Development libraries and files for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name}-devel = %{version}-%{release}
|
||||||
|
|
||||||
|
|
||||||
|
%description devel-static
|
||||||
|
Static library for gpac.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with_osmo}
|
||||||
|
%package -n %{osmo}
|
||||||
|
Summary: Media player based on gpac
|
||||||
|
Group: Applications/Multimedia
|
||||||
|
|
||||||
|
%description -n %{osmo}
|
||||||
|
Osmo4 is an MPEG-4 player with the following features:
|
||||||
|
* MPEG-4 Systems player
|
||||||
|
* Optimized 2D graphics renderer compliant with the Complete2D Scene Graph
|
||||||
|
and Graphics profiles
|
||||||
|
* Video and audio presentation achieved through plugins
|
||||||
|
* Multimedia player features:
|
||||||
|
* Timeline controls: play, pause, step.
|
||||||
|
* Graphics features: antialising, zoom and pan, scalable resizing of
|
||||||
|
rendering area, basic full screen support.
|
||||||
|
* Support for Advanced Text and Graphics extension of MPEG-4 Systems
|
||||||
|
under standardization.
|
||||||
|
* Frame export to JPG, PNG, BMP.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with_mozilla}
|
||||||
|
%package -n mozilla-%{osmo}
|
||||||
|
Summary: Osmo Media Player plugin for Mozilla compatible web browsers
|
||||||
|
Group: Applications/Multimedia
|
||||||
|
Requires: %{osmo} = %{version}-%{release}
|
||||||
|
#Requires: firefox >= %{mozver}
|
||||||
|
Requires: %{_libdir}/mozilla
|
||||||
|
|
||||||
|
|
||||||
|
%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
|
||||||
|
%patch4 -p1 -b .openjpeg
|
||||||
|
%patch5 -p1 -b .timestramps
|
||||||
|
%patch6 -p1 -b .shared
|
||||||
|
%patch7 -p1 -b .libxml2
|
||||||
|
%patch8 -p1 -b .amr
|
||||||
|
|
||||||
|
## 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
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Fix encoding warnings
|
||||||
|
cp -p Changelog Changelog.origine
|
||||||
|
iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
|
||||||
|
touch -r Changelog.origine Changelog
|
||||||
|
rm -rf Changelog.origine
|
||||||
|
|
||||||
|
cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
|
||||||
|
iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
|
||||||
|
touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
|
||||||
|
rm -rf doc/ipmpx_syntax.bt.origine
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure \
|
||||||
|
--enable-debug \
|
||||||
|
--extra-cflags="$RPM_OPT_FLAGS" \
|
||||||
|
--libdir=%{_libdir} \
|
||||||
|
--disable-oss-audio \
|
||||||
|
%if %with_mozilla
|
||||||
|
--mozdir=%{_libdir}/mozilla/plugins \
|
||||||
|
%endif
|
||||||
|
%if %{with_amr}
|
||||||
|
--enable-amr \
|
||||||
|
%endif
|
||||||
|
--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}
|
||||||
|
#
|
||||||
|
# Rebuild osmozilla.xpt
|
||||||
|
pushd applications/osmozilla
|
||||||
|
%{xulbindir}/xpidl -m header -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
|
||||||
|
%{xulbindir}/xpidl -m typelib -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
|
||||||
|
%{xulbindir}/xpt_link nposmozilla.xpt nsIOsmozilla.xpt
|
||||||
|
mv nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
|
||||||
|
popd
|
||||||
|
|
||||||
|
## kwizart - osmozilla parallel make fails
|
||||||
|
# %{?_smp_mflags}
|
||||||
|
#make -C applications/osmozilla \
|
||||||
|
# OPTFLAGS="%optflags -fPIC -I%{_includedir}/nspr4/" \
|
||||||
|
# INCLUDES="-I%{_datadir}/idl/firefox-%{mozver}/ \
|
||||||
|
# -I%{_includedir}/firefox-%{mozver}/ \
|
||||||
|
# -I%{_includedir}/firefox-%{mozver}/xpcom \
|
||||||
|
# -I%{_includedir}/nspr4/ $INCLUDES" \
|
||||||
|
# XPIDL_INCL="-I%{_datadir}/idl/firefox-%{mozver}/ \
|
||||||
|
# -I%{_includedir}/firefox-%{mozver}/ \
|
||||||
|
# -I%{_includedir}/firefox-%{mozver}/xpcom \
|
||||||
|
# -I%{_includedir}/nspr4/ $INCLUDES" \
|
||||||
|
# install
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Parallele build will fail
|
||||||
|
make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
|
||||||
|
#{?_smp_mflags}
|
||||||
|
make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
|
||||||
|
#{?_smp_mflags}
|
||||||
|
|
||||||
|
## kwizart - build doxygen doc for devel
|
||||||
|
pushd doc
|
||||||
|
doxygen
|
||||||
|
popd
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
make DESTDIR=$RPM_BUILD_ROOT install install-lib
|
||||||
|
|
||||||
|
%if %{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
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
||||||
|
cat > %{osmo}.desktop <<EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=Osmo4 Media Player
|
||||||
|
GenericName=Media Player
|
||||||
|
Comment=MPEG-4 Media Player
|
||||||
|
Exec=%{osmo}
|
||||||
|
Terminal=false
|
||||||
|
Icon=%{osmo}.xpm
|
||||||
|
Type=Application
|
||||||
|
Encoding=UTF-8
|
||||||
|
Categories=Application;AudioVideo;Player;
|
||||||
|
EOF
|
||||||
|
|
||||||
|
desktop-file-install --vendor livna \
|
||||||
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||||
|
--mode 644 \
|
||||||
|
%{osmo}.desktop
|
||||||
|
|
||||||
|
#icons
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||||
|
install -m 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
|
||||||
|
%else
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
|
||||||
|
%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}
|
||||||
|
install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
popd
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%post libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc AUTHORS BUGS Changelog COPYING README TODO
|
||||||
|
%{_bindir}/MP4*
|
||||||
|
%{_bindir}/*Gen
|
||||||
|
%{_datadir}/gpac/
|
||||||
|
%{_mandir}/man1/*.1.*
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/libgpac.so.*
|
||||||
|
%{_libdir}/gpac/
|
||||||
|
|
||||||
|
%if %{with_osmo}
|
||||||
|
%files -n %{osmo}
|
||||||
|
%doc AUTHORS BUGS COPYING README TODO
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_bindir}/Osmo4
|
||||||
|
%{_datadir}/applications/*.desktop
|
||||||
|
%{_datadir}/pixmaps/%{osmo}.xpm
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{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
|
||||||
|
%doc doc/html/*
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_includedir}/gpac/
|
||||||
|
%{_libdir}/libgpac.so
|
||||||
|
|
||||||
|
%if %{with_static}
|
||||||
|
%files devel-static
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/libgpac_static.a
|
||||||
|
%else
|
||||||
|
%exclude %{_libdir}/libgpac_static.a
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.5-0.4.20080217cvs
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Mon Feb 25 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.3.20080217cvs
|
||||||
|
- Enable devel-static
|
||||||
|
- Conditionalize Osmo4 (buggy).
|
||||||
|
- Clean the spec
|
||||||
|
|
||||||
|
* Sun Feb 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.2.20080217cvs
|
||||||
|
- Update to 20080217.
|
||||||
|
- Split libs.
|
||||||
|
- Use the new amr nosrc scheme (need an end-users rebuilt to add support to it).
|
||||||
|
- Add openjpeg-devel missing BR
|
||||||
|
- Static patching instead of dyn patch when possible.
|
||||||
|
- Disable %%{smp_mflags} (it tries to build the bin before the lib is ready)
|
||||||
|
- Define soname as libgpac.so.0 (instead of libgpac.so.%%version )
|
||||||
|
- Exclude static lib
|
||||||
|
|
||||||
|
* Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.5-0.1.20080211cvs
|
||||||
|
- Use %%{smp_mflags}
|
||||||
|
- Oops, we're actually 0.4.5
|
||||||
|
- Fix gpac so filenames
|
||||||
|
- Only install nposmozilla when %%{with_firefox} is set
|
||||||
|
|
||||||
|
* Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.4-3.20080211cvs
|
||||||
|
- Update to 20080211cvs
|
||||||
|
- Disable osmozilla, doesn't build with xulrunner
|
||||||
|
- Fix builds with gcc 4.3
|
||||||
|
|
||||||
|
* Sat Dec 15 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-2
|
||||||
|
- Rebuild for rawhide
|
||||||
|
|
||||||
|
* Tue Oct 16 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-1
|
||||||
|
- Update to v4.4
|
||||||
|
|
||||||
|
* Sat May 26 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070526
|
||||||
|
- Update to cvs 20070526
|
||||||
|
- Enable conditional build ( 3gpp firefox )
|
||||||
|
|
||||||
|
* Wed Apr 11 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070411
|
||||||
|
- Update to cvs 20070411
|
||||||
|
|
||||||
|
* Thu Dec 08 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061208.1.kwizart.fc6
|
||||||
|
- Update to 20061208
|
||||||
|
- Uses firefox-devel (since fc6!)
|
||||||
|
- Drop tutorial
|
||||||
|
- Use version-DEV-date with libgpac.so
|
||||||
|
- Disabled osmozilla
|
||||||
|
- Fix soname
|
||||||
|
- Enabled gprof
|
||||||
|
|
||||||
|
* Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061017.1_FC5
|
||||||
|
- gpac snapshot.sh
|
||||||
|
- Revert Patch osmozilla.cpp (v1.17 - build error from gpac/internal/terminal_dev.h)
|
||||||
|
- TODO: - no-soname make option for libgpac.so
|
||||||
|
- static lib in devel - needed ?
|
||||||
|
- osmozilla - xpt link problem.
|
||||||
|
- Osmo4: segmentation fault on exit.
|
||||||
|
- MP4Client: segmentation fault on launch.
|
||||||
|
- The program 'Osmo4' received an X Window System error:
|
||||||
|
"The error was 'BadMatch (invalid parameter attributes)'.
|
||||||
|
(Details: serial 37 error_code 8 request_code 42 minor_code 0)"
|
||||||
|
- MP4Box -version display: GPAC version 0.4.3-DEV (try to display cvs )
|
||||||
|
|
||||||
|
* Sat Oct 15 2006 kwizart < kwizart at gmail.com > - 0.4.2-rc2.1_FC5
|
||||||
|
- Update to 0.4.2cvs20061017
|
||||||
|
- Use DESTDIR=RPM_BUILD_ROOT in various Makefile.
|
||||||
|
- Enable mozilla plugin: osmozilla.
|
||||||
|
- Enable AMR_NB_FLOAT and AMR_WB_FLOAT / bundle AMR_NB_FIXED (but not used by default).
|
||||||
|
- Provide documentation html in doc .
|
||||||
|
- Provide tutorial from http://www.wildamerica.com/pages/Marty.html
|
||||||
|
- Various corrections.
|
||||||
|
|
||||||
|
* Fri Sep 01 2006 Anssi Hannula <anssi@zarb.org> 0.4.1-0.20060630.2plf2007.0
|
||||||
|
- lib64 fixes
|
||||||
|
|
||||||
|
* Fri Jan 30 2006 Austin Acton <austin@mandriva.org> 0.4.1-0.20060630.1plf2007.0
|
||||||
|
- initial package
|
||||||
Loading…
Reference in new issue