X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=SDL.spec;h=8500537387038c8033875539fe1dac33243a6cd5;hb=44f396f8b3109e2949dbd6c86f076b5f9ebee16a;hp=58a9c9c3a3622b3996ce6a84079d9340f459af4d;hpb=a8a3d665b46e0a851aecf5fa34b77adf8da4986f;p=packages%2FSDL.git

diff --git a/SDL.spec b/SDL.spec
index 58a9c9c..8500537 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -9,35 +9,39 @@
 %bcond_without	alsa		# without ALSA audio support
 %bcond_without	arts		# without aRts audio support
 %bcond_without	esd		# without EsounD audio support
+%bcond_without	static_libs	# don't build static libraries
 #
-%define		_snap	051030
+# NOTE: the following libraries are dlopened by soname detected at build time:
+# libasound.so.2
+# libesd.so.0
+# libpulse-simple.so.0
+# libX11.so.6
+# libXext.so.6
+# libXrender.so.1
+# libXrandr.so.2
 Summary:	SDL (Simple DirectMedia Layer) - Game/Multimedia Library
-Summary(pl):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
-Summary(zh_CN):	SDL (Simple DirectMedia Layer) Generic APIs - ÓÎÏ·/¶àýÌå¿â
+Summary(pl.UTF-8):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
+Summary(zh_CN.UTF-8):	SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库
 Name:		SDL
-Version:	1.2.10
-Release:	0.%{_snap}.3
-License:	LGPL
-Group:		X11/Libraries
-#Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{_snap}.tar.bz2
-# Source0-md5:	e0ab8e77644db78b30e3b68965bdfd6c
-Patch0:		%{name}-byteorder.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
-Patch6:		%{name}-gcc4.patch
+Version:	1.2.12
+Release:	1
+License:	LGPL v2.1+
+Group:		Libraries
+Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
+# Source0-md5:	544b4554986e51eed6d34435cf9c5f3f
+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-devel
+BuildRequires:	OpenGL-GLU-devel
 %{?with_aalib:BuildRequires:	aalib-devel}
 %{?with_alsa:BuildRequires:	alsa-lib-devel >= 0.9.0}
 %{?with_arts:BuildRequires:	artsc-devel >= 1.1}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 %{?with_esd:BuildRequires:	esound-devel >= 0.2.8}
+BuildRequires:	gcc >= 5:4.0
 %{?with_caca:BuildRequires:	libcaca-devel}
 %{?with_ggi:BuildRequires:	libggi-devel}
 BuildRequires:	libtool >= 2:1.4d
@@ -47,8 +51,13 @@ BuildRequires:	nasm
 %endif
 BuildRequires:	perl-modules
 %{?with_directfb:BuildRequires:	pkgconfig >= 1:0.7}
+BuildRequires:	pulseaudio-devel >= 0.9
 %{?with_svga:BuildRequires:	svgalib-devel >= 1.4.0}
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-proto-xextproto-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,148 +67,142 @@ keyboard. It can support both windowed and DGA modes of XFree86, and
 it is designed to be portable - applications linked with SDL can also
 be built on Win32 and BeOS.
 
-%description -l pl
-SDL (Simple DirectMedia Layer) jest bibliotek± udostêpniaj±c±
-przeno¶ny, niskopoziomowy dostêp do bufora ramki video, wyj¶cia audio,
-myszy oraz klawiatury. Mo¿e obs³ugiwaæ zarówno okienkowy tryb XFree86
-jak i DGA. Konstruuj±c j± miano na uwadze przeno¶no¶æ: aplikacje
-konsolidowane z SDL mo¿na równie¿ budowaæ w systemach Win32 i BeOS.
+%description -l pl.UTF-8
+SDL (Simple DirectMedia Layer) jest biblioteką udostępniającą
+przenośny, niskopoziomowy dostęp do bufora ramki video, wyjścia audio,
+myszy oraz klawiatury. Może obsługiwać zarówno okienkowy tryb XFree86
+jak i DGA. Konstruując ją miano na uwadze przenośność: aplikacje
+konsolidowane z SDL można również budować w systemach Win32 i BeOS.
 
-%description -l pt_BR
-Esse é o Simple DirectMedia Layer, uma API genérica que dá acesso de
-baixo nível a áudio, teclado, mouse e vídeo em várias plataformas.
+%description -l pt_BR.UTF-8
+Esse é o Simple DirectMedia Layer, uma API genérica que dá acesso de
+baixo nível a áudio, teclado, mouse e vídeo em várias plataformas.
 
