Author: glen Date: Mon Dec 4 21:19:43 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- polypaudio->pulseaudio
- invert x264 bcond as it was mistakenly marked "without"
---- Files affected:
SPECS:
mplayer.spec (1.316.2.15 -> 1.316.2.16)
---- Diffs:
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.316.2.15 SPECS/mplayer.spec:1.316.2.16
--- SPECS/mplayer.spec:1.316.2.15 Thu Oct 26 01:23:38 2006
+++ SPECS/mplayer.spec Mon Dec 4 22:19:38 2006
@@ -13,7 +13,7 @@
%bcond_with svga # with svgalib video output
%bcond_with osd # with osd menu support
%bcond_without altivec # without altivec support
-%bcond_without x264 # without x264 support (needs newer libx264
snap)
+%bcond_with x264 # without x264 support (needs newer libx264
snap)
%bcond_with xmms # with XMMS inputplugin support
%bcond_without aalib # without aalib video output
%bcond_without jack # without JACKD support
@@ -27,7 +27,7 @@
%bcond_without lirc # without lirc support
%bcond_without live # without live.com libraries
%bcond_without mad # without mad (audio MPEG) support
-%bcond_without polyp # without polyp audio output
+%bcond_without pulseaudio # without pulseaudio output
%bcond_without quicktime # without binary quicktime dll support
%bcond_without real # without Real* 8/9 codecs support
%bcond_without runtime # disable runtime cpu detection, just detect CPU
@@ -76,7 +76,7 @@
Summary(pt_BR): Reprodutor de filmes
Name: mplayer
Version: 1.0
-%define _rel 0.1
+%define _rel 0.2
Release: 2.%{pre}.%{_rel}
# DO NOT increase epoch unless it's really neccessary!
# especially such changes like pre7->pre7try2, increase Release instead!
@@ -118,6 +118,7 @@
Patch9: %{name}-xvmc.patch
Patch10: %{name}-kill-mabi_altivec.patch
Patch11: %{name}-auto-expand.patch
+Patch12: %{name}-pulse.patch
#http://www.openchrome.org/snapshots/mplayer/
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
@@ -168,7 +169,7 @@
%{?with_nas:BuildRequires: nas-devel}
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
-%{?with_polyp:BuildRequires: polypaudio-devel}
+%{?with_pulseaudio:BuildRequires: pulseaudio-devel >= 0.9}
BuildRequires: speex-devel >= 1.1
%{?with_svga:BuildRequires: svgalib-devel}
%{?with_xmms:BuildRequires: xmms-libs}
@@ -313,6 +314,7 @@
%endif
cp -f etc/codecs.conf etc/codecs.win32.conf
+%patch12 -p0
%patch0 -p0
##%patch1 -p1 -- old home_etc behavior
%patch2 -p1
@@ -384,7 +386,7 @@
%{!?with_libdts:--disable-libdts} \
--%{?with_lirc:en}%{!?with_lirc:dis}able-lirc \
%{!?with_mad:--disable-mad} \
-%{!?with_polyp:--disable-polyp} \
+%{!?with_pulseaudio:--disable-pulseaudio} \
%{!?with_quicktime:--disable-qtx} \
%{!?with_real:--disable-real} \
--%{?with_runtime:en}%{!?with_runtime:dis}able-runtime-cpudetection \
@@ -572,6 +574,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.316.2.16 2006/12/04 21:19:38 glen
+- polypaudio->pulseaudio
+- invert x264 bcond as it was mistakenly marked "without"
+
Revision 1.316.2.15 2006/10/25 23:23:38 charles
- Source0-md5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.316.2.15&r2=1.316.2.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
