Author: qboosh Date: Tue Sep 7 07:00:57 2010 GMT Module: packages Tag: HEAD ---- Log message: - added libpng patch to prefer libpng 1.4.x over 1.2.x/1.0.x - cleanup, updated BRs
---- Files affected: packages/SDL_image: SDL_image.spec (1.69 -> 1.70) , SDL_image-libpng.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/SDL_image/SDL_image.spec diff -u packages/SDL_image/SDL_image.spec:1.69 packages/SDL_image/SDL_image.spec:1.70 --- packages/SDL_image/SDL_image.spec:1.69 Sat Feb 6 03:15:38 2010 +++ packages/SDL_image/SDL_image.spec Tue Sep 7 09:00:52 2010 @@ -9,6 +9,7 @@ Group: Libraries Source0: http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz # Source0-md5: 6c06584b31559e2b59f2b982d0d1f628 +Patch0: %{name}-libpng.patch URL: http://www.libsdl.org/projects/SDL_image/ BuildRequires: SDL-devel >= 1.2.10 BuildRequires: autoconf @@ -16,12 +17,17 @@ BuildRequires: libjpeg-devel >= 7 BuildRequires: libpng-devel >= 2:1.2.0 BuildRequires: libtiff-devel >= 3 -BuildRequires: libtool -BuildRequires: pkgconfig >= 0.9.0 +BuildRequires: libtool >= 2:2.0 +BuildRequires: pkgconfig >= 1:0.9.0 Requires: SDL >= 1.2.10 Obsoletes: libSDL_image1.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +# NOTE: libraries dlopened by sonames detected at build time: +# libjpeg.so.8 +# libpng14.so.14 [note the libpng patch for preferred libs order] +# libtiff.so.3 + %description This is a simple library to load images of various formats as SDL surfaces. This library currently supports BMP, PPM, PCX, GIF, JPEG, @@ -72,8 +78,7 @@ %prep %setup -q - -rm -f acinclude.m4 +%patch0 -p1 %build %{__libtoolize} @@ -118,7 +123,7 @@ %defattr(644,root,root,755) %doc CHANGES README %attr(755,root,root) %{_bindir}/sdlshow -%attr(755,root,root) %{_libdir}/libSDL_image-*.so.*.*.* +%attr(755,root,root) %{_libdir}/libSDL_image-1.2.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libSDL_image-1.2.so.0 %files devel @@ -138,6 +143,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2010/09/07 07:00:52 qboosh +- added libpng patch to prefer libpng 1.4.x over 1.2.x/1.0.x +- cleanup, updated BRs + Revision 1.69 2010/02/06 02:15:38 baggins - rel 2 ================================================================ Index: packages/SDL_image/SDL_image-libpng.patch diff -u /dev/null packages/SDL_image/SDL_image-libpng.patch:1.1 --- /dev/null Tue Sep 7 09:00:57 2010 +++ packages/SDL_image/SDL_image-libpng.patch Tue Sep 7 09:00:52 2010 @@ -0,0 +1,21 @@ +--- SDL_image-1.2.10/configure.in.orig 2009-11-12 07:41:21.000000000 +0100 ++++ SDL_image-1.2.10/configure.in 2010-09-07 08:31:57.847130107 +0200 +@@ -205,15 +205,12 @@ + png_lib=[`find_lib "libpng*.dll"`] + ;; + *) +- png_lib=[`find_lib "libpng.so.[0-9]"`] ++ png_lib=[`find_lib "libpng14.so.[0-9][0-9]"`] + if test x$png_lib = x; then +- png_lib=[`find_lib "libpng.so.[0-9]*"`] ++ png_lib=[`find_lib "libpng12.so.[0-9]"`] + fi + if test x$png_lib = x; then +- png_lib=[`find_lib "libpng*.so.[0-9]"`] +- fi +- if test x$png_lib = x; then +- png_lib=[`find_lib "libpng*.so.[0-9]*"`] ++ png_lib=[`find_lib "libpng.so.[0-9]"`] + fi + ;; + esac ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SDL_image/SDL_image.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
