packages: avidemux/avidemux.spec - amr switched to opencore-amr; enabled by...

[sparky]

Author: sparky                       Date: Thu Dec 17 19:04:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- amr switched to opencore-amr; enabled by default

---- Files affected:
packages/avidemux:
   avidemux.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.75 packages/avidemux/avidemux.spec:1.76
--- packages/avidemux/avidemux.spec:1.75	Thu Dec 17 19:35:25 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 20:04:48 2009
@@ -7,11 +7,12 @@
 # - Could not find Gettext -- libintl not required for gettext support
 # - don't force -O3 optimization
 # - look for lrelease from qt4-linguist, not qt-linguist
+# - fix libx264 detection: Could not find x264_encoder_open in /usr/lib64/libx264.so
 #
 # Conditional build:
 %bcond_without	esd	# disable EsounD sound support
 %bcond_without	arts	# without arts audio output
-%bcond_with	amr	# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
+%bcond_without	amr	# enable Adaptive Multi Rate (AMR) speech codec support
 %bcond_without	qt4	# build qt4 interface
 %bcond_without	gtk	# build gtk interface
 %bcond_with	ssse3	# use SSSE3 instructions
@@ -45,7 +46,6 @@
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel >= 1.0
-%{?with_amr:BuildRequires:	amrnb-devel}
 %{?with_arts:BuildRequires:	artsc-devel}
 BuildRequires:	cmake >= 2.6.2
 %{?with_esd:BuildRequires:	esound-devel}
@@ -71,6 +71,7 @@
 BuildRequires:	libxml2-devel
 %{?with_qt4:BuildRequires:	libxslt-progs}
 BuildRequires:	nasm >= 0.98.32
+%{?with_amr:BuildRequires:	opencore-amr-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 %{?with_qt4:BuildRequires:	qt-linguist}
@@ -207,6 +208,10 @@
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_Mad.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_a52.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_faad.so
+%if %{with amr}
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
+%endif
 
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_alsa.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so
@@ -359,6 +364,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2009/12/17 19:04:48  sparky
+- amr switched to opencore-amr; enabled by default
+
 Revision 1.75  2009/12/17 18:35:25  glen
 - gtk bcond (neither work)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.75&r2=1.76&f=u