-Essa biblioteca é usada por alguns jogos.
+Essa biblioteca é usada por alguns jogos.
 
-%description -l ru
-SDL (Simple DirectMedia Layer) ÜÔÏ ÎÁÂÏÒ ÆÕÎËÃÉÊ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÊ
-ÎÉÚËÏÕÒÏ×ÎÅ×ÙÊ ÄÏÓÔÕÐ Ë Ú×ÕËÕ, ËÌÁ×ÉÁÔÕÒÅ, ÍÁÎÉÐÕÌÑÔÏÒÕ ÍÙÛØ É Ë
-ÂÕÆÅÒÕ ÜËÒÁÎÁ ÎÁ ÍÎÏÖÅÓÔ×Å ÒÁÚÌÉÞÎÙÈ ÐÌÁÔÆÏÒÍ.
+%description -l ru.UTF-8
+SDL (Simple DirectMedia Layer) это набор функций, предоставляющий
+низкоуровневый доступ к звуку, клавиатуре, манипулятору мышь и к
+буферу экрана на множестве различных платформ.
 
 %package devel
 Summary:	SDL - Header files
-Summary(pl):	SDL - Pliki nag³ówkowe
-Summary(pt_BR):	Bibliotecas e arquivos de cabeçalho para aplicações SDL
-Summary(ru):	æÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ SDL
-Summary(uk):	æÁÊÌÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ SDL
-Summary(zh_CN):	SDL (Simple DirectMedia Layer) ¿ª·¢¿â
-Group:		X11/Development/Libraries
+Summary(pl.UTF-8):	SDL - Pliki nagłówkowe
+Summary(pt_BR.UTF-8):	Bibliotecas e arquivos de cabeçalho para aplicações SDL
+Summary(ru.UTF-8):	Файлы, необходимые для разработки программ, использующих SDL
+Summary(uk.UTF-8):	Файли, необхідні для розробки програм, що використовують SDL
+Summary(zh_CN.UTF-8):	SDL (Simple DirectMedia Layer) 开发库
+Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_alsa:Requires:	alsa-lib-devel}
+%{?with_directfb:Requires:	DirectFB-devel >= 0.9.15}
+%{?with_aa:Requires:	aalib-devel}
 %{?with_caca:Requires:	libcaca-devel}
+%{?with_ggi:Requires:	libggi-devel}
 %{?with_nas:Requires:	nas-devel}
-Requires:	xorg-lib-libXext-devel
+%{?with_svga:Requires:	svgalib-devel >= 1.4.0}
 
 %description devel
 SDL - Header files.
 
-%description devel -l pl
-SDL - Pliki nag³ówkowe.
+%description devel -l pl.UTF-8
+SDL - Pliki nagłówkowe.
 
-%description devel -l pt_BR
-Esse pacote contém bibliotecas, arquivos de cabeçalho e outros
+%description devel -l pt_BR.UTF-8
+Esse pacote contém bibliotecas, arquivos de cabeçalho e outros
 recursos para o desenvolvimento de aplicativos com SDL.
 
-%description devel -l ru
-üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ,
-ÉÓÐÏÌØÚÕÀÝÉÈ SDL.
+%description devel -l ru.UTF-8
+Этот пакет содержит файлы, необходимые для разработки программ,
+использующих SDL.
 
-%description devel -l uk
-ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÆÁÊÌÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ
-×ÉËÏÒÉÓÔÏ×ÕÀÔØ SDL.
+%description devel -l uk.UTF-8
+Цей пакет містить файли, необхідні для розробки програм, що
+використовують SDL.
 
 %package static
 Summary:	SDL - static libraries
-Summary(pl):	SDL - biblioteki statyczne
-Summary(pt_BR):	Biblioteca estática para desenvolvimento de aplicações com a SDL
-Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ SDL
-Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ SDL
-Group:		X11/Development/Libraries
+Summary(pl.UTF-8):	SDL - biblioteki statyczne
+Summary(pt_BR.UTF-8):	Biblioteca estática para desenvolvimento de aplicações com a SDL
+Summary(ru.UTF-8):	Статические библиотеки для разработки с использованием SDL
+Summary(uk.UTF-8):	Статичні бібліотеки для розробки з використанням SDL
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 SDL - static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 SDL - biblioteki statyczne.
 
