X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-SDL.git;a=blobdiff_plain;f=crossmingw32-SDL.spec;h=0039eed97de4f5f332c5d53a22497e0951fb5ca2;hp=b46f125cd37d2f7168402099250028c8113adb6a;hb=HEAD;hpb=7677db74de8826883084a7bb150e8e2c4be902b3

diff --git a/crossmingw32-SDL.spec b/crossmingw32-SDL.spec
index b46f125..0039eed 100644
--- a/crossmingw32-SDL.spec
+++ b/crossmingw32-SDL.spec
@@ -1,48 +1,51 @@
 %define		realname	SDL
-Summary:	SDL (Simple DirectMedia Layer) - Game/Multimedia Library - Mingw32 cross version
-Summary(pl):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów - wersja skro¶na dla Mingw32
+Summary:	SDL (Simple DirectMedia Layer) - Game/Multimedia Library - MinGW32 cross version
+Summary(pl.UTF-8):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	1.2.7
-Release:	2
-License:	LGPL
-Group:		X11/Libraries
-Source0:	http://www.libsdl.org/cvs/SDL-1.2.tar.gz
-# Source0-md5:	a925e42b258eb25d0041bd88d5704e8f
-Patch0:		%{realname}-byteorder.patch
-Patch1:		%{realname}-fixlibs.patch
-Patch2:		%{realname}-amfix.patch
-Patch3:		%{realname}-lpthread.patch
-Patch4:		%{realname}-no_rpath_in_sdl-config.patch
+Version:	1.2.15
+Release:	3
+License:	LGPL v2.1+
+Group:		Libraries
+Source0:	http://www.libsdl.org/release/%{realname}-%{version}.tar.gz
+# Source0-md5:	9d96df8417572a2afb781a7c4c811a85
+Patch0:		%{realname}-acfix.patch
 URL:		http://www.libsdl.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
+BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-runtime
 BuildRequires:	crossmingw32-w32api
 BuildRequires:	crossmingw32-w32api-dx
-BuildRequires:	libtool >= 2:1.4d
-BuildConflicts:	crossmingw32-dx70
-%ifarch %{ix86}
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	nasm
-%endif
 BuildRequires:	perl-modules
+BuildConflicts:	crossmingw32-dx70
+Requires:	crossmingw32-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
-%define		target		i386-mingw32
-%define		target_platform	i386-pc-mingw32
-%define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		target			i386-mingw32
+%define		target_platform		i386-pc-mingw32
 
-%define		__cc		%{target}-gcc
-%define		__cxx		%{target}-g++
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_libdir			%{_prefix}/lib
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
 
-%ifarch alpha sparc sparc64 sparcv9
-# alpha's -mieee and sparc's -mtune=* are not valid for target's gcc
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define		optflags	-O2
 %endif
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define		filterout_ld	-Wl,-z,.*
+%define		filterout_c	-f[-a-z0-9=]*
+%define		filterout_cxx	-f[-a-z0-9=]*
 
 %description
 SDL (Simple DirectMedia Layer) is a library that allows you portable,
@@ -51,97 +54,101 @@ 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.
+This package contains the cross version for Win32.
+
+%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.
+
+Ten pakiet zawiera wersję skrośną dla Win32.
 
-%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.
+
+%package static
+Summary:	Static SDL library (cross MinGW32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka SDL (wersja skrośna MinGW32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static SDL library (cross MinGW32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka SDL (wersja skrośna MinGW32).
 
 %package dll
 Summary:	SDL - DLL library for Windows
-Summary(pl):	SDL - biblioteka DLL dla Windows
+Summary(pl.UTF-8):	SDL - biblioteka DLL dla Windows
 Group:		Applications/Emulators
 
 %description dll
 SDL - DLL library for Windows.
 
-%description dll -l pl
+%description dll -l pl.UTF-8
 SDL - biblioteka DLL dla Windows.
 
 %prep
-%setup -q -n %{realname}-1.2
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+: > acinclude.m4
+echo 'AC_DEFUN([AM_PATH_ESD],[$3])' >> acinclude.m4
 
 %build
-CC=%{target}-gcc ; export CC
-CXX=%{target}-g++ ; export CXX
-LD=%{target}-ld ; export LD
-AR=%{target}-ar ; export AR
-AS=%{target}-as ; export AS
-CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
-RANLIB=%{target}-ranlib ; export RANLIB
-LDSHARED="%{target}-gcc -shared" ; export LDSHARED
-TARGET="%{target}" ; export TARGET
-
-./autogen.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
 %configure \
 	--target=%{target} \
 	--host=%{target} \
-	--build=i386-linux \
-%ifarch %{ix86}
 	--enable-nasm \
-%else
-	--disable-nasm \
-%endif
-	--prefix=%{arch} \
 	--disable-stdio-redirect
 
 %{__make}
 
-cat sdl-config | sed -e 's@-I/usr/include/SDL@-I%{arch}/include/SDL@' \
-	-e 's@libdirs="-L/usr/lib"@libdirs="-L%{arch}/lib"@' > sdl.new
-mv -f sdl.new sdl-config
-
-%if 0%{!?debug:1}
-%{target}-strip src/.libs/SDL.dll
-%{target}-strip -g -R.comment -R.note src/.libs/*.a
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{bin,include/SDL,lib}
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
 
-install include/*.h $RPM_BUILD_ROOT%{arch}/include/SDL
-install sdl-config $RPM_BUILD_ROOT%{arch}/bin/sdl-config
-install src/.libs/libSDL{,.dll}.a src/main/libSDLmain.a $RPM_BUILD_ROOT%{arch}/lib
-install src/.libs/SDL.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system/
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-ln -s %{arch}/bin/sdl-config $RPM_BUILD_ROOT%{_bindir}/%{target}-sdl-config
+install -d $RPM_BUILD_ROOT{%{_dlldir},%{_sysprefix}/bin}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+ln -s %{_bindir}/sdl-config $RPM_BUILD_ROOT%{_sysprefix}/bin/%{target}-sdl-config
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{arch}/bin/*
-%{arch}/include/SDL
-%{arch}/lib/*
+%doc BUGS CREDITS README README-SDL.txt TODO WhatsNew
+%attr(755,root,root) %{_sysprefix}/bin/%{target}-sdl-config
+%attr(755,root,root) %{_bindir}/sdl-config
+%{_libdir}/libSDL.dll.a
+%{_libdir}/libSDL.la
+%{_libdir}/libSDLmain.a
+%{_libdir}/libSDLmain.la
+%{_includedir}/SDL
+%{_pkgconfigdir}/sdl.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libSDL.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/libSDL-1-2-0.dll