SPECS (AC-branch): mplayer.spec - HEAD merge: use system amr, bcon...

[glen]

Author: glen                         Date: Sat Dec  9 12:35:42 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge: use system amr, bcond disabled due licensing issues

---- Files affected:
SPECS:
   mplayer.spec (1.316.2.17 -> 1.316.2.18) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.316.2.17 SPECS/mplayer.spec:1.316.2.18
--- SPECS/mplayer.spec:1.316.2.17	Tue Dec  5 00:06:33 2006
+++ SPECS/mplayer.spec	Sat Dec  9 13:35:37 2006
@@ -43,7 +43,7 @@
 %bcond_without	sdl		# disable SDL
 %bcond_without	doc		# don't build docs (slow)
 %bcond_with	shared		# experimental libmplayer.so support
-%bcond_without	amr             # don't build 3GPP Adaptive Multi Rate (AMR) speech codec
+%bcond_with	amr		# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
 
 %ifnarch %{ix86}
 %undefine	with_win32
@@ -100,12 +100,6 @@
 # Source6-md5:	1ecd31d17b51f16332b1fcc7da36b312
 Source7:	%{name}.png
 Source8:	%{name}.desktop
-# AMR WB FLOAT 
-Source10:        http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-530.zip
-# Source10-md5:  988060bdb18b5d64b8bd82c3507d2420
-# AMR NB FLOAT 
-Source11:        http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip
-# Source11-md5:  4dcbeb2bc28bf86e7131fe4cae3e0dec
 Patch0:		%{name}-cp1250-fontdesc.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-350.patch
@@ -120,6 +114,7 @@
 Patch11:	%{name}-auto-expand.patch
 Patch12:	%{name}-pulse.patch
 Patch13:	ffmpeg-x264-symbol.patch
+Patch14:		%{name}-system-amr.patch
 #http://www.openchrome.org/snapshots/mplayer/
 URL:		http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
@@ -298,25 +293,10 @@
 %setup -q -n %{sname}-%{version}%{pre} -a 3 -a 6
 %endif
 
-%if %{with amr}
-cd libavcodec
-mkdir amrwb_float
-mkdir amr
-mkdir amr_float
-# put 26204-xxx.zip into libavcodec/amrwb_float
-cd amrwb_float
-unzip -j %{SOURCE10}
-unzip -j 26204-530_ANSI-C_source_code.zip
-# put 26104-xxx.zip into libavcodec/amr_float
-cd ../amr_float
-unzip -j %{SOURCE11}
-unzip -j 26104-540_ANSI_C_source_code.zip
-cd ../..
-%endif
-
 cp -f etc/codecs.conf etc/codecs.win32.conf
 %patch12 -p0
 %patch13 -p1
+%patch14 -p1
 %patch0 -p0
 ##%patch1 -p1	-- old home_etc behavior
 %patch2 -p1
@@ -576,6 +556,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.316.2.18  2006/12/09 12:35:37  glen
+- HEAD merge: use system amr, bcond disabled due licensing issues
+
 Revision 1.316.2.17  2006/12/04 23:06:33  glen
 - x264 enabled (fixed symbols in libavcodec)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.316.2.17&r2=1.316.2.18&f=u