SOURCES: mplayer-system-amr.patch - updated for 1.0rc1
qboosh
qboosh at pld-linux.org
Fri Nov 17 19:08:37 CET 2006
Author: qboosh Date: Fri Nov 17 18:08:37 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0rc1
---- Files affected:
SOURCES:
mplayer-system-amr.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/mplayer-system-amr.patch
diff -u SOURCES/mplayer-system-amr.patch:1.1 SOURCES/mplayer-system-amr.patch:1.2
--- SOURCES/mplayer-system-amr.patch:1.1 Sun Jul 2 22:53:29 2006
+++ SOURCES/mplayer-system-amr.patch Fri Nov 17 19:08:32 2006
@@ -1,41 +1,50 @@
---- MPlayer-1.0pre8/libavcodec/Makefile.orig 2006-06-11 20:35:48.000000000 +0200
-+++ MPlayer-1.0pre8/libavcodec/Makefile 2006-07-02 20:59:46.476891500 +0200
-@@ -242,24 +242,6 @@
- OBJS+= amr.o
- endif
-
--ifeq ($(AMR_NB),yes)
--OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
--endif
+--- MPlayer-1.0rc1/libavcodec/Makefile.orig 2006-10-23 00:32:34.000000000 +0200
++++ MPlayer-1.0rc1/libavcodec/Makefile 2006-11-17 19:02:18.581014500 +0100
+@@ -265,33 +265,6 @@
+ OBJS-$(CONFIG_DTS) += dtsdec.o
+
+ OBJS-$(CONFIG_AMR) += amr.o
+-OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \
+- amr_float/sp_enc.o \
+- amr_float/interf_dec.o \
+- amr_float/interf_enc.o
-
--ifeq ($(AMR_NB_FIXED),yes)
+-ifeq ($(CONFIG_AMR_NB_FIXED),yes)
-EXTRAOBJS += amr/*.o
-EXTRADEPS=amrlibs
-endif
-
--ifeq ($(AMR_WB),yes)
--OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
-- amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
-- amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
-- amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
-- amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
-- amrwb_float/enc_util.o amrwb_float/if_rom.o
--endif
--
-
- ifeq ($(HAVE_PTHREADS),yes)
- OBJS+= pthread.o
-@@ -426,9 +408,6 @@
+-OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.o \
+- amrwb_float/dec_dtx.o \
+- amrwb_float/dec_gain.o \
+- amrwb_float/dec_if.o \
+- amrwb_float/dec_lpc.o \
+- amrwb_float/dec_main.o \
+- amrwb_float/dec_rom.o \
+- amrwb_float/dec_util.o \
+- amrwb_float/enc_acelp.o \
+- amrwb_float/enc_dtx.o \
+- amrwb_float/enc_gain.o \
+- amrwb_float/enc_if.o \
+- amrwb_float/enc_lpc.o \
+- amrwb_float/enc_main.o \
+- amrwb_float/enc_rom.o \
+- amrwb_float/enc_util.o \
+- amrwb_float/if_rom.o
+
+ OBJS-$(CONFIG_AAC_PARSER) += parser.o
+ OBJS-$(CONFIG_AC3_PARSER) += parser.o
+@@ -411,9 +384,6 @@
include $(SRC_PATH)/common.mak
-amrlibs:
- $(MAKE) -C amr spclib fipoplib
-
- tests: apiexample cpuid_test $(TESTS)
+ tests: apiexample $(TESTS)
- dsputil.o: dsputil.c dsputil.h
-@@ -444,10 +423,7 @@
+ clean::
+@@ -427,10 +397,7 @@
sh4/*.o sh4/*~ \
sparc/*.o sparc/*~ \
liba52/*.o liba52/*~ \
@@ -44,8 +53,8 @@
- -$(MAKE) -C amr clean
- -$(MAKE) -C amrwb_float -f makefile.gcc clean
- # api example program
- apiexample: apiexample.c $(LIB)
+ apiexample: apiexample.o $(LIB)
+
--- MPlayer-1.0pre8/libavcodec/amr.c.orig 2006-06-11 20:35:48.000000000 +0200
+++ MPlayer-1.0pre8/libavcodec/amr.c 2006-07-02 21:00:37.348070750 +0200
@@ -59,16 +59,16 @@
@@ -84,9 +93,9 @@
/* Common code for fixed and float version*/
typedef struct AMRWB_bitrates
---- MPlayer-1.0pre8/configure.orig 2006-07-02 16:13:04.393828000 +0200
-+++ MPlayer-1.0pre8/configure 2006-07-02 21:06:12.633024750 +0200
-@@ -6325,7 +6325,7 @@
+--- MPlayer-1.0rc1/configure.orig 2006-11-17 18:58:32.998916500 +0100
++++ MPlayer-1.0rc1/configure 2006-11-17 19:04:19.384564250 +0100
+@@ -6349,7 +6349,7 @@
echocheck "AMR narrowband"
if test "$_amr_nb" = auto ; then
_amr_nb=no
@@ -95,15 +104,15 @@
if test "$_libavcodec" = yes ; then
_amr_nb=yes
else
-@@ -6337,6 +6337,7 @@
+@@ -6361,6 +6361,7 @@
_amr=yes
- _def_amr='#define AMR 1'
- _def_amr_nb='#define AMR_NB 1'
-+ _ld_amr_nb='-lamrnb'
+ _def_amr='#define CONFIG_AMR 1'
+ _def_amr_nb='#define CONFIG_AMR_NB 1'
++ _ld_amd_nb='-lamrnb'
else
- _def_amr_nb='#undef AMR_NB'
+ _def_amr_nb='#undef CONFIG_AMR_NB'
fi
-@@ -6345,7 +6346,7 @@
+@@ -6369,7 +6370,7 @@
echocheck "AMR narrowband, fixed point"
if test "$_amr_nb_fixed" = auto ; then
_amr_nb_fixed=no
@@ -112,15 +121,15 @@
if test "$_libavcodec" = yes ; then
if test "$_amr_nb" = no ; then
_amr_nb_fixed=yes
-@@ -6361,6 +6362,7 @@
+@@ -6385,6 +6386,7 @@
_amr=yes
- _def_amr='#define AMR 1'
- _def_amr_nb_fixed='#define AMR_NB_FIXED 1'
+ _def_amr='#define CONFIG_AMR 1'
+ _def_amr_nb_fixed='#define CONFIG_AMR_NB_FIXED 1'
+ _ld_amr_nb='-lamrnbfixed'
else
- _def_amr_nb_fixed='#undef AMR_NB_FIXED'
+ _def_amr_nb_fixed='#undef CONFIG_AMR_NB_FIXED'
fi
-@@ -6375,7 +6377,7 @@
+@@ -6399,7 +6401,7 @@
echocheck "AMR wideband"
if test "$_amr_wb" = auto ; then
_amr_wb=no
@@ -129,32 +138,32 @@
if test "$_libavcodec" = yes ; then
_amr_wb=yes
else
-@@ -6387,6 +6389,7 @@
+@@ -6411,6 +6413,7 @@
_amr=yes
- _def_amr='#define AMR 1'
- _def_amr_wb='#define AMR_WB 1'
+ _def_amr='#define CONFIG_AMR 1'
+ _def_amr_wb='#define CONFIG_AMR_WB 1'
+ _ld_amr_wb='-lamrwb'
_codecmodules="amr_wb $_codecmodules"
else
- _def_amr_wb='#undef AMR_WB'
-@@ -7545,7 +7548,9 @@
- AMR=$_amr
- AMR_NB=$_amr_nb
- AMR_NB_FIXED=$_amr_nb_fixed
+ _def_amr_wb='#undef CONFIG_AMR_WB'
+@@ -7630,7 +7633,9 @@
+ CONFIG_AMR=$_amr
+ CONFIG_AMR_NB=$_amr_nb
+ CONFIG_AMR_NB_FIXED=$_amr_nb_fixed
+AMR_NB_LIB=$_ld_amr_nb
- AMR_WB=$_amr_wb
+ CONFIG_AMR_WB=$_amr_wb
+AMR_WB_LIB=$_ld_amr_wb
- `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
- CONFIG_FAAC=$_faac
- CONFIG_XVID=$_lavc_xvid
---- MPlayer-1.0pre8/Makefile.orig 2006-06-11 20:35:47.000000000 +0200
-+++ MPlayer-1.0pre8/Makefile 2006-07-02 21:06:17.685340500 +0200
-@@ -105,6 +105,8 @@
- $(X264_LIB) \
+ `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
+ `echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
+ `echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
+--- MPlayer-1.0rc1/Makefile.orig 2006-10-23 00:32:31.000000000 +0200
++++ MPlayer-1.0rc1/Makefile 2006-11-17 19:04:54.290745750 +0100
+@@ -110,6 +110,8 @@
$(MUSEPACK_LIB) \
$(SPEEX_LIB) \
-+ $(AMR_NB_LIB) \
-+ $(AMR_WB_LIB)
+ $(NUT_LIB) \
++ $(AMR_NB_LIB) \
++ $(AMR_WB_LIB)
- COMMON_LIBS = libmpcodecs/libmpcodecs.a \
- $(W32_LIB) \
+ ifeq ($(LAVC_MP3LAME),yes)
+ CODEC_LIBS += $(MP3LAME_LIB)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mplayer-system-amr.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list