-%description static -l pt_BR
-Biblioteca estática para desenvolvimento de aplicações com a SDL.
+%description static -l pt_BR.UTF-8
+Biblioteca estática para desenvolvimento de aplicações com a SDL.
 
-%description static -l ru
-üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ,
-ÉÓÐÏÌØÚÕÀÝÉÈ SDL.
+%description static -l ru.UTF-8
+Этот пакет содержит статические библиотеки для разработки программ,
+использующих SDL.
 
-%description static -l uk
-ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ
-×ÉËÏÒÉÓÔÏ×ÕÀÔØ SDL.
+%description static -l uk.UTF-8
+Цей пакет містить статичні бібліотеки для розробки програм, що
+використовують SDL.
 
 %package examples
 Summary:	SDL - example programs
-Summary(pl):	SDL - programy przyk³adowe
-Group:		X11/Development/Libraries
+Summary(pl.UTF-8):	SDL - programy przykładowe
+License:	Public Domain
+Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description examples
 SDL - example programs.
 
-%description examples -l pl
-SDL - przyk³adowe programy.
+%description examples -l pl.UTF-8
+SDL - przykładowe programy.
 
 %prep
-%setup -q -n %{name}-%{_snap}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-# get COPY_ARCH_SRC, remove the rest
-head -n 20 acinclude.m4 > acinclude.tmp
-mv -f acinclude.tmp acinclude.m4
+#%patch2 -p1	# needs rewrite
+
 %{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}
 %{!?with_esd:echo 'AC_DEFUN([AM_PATH_ESD],[$3])' >> acinclude.m4}
 
-find . -type d -name CVS -print | xargs rm -rf {} \;
-
 %build
 %{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
-CPPFLAGS="-DALSA_PCM_OLD_HW_PARAMS_API"
 %configure \
 %ifarch %{ix86}
 	--enable-nasm \
 %else
 	--disable-nasm \
 %endif
+	--disable-rpath \
+	%{!?with_alsa:--disable-alsa} \
+	%{!?with_arts:--disable-arts} \
+	--enable-dga \
+	%{!?with_esd:--disable-esd} \
+	%{!?with_nas:--disable-nas} \
 	--enable-pthreads \
 	--enable-pthread-sem \
-	--with-x \
-	--enable-dga \
 	%{?with_aalib:--enable-video-aalib} \
 	%{?with_caca:--enable-video-caca} \
+	%{!?with_directfb:--disable-video-directfb} \
 	--enable-video-dga \
-	%{?with_directfb:--enable-video-directfb} \
 	--enable-video-fbcon \
 	%{?with_ggi:--enable-video-ggi} \
 	--enable-video-opengl \
-	%{?with_svga:--enable-video-svga} \
+	%{!?with_svga:--disable-video-svga} \
 	--enable-video-x11-dgamouse \
 	--enable-video-x11-vm \
+	--enable-video-x11-xinerama \
+	--enable-video-x11-xme \
+	--enable-video-x11-xrandr \
 	--enable-video-x11-xv \
-	%{!?with_alsa:--disable-alsa} \
-	%{!?with_arts:--disable-arts} \
-	%{!?with_esd:--disable-esd} \
-	%{!?with_nas:--disable-nas}
+	--with-x \
+	%{!?with_static_libs:--disable-static}
 
-# automake chooses to use CXXLINK because of seen unused C++ sources
-# (which are for BeOS and MacOS+QTopia, not Linux)
-%{__make} \
-	CXXLINK="\$(LINK)"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -209,9 +212,10 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 	DESTDIR=$RPM_BUILD_ROOT \
 	m4datadir=%{_aclocaldir}
 
+rm -rf test/autom4te.cache
 install test/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-rm -rf docs/man3 docs/{Makefile*,.cvsignore} docs/html/{Makefile*,.cvsignore}
+rm -rf docs/man3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -221,24 +225,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS CREDITS README TODO WhatsNew
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc BUGS CREDITS README README-SDL.txt TODO WhatsNew
+%attr(755,root,root) %{_libdir}/libSDL-*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs.html docs
 %attr(755,root,root) %{_bindir}/sdl-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libSDL.so
+%{_libdir}/libSDL.la
 %{_libdir}/libSDLmain.a
 %{_includedir}/SDL
-%{_aclocaldir}/*
+%{_aclocaldir}/sdl.m4
+%{_pkgconfigdir}/sdl.pc
 %{_mandir}/man3/*
 
-%files examples
-%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
-
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libSDL.a
+%endif
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}