- massive attack: more BR epoch fixes

[packages/SDL.git] / SDL.spec

diff --git a/SDL.spec b/SDL.spec
index c194669856d5184dd46a16f44013861353b3a4c1..c3e5c358e998d9eeedc14ad1eea3af8b7103e3d5 100644 (file)
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,6 +1,7 @@
 #
 # 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
@@ -10,37 +11,33 @@
 %bcond_without esd             # without EsounD audio support
 #
 Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library
-Summary(es):   Simple DirectMedia Layer
 Summary(pl):   SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
-Summary(pt_BR):        Simple DirectMedia Layer
-Summary(ru):   Simple DirectMedia Layer
-Summary(uk):   Simple DirectMedia Layer
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) Generic APIs - ÓÎÏ·/¶àýÌå¿â
 Name:          SDL
-Version:       1.2.6
-Release:       3
+Version:       1.2.8
+%define                _snap   20040616
+Release:       0.%{_snap}.1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 9011f147f23ec535515291d0c9c6904c
+#Source0:      http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}-%{_snap}.tar.bz2
+# Source0-md5: 2f854840a028f3eca616f702139bc762
 Patch0:                %{name}-byteorder.patch
-Patch1:                %{name}-fixlibs.patch
-Patch2:                %{name}-amfix.patch
-Patch3:                %{name}-lpthread.patch
-Patch4:                %{name}-no_rpath_in_sdl-config.patch
-Patch5:                %{name}-lt15.patch
-Patch6:                %{name}-dlopen-acfix.patch
-Patch7:                %{name}-mmx-constraints.patch
+Patch1:                %{name}-amfix.patch
+Patch2:                %{name}-lpthread.patch
+Patch3:                %{name}-no_rpath_in_sdl-config.patch
+Patch4:                %{name}-mmx-constraints.patch
+Patch5:                %{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}
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:    artsc-devel >= 1.1}
 BuildRequires: autoconf
 BuildRequires: automake
 %{?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}
@@ -48,7 +45,7 @@ BuildRequires:        libtool >= 2:1.4d
 BuildRequires: nasm
 %endif
 BuildRequires: perl-modules
-%{?with_directfb:BuildRequires:        pkgconfig >= 0.7}
+%{?with_directfb:BuildRequires:        pkgconfig >= 1:0.7}
 %{?with_svgalib:BuildRequires: svgalib-devel >= 1.4.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -80,9 +77,15 @@ Summary(ru): 
 Summary(uk):   æÁÊÌÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ SDL
 Summary(zh_CN):        SDL (Simple DirectMedia Layer) ¿ª·¢¿â
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
+%if %{with xlibs}
+Requires:      libX11-devel
+Requires:      libXext-devel
+%else
 Requires:      XFree86-devel >= 4.0.2
+%endif
 %{?with_alsa:Requires: alsa-lib-devel}
+%{?with_caca:Requires: libcaca-devel}
 %{?with_nas:Requires:  nas-devel}
 
 %description devel
@@ -110,7 +113,7 @@ Summary(pt_BR):     Biblioteca est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ SDL
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ SDL
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 SDL - static libraries.
@@ -133,7 +136,7 @@ Biblioteca est
 Summary:       SDL - example programs
 Summary(pl):   SDL - programy przyk³adowe
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description examples
 SDL - example programs.
@@ -142,28 +145,26 @@ SDL - example programs.
 SDL - przyk³adowe programy.
 
 %prep
-%setup -q
+%setup -q -n %{name}12
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 # get COPY_ARCH_SRC, remove the rest
-head -n 16 acinclude.m4 > acinclude.tmp
+head -n 20 acinclude.m4 > acinclude.tmp
 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 \
@@ -175,6 +176,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 \
@@ -209,7 +211,7 @@ rm -rf docs/man3 docs/{Makefile*,.cvsignore} docs/html/{Makefile*,.cvsignore}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files