packages: SDL_image/SDL_image-libpng.patch, SDL_image/SDL_image.spec - upda...

[qboosh]

Author: qboosh                       Date: Tue Jan 17 17:11:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.11
- adjusted libpng patch to prefer libpng 1.5.x
- enforced newer libraries at build time to store proper sonames
  (libjpeg 8, libpng 1.4+, libtiff 4)
- BR: libwebp-devel

---- Files affected:
packages/SDL_image:
   SDL_image-libpng.patch (1.1 -> 1.2) , SDL_image.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: packages/SDL_image/SDL_image-libpng.patch
diff -u packages/SDL_image/SDL_image-libpng.patch:1.1 packages/SDL_image/SDL_image-libpng.patch:1.2
--- packages/SDL_image/SDL_image-libpng.patch:1.1	Tue Sep  7 09:00:52 2010
+++ packages/SDL_image/SDL_image-libpng.patch	Tue Jan 17 18:10:57 2012
@@ -1,19 +1,20 @@
 --- 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 @@
+@@ -205,15 +205,15 @@
                  png_lib=[`find_lib "libpng*.dll"`]
                  ;;
              *)
 -                png_lib=[`find_lib "libpng.so.[0-9]"`]
-+                png_lib=[`find_lib "libpng14.so.[0-9][0-9]"`]
++                png_lib=[`find_lib "libpng15.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]"`]
++                    png_lib=[`find_lib "libpng14.so.[0-9][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 "libpng12.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

================================================================
Index: packages/SDL_image/SDL_image.spec
diff -u packages/SDL_image/SDL_image.spec:1.71 packages/SDL_image/SDL_image.spec:1.72
--- packages/SDL_image/SDL_image.spec:1.71	Sat Jan 29 01:06:04 2011
+++ packages/SDL_image/SDL_image.spec	Tue Jan 17 18:10:57 2012
@@ -3,20 +3,21 @@
 Summary(pl.UTF-8):	Przykładowa biblioteka do ładowania obrazków
 Summary(pt_BR.UTF-8):	Simple DirectMedia Layer - Biblioteca exemplo para carga de Imagens
 Name:		SDL_image
-Version:	1.2.10
-Release:	2
-License:	LGPL v2.1+
+Version:	1.2.11
+Release:	1
+License:	Zlib-like
 Group:		Libraries
 Source0:	http://www.libsdl.org/projects/SDL_image/release/%{name}-%{version}.tar.gz
-# Source0-md5:	6c06584b31559e2b59f2b982d0d1f628
+# Source0-md5:	1210d7a7e87ab95abebb4f3e79a0fd31
 Patch0:		%{name}-libpng.patch
 URL:		http://www.libsdl.org/projects/SDL_image/
 BuildRequires:	SDL-devel >= 1.2.10
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libjpeg-devel >= 7
-BuildRequires:	libpng-devel >= 2:1.2.0
-BuildRequires:	libtiff-devel >= 3
+BuildRequires:	libjpeg-devel >= 8
+BuildRequires:	libpng-devel >= 2:1.4.0
+BuildRequires:	libtiff-devel >= 4
+BuildRequires:	libwebp-devel >= 0.1
 BuildRequires:	libtool >= 2:2.0
 BuildRequires:	pkgconfig >= 1:0.9.0
 Requires:	SDL >= 1.2.10
@@ -25,8 +26,9 @@
 
 # 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
+# libpng15.so.15/libpng14.so.14 [note the libpng patch for preferred libs order]
+# libtiff.so.5
+# libwebp.so.2
 
 %description
 This is a simple library to load images of various formats as SDL
@@ -98,6 +100,8 @@
 	--enable-tga \
 	--enable-tif \
 	--enable-tif-shared \
+	--enable-webp \
+	--enable-webp-shared \
 	--enable-xcf \
 	--enable-xpm \
 	--enable-xv 
@@ -121,7 +125,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README
+%doc CHANGES COPYING README
 %attr(755,root,root) %{_bindir}/sdlshow
 %attr(755,root,root) %{_libdir}/libSDL_image-1.2.so.*.*.*
 %attr(755,root,root) %ghost  %{_libdir}/libSDL_image-1.2.so.0
@@ -143,6 +147,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2012/01/17 17:10:57  qboosh
+- updated to 1.2.11
+- adjusted libpng patch to prefer libpng 1.5.x
+- enforced newer libraries at build time to store proper sonames
+  (libjpeg 8, libpng 1.4+, libtiff 4)
+- BR: libwebp-devel
+
 Revision 1.71  2011/01/29 00:06:04  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SDL_image/SDL_image-libpng.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SDL_image/SDL_image.spec?r1=1.71&r2=1.72&f=u