packages: SDL/SDL.spec, SDL/SDL-caca.patch (REMOVED) - dropped caca patch (...

[qboosh]

Author: qboosh                       Date: Mon Sep  6 07:10:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped caca patch (already upstream)
- no arts/esd support by default

---- Files affected:
packages/SDL:
   SDL.spec (1.176 -> 1.177) , SDL-caca.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/SDL/SDL.spec
diff -u packages/SDL/SDL.spec:1.176 packages/SDL/SDL.spec:1.177
--- packages/SDL/SDL.spec:1.176	Sat Feb  6 12:24:20 2010
+++ packages/SDL/SDL.spec	Mon Sep  6 09:10:48 2010
@@ -1,20 +1,22 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	aalib		# with aalib graphics support
-%bcond_with	caca		# with caca graphics support
-%bcond_with	directfb	# with DirectFB graphics support
-%bcond_with	ggi		# with GGI graphics support
-%bcond_with	nas		# with NAS audio support
-%bcond_with	svga		# with svgalib graphics support
-%bcond_without	alsa		# without ALSA audio support
-%bcond_without	arts		# without aRts audio support
-%bcond_without	esd		# without EsounD audio support
+%bcond_with	aalib		# aalib graphics support
+%bcond_with	caca		# caca graphics support
+%bcond_with	directfb	# DirectFB graphics support
+%bcond_with	ggi		# GGI graphics support
+%bcond_with	nas		# NAS audio support
+%bcond_with	svga		# svgalib graphics support
+%bcond_without	alsa		# ALSA audio support
+%bcond_with	arts		# aRts audio support
+%bcond_with	esd		# EsounD audio support
 %bcond_without	static_libs	# don't build static libraries
 #
 # NOTE: the following libraries are dlopened by soname detected at build time:
-# libasound.so.2
-# libesd.so.0
+# libartsc.so.?		[if with arts]
+# libasound.so.2	[if with alsa]
+# libaudio.so.2		[if with nas]
+# libesd.so.0		[if with esd]
 # libpulse-simple.so.0
 # libX11.so.6
 # libXext.so.6
@@ -32,7 +34,6 @@
 # Source0-md5:	e52086d1b508fa0b76c52ee30b55bec4
 Patch0:		%{name}-mmx-constraints.patch
 Patch1:		%{name}-acfix.patch
-Patch2:		%{name}-caca.patch
 URL:		http://www.libsdl.org/
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.15}
 BuildRequires:	OpenGL-GLU-devel
@@ -45,7 +46,7 @@
 BuildRequires:	gcc >= 5:4.0
 %{?with_caca:BuildRequires:	libcaca-devel}
 %{?with_ggi:BuildRequires:	libggi-devel}
-BuildRequires:	libtool >= 2:1.4d
+BuildRequires:	libtool >= 2:2.0
 %{?with_nas:BuildRequires:	nas-devel}
 %ifarch %{ix86}
 BuildRequires:	nasm
@@ -102,7 +103,6 @@
 %{?with_aa:Requires:	aalib-devel}
 %{?with_caca:Requires:	libcaca-devel}
 %{?with_ggi:Requires:	libggi-devel}
-%{?with_nas:Requires:	nas-devel}
 %{?with_svga:Requires:	svgalib-devel >= 1.4.0}
 Requires:	tslib-devel
 Requires:	xorg-lib-libX11-devel
@@ -169,7 +169,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1	# needs rewrite
 
 : > acinclude.m4
 %{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}
@@ -265,6 +264,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2010/09/06 07:10:48  qboosh
+- dropped caca patch (already upstream)
+- no arts/esd support by default
+
 Revision 1.176  2010/02/06 11:24:20  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SDL/SDL.spec?r1=1.176&r2=1.177&f=u