- dropped (breaks static linking)

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index 181a53227109cb2d4fe31670dcb704cd63de1bfb..20f8528ed6242eb0bc7331f08d80a64225f5900d 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,13 +1,14 @@
 #
 # 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 esound          # without EsounD audio support
+%bcond_without esd             # without EsounD audio support
 #
 Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library
 Summary(es):   Simple DirectMedia Layer
@@ -18,7 +19,7 @@ Summary(uk):  Simple DirectMedia Layer
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) Generic APIs - ÓÎÏ·/¶àýÌå¿â
 Name:          SDL
 Version:       1.2.6
-Release:       2
+Release:       4
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
@@ -30,21 +31,20 @@ Patch3:             %{name}-lpthread.patch
 Patch4:                %{name}-no_rpath_in_sdl-config.patch
 Patch5:                %{name}-lt15.patch
 Patch6:                %{name}-dlopen-acfix.patch
-#Patch4:               %{name}-ac25x.patch
-#Patch6:               %{name}-noobjc.patch
-#Patch7:               %{name}-am17.patch
+Patch7:                %{name}-mmx-constraints.patch
+Patch8:                %{name}-am18.patch
+Patch9:                %{name}-caca.patch
 URL:           http://www.libsdl.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.15}
 BuildRequires: OpenGL-devel
 BuildRequires: XFree86-devel >= 4.0.2
 %{?with_aalib:BuildRequires:   aalib-devel}
-%ifnarch sparc sparc64
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
-%endif
-%{?with_arts:BuildRequires:    arts-devel >= 1.1}
+%{?with_arts:BuildRequires:    artsc-devel >= 1.1}
 BuildRequires: autoconf
 BuildRequires: automake
-%{?with_esound:BuildRequires:  esound-devel >= 0.2.8}
+%{?with_esd:BuildRequires:     esound-devel >= 0.2.8}
+%{?with_caca:BuildRequires:    libcaca-devel}
 %{?with_ggi:BuildRequires:     libggi-devel}
 BuildRequires: libtool >= 2:1.4d
 %{?with_nas:BuildRequires:     nas-devel}
@@ -86,9 +86,8 @@ Summary(zh_CN):       SDL (Simple DirectMedia Layer) 
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      XFree86-devel >= 4.0.2
-%ifnarch sparc sparc64
 %{?with_alsa:Requires: alsa-lib-devel}
-%endif
+%{?with_caca:Requires: libcaca-devel}
 %{?with_nas:Requires:  nas-devel}
 
 %description devel
@@ -156,6 +155,9 @@ SDL - przyk
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 # get COPY_ARCH_SRC, remove the rest
 head -n 16 acinclude.m4 > acinclude.tmp
@@ -164,11 +166,11 @@ mv -f acinclude.tmp acinclude.m4
 find . -type d -name CVS -print | xargs rm -rf {} \;
 
 %build
-rm -f missing libtool
 %{__libtoolize}
 %{__aclocal}
 %{__automake}
 %{__autoconf}
+CPPFLAGS="-DALSA_PCM_OLD_HW_PARAMS_API"
 %configure \
 %ifarch %{ix86}
        --enable-nasm \
@@ -180,6 +182,7 @@ rm -f missing libtool
        --with-x \
        --enable-dga \
        %{?with_aalib:--enable-video-aalib} \
+       %{?with_caca:--enable-video-caca} \
        --enable-video-dga \
        %{?with_directfb:--enable-video-directfb} \
        --enable-video-fbcon \
@@ -191,10 +194,13 @@ rm -f missing libtool
        --enable-video-x11-xv \
        %{!?with_alsa:--disable-alsa} \
        %{!?with_arts:--disable-arts} \
-       %{!?with_esound:--disable-esd} \
+       %{!?with_esd:--disable-esd} \
        %{!?with_nas:--disable-nas}
 
-%{__make}
+# automake chooses to use CXXLINK because of seen unused C++ sources
+# (which are for BeOS and MacOS+QTopia, not Linux)
+%{__make} \
+       CXXLINK="\$(LINK)"
 
 %install
 rm -rf $RPM_BUILD_ROOT