packages: xmms/xmms.spec, xmms/xmms-no-esd.patch (NEW) - rel 6 - killed esd...

[baggins]

Author: baggins                      Date: Thu Jun  3 15:14:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6
- killed esd stuff from configure.in, ESD stanza made rebuilding of ac/am stuff impossible

---- Files affected:
packages/xmms:
   xmms.spec (1.159 -> 1.160) , xmms-no-esd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xmms/xmms.spec
diff -u packages/xmms/xmms.spec:1.159 packages/xmms/xmms.spec:1.160
--- packages/xmms/xmms.spec:1.159	Thu Jun  3 13:21:15 2010
+++ packages/xmms/xmms.spec	Thu Jun  3 17:14:02 2010
@@ -10,7 +10,7 @@
 Summary(zh_CN.UTF-8):	XMMS - X 端多媒体播放器
 Name:		xmms
 Version:	1.2.11
-Release:	5
+Release:	6
 Epoch:		2
 License:	GPL v2+
 Group:		X11/Applications/Sound
@@ -26,6 +26,7 @@
 Source6:	%{name}.png
 Patch0:		%{name}-warn_about_unplayables.patch
 Patch1:		%{name}-gcc4.patch
+Patch2:		%{name}-no-esd.patch
 #Patch1:		%{name}-gtk2.patch
 URL:		http://www.xmms.org/
 BuildRequires:	OpenGL-devel
@@ -380,6 +381,7 @@
 %setup -q -a1 -a2
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mv -f po/{no,nb}.po
 %{__perl} -pi -e 's/ no / nb /' po/LINGUAS
@@ -556,6 +558,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2010/06/03 15:14:02  baggins
+- rel 6
+- killed esd stuff from configure.in, ESD stanza made rebuilding of ac/am stuff impossible
+
 Revision 1.159  2010/06/03 11:21:15  baggins
 - rel 5
 - esound is dead

================================================================
Index: packages/xmms/xmms-no-esd.patch
diff -u /dev/null packages/xmms/xmms-no-esd.patch:1.1
--- /dev/null	Thu Jun  3 17:14:07 2010
+++ packages/xmms/xmms-no-esd.patch	Thu Jun  3 17:14:02 2010
@@ -0,0 +1,22 @@
+--- xmms-1.2.11/configure.in~	2007-11-16 22:52:30.000000000 +0100
++++ xmms-1.2.11/configure.in	2010-06-03 17:12:31.248078972 +0200
+@@ -201,17 +201,8 @@
+ [  --disable-esd           Disable esound output plugin [default=enabled]],,
+ 	[enable_esd="yes"])
+ 
+-if test "x$enable_esd" = "xyes"; then
+-	AM_PATH_ESD([0.2.8], 
+-	   [have_esd=yes 
+-	    AC_CHECK_LIB([esd], [esd_get_latency], 
+-	       AC_DEFINE([HAVE_ESD_GET_LATENCY],,
+-		  [Define if libesd has the esd_get_latency function]))], 
+-	   [have_esd=no])
+-else
+-	AC_MSG_RESULT([*** esound plugin disabled per user request ***])
+-	have_esd=no
+-fi
++AC_MSG_RESULT([*** esound plugin disabled per user request ***])
++have_esd=no
+ AM_CONDITIONAL([HAVE_ESD], [test "x$have_esd" = "xyes"])
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmms/xmms.spec?r1=1.159&r2=1.160&f=u