SPECS: crossmingw32-SDL_image.spec - updated to 1.2.6

qboosh qboosh at pld-linux.org
Mon Aug 13 19:27:44 CEST 2007


Author: qboosh                       Date: Mon Aug 13 17:27:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.2.6

---- Files affected:
SPECS:
   crossmingw32-SDL_image.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/crossmingw32-SDL_image.spec
diff -u SPECS/crossmingw32-SDL_image.spec:1.14 SPECS/crossmingw32-SDL_image.spec:1.15
--- SPECS/crossmingw32-SDL_image.spec:1.14	Mon Feb 12 22:23:51 2007
+++ SPECS/crossmingw32-SDL_image.spec	Mon Aug 13 19:27:39 2007
@@ -3,38 +3,39 @@
 Summary:	Simple DirectMedia Layer - Sample Image Loading Library - Mingw32 cross version
 Summary(pl.UTF-8):	Przykładowa biblioteka do ładowania obrazków - wersja skrośna dla Mingw32
 Name:		crossmingw32-%{realname}
-Version:	1.2.5
+Version:	1.2.6
 Release:	1
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.libsdl.org/projects/SDL_image/release/%{realname}-%{version}.tar.gz
 # Source0-md5:	cd006109a73bf7dcc93e1c3ed15ee782
 URL:		http://www.libsdl.org/projects/SDL_image/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	crossmingw32-SDL
+BuildRequires:	crossmingw32-SDL >= 1.2.10
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-libjpeg
-BuildRequires:	crossmingw32-libpng
+BuildRequires:	crossmingw32-libjpeg >= 6b
+BuildRequires:	crossmingw32-libpng >= 1.2.0
 BuildRequires:	crossmingw32-w32api
 BuildRequires:	crossmingw32-zlib
 BuildRequires:	libtool
-Requires:	crossmingw32-SDL
+Requires:	crossmingw32-SDL >= 1.2.10
 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		_dlldir			/usr/share/wine/windows/system
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
 
 %ifarch alpha sparc sparc64 sparcv9
+# alpha's -mieee and sparc's -mtune=* are not valid for target's gcc
 %define		optflags	-O2
 %endif
 
@@ -43,21 +44,39 @@
 surfaces. This library currently supports BMP, PPM, PCX, GIF, JPEG,
 and PNG formats.
 
+This package contains the cross version for Win32.
+
 %description -l pl.UTF-8
 Jest to prosta biblioteka służąca do ładowania różnego formatu
 obrazków jako powierzchni SDL. W chwili obecnej biblioteka obsługuje
 następujące formaty: BMP, PPM, PCX, GIF, JPEG oraz PNG.
 
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:	Static SDL_image library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka SDL_image (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static SDL_image library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka SDL_image (wersja skrośna mingw32).
+
 %package dll
-Summary:	%{realname} - DLL library for Windows
-Summary(pl.UTF-8):	%{realname} - biblioteka DLL dla Windows
+Summary:	SDL_image - DLL library for Windows
+Summary(pl.UTF-8):	SDL_image - biblioteka DLL dla Windows
 Group:		Applications/Emulators
+Requires:	crossmingw32-SDL-dll >= 1.2.10
+Requires:	wine
 
 %description dll
-%{realname} - DLL library for Windows.
+SDL_image - DLL library for Windows.
 
 %description dll -l pl.UTF-8
-%{realname} - biblioteka DLL dla Windows.
+SDL_image - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
@@ -65,67 +84,59 @@
 rm -f 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
-
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 # no sdl test, because it requires configured wine to work
 %configure \
-	png_lib=png.dll \
-	--host=%{_host} \
+	png_lib=libpng12-0.dll \
+	--host=%{target} \
 	--target=%{target} \
-	--with-sdl-prefix=%{arch} \
+	--with-sdl-prefix=%{_prefix} \
 	--disable-sdltest \
 	--enable-bmp \
 	--enable-gif \
 	--enable-jpg \
 	--enable-pcx \
 	--enable-png \
-	--enable-tga \
-	--disable-shared
+	--enable-tga
 
-%{__make} libSDL_image.la
+# LIBS hack for libtool not detecting libraries without .la files
+%{__make} \
+	LIBS="$(%{_bindir}/sdl-config --libs | sed -e 's/\(-lmingw32\|-lSDLmain\)/-Wl,\1/g')"
+
+%install
+rm -rf $RPM_BUILD_ROOT
 
-%{__cc} --shared IMG*.o -Wl,--enable-auto-image-base -o SDL_image.dll -Wl,--out-implib,libSDL_image.dll.a -lSDL -lpng -ljpeg
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-cp -f .libs/libSDL_image.a .
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note *.dll
-%{target}-strip -g -R.comment -R.note *.a
+%{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
 
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include/SDL,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install SDL_image.h $RPM_BUILD_ROOT%{arch}/include/SDL
-install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/include/SDL/*
-%{arch}/lib/*
+%doc CHANGES README
+%{_libdir}/libSDL_image.dll.a
+%{_libdir}/libSDL_image.la
+%{_includedir}/SDL/SDL_image.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libSDL_image.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system/*.dll
+%{_dlldir}/libSDL_image-*.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -133,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/08/13 17:27:39  qboosh
+- updated to 1.2.6
+
 Revision 1.14  2007/02/12 21:23:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/crossmingw32-SDL_image.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list