From 5a2f63709af6b2d572ffc6a689ad3ab8efe54d87 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 20 Aug 2013 14:12:49 +0000 Subject: [PATCH] Remove merged patches, unbelievable --- gpac-0.4.5-amr.patch | 87 ----------------------------------------- gpac-0.5.0-libdir.patch | 12 ------ gpac.spec | 11 +----- 3 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 gpac-0.4.5-amr.patch delete mode 100644 gpac-0.5.0-libdir.patch diff --git a/gpac-0.4.5-amr.patch b/gpac-0.4.5-amr.patch deleted file mode 100644 index edc56c9..0000000 --- a/gpac-0.4.5-amr.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile ---- 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 - - #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) - -@@ -50,11 +26,14 @@ ifeq ($(CONFIG_WIN32),yes) - #LDFLAGS+=-export-symbols amr_dec.def - endif - -+AMR_NB_LIBS=-lamrnb -+AMR_WB_LIBS=-lamrwb -+ - all: $(LIB) - - - $(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 -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile ---- 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 - 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 - - -@@ -45,7 +47,7 @@ all: $(LIB) - - - $(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.5.0-libdir.patch b/gpac-0.5.0-libdir.patch deleted file mode 100644 index c003c05..0000000 --- a/gpac-0.5.0-libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gpac/configure.libdir gpac/configure ---- gpac/configure.libdir 2012-06-23 17:35:19.000000000 +0200 -+++ gpac/configure 2012-06-23 19:12:16.815152617 +0200 -@@ -2932,7 +2932,7 @@ echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c - #pkg-config - echo "prefix=$prefix" > gpac.pc - echo "exec_prefix=\${prefix}" >> gpac.pc --echo "libdir=\${exec_prefix}/lib" >> gpac.pc -+echo "libdir=\${exec_prefix}/$libdir" >> gpac.pc - echo "includedir=\${exec_prefix}/include" >> gpac.pc - echo "" >> gpac.pc - echo "Name: gpac" >> gpac.pc diff --git a/gpac.spec b/gpac.spec index 0c21a21..5cf6d19 100644 --- a/gpac.spec +++ b/gpac.spec @@ -24,8 +24,6 @@ URL: http://gpac.sourceforge.net/ #Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz Source0: gpac-%{svn}.tar.xz Source9: gpac-snapshot.sh -Patch1: gpac-0.5.0-libdir.patch -Patch2: gpac-0.4.5-amr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: ImageMagick @@ -141,15 +139,8 @@ web browsers. %prep %setup -q -n gpac -%patch1 -p1 -b .libdir -%patch2 -p1 -b .amr - +exit 0 # 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