Author: arekm Date: Thu Jan 28 18:56:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; libpng fixes
---- Files affected:
packages/libgdiplus:
libgdiplus.spec (1.61 -> 1.62) , libgdiplus-libpng.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libgdiplus/libgdiplus.spec
diff -u packages/libgdiplus/libgdiplus.spec:1.61
packages/libgdiplus/libgdiplus.spec:1.62
--- packages/libgdiplus/libgdiplus.spec:1.61 Thu Jan 28 19:23:20 2010
+++ packages/libgdiplus/libgdiplus.spec Thu Jan 28 19:56:10 2010
@@ -10,7 +10,7 @@
Summary(pl.UTF-8): Otwarta implementacja API GDI+
Name: libgdiplus
Version: 2.4
-Release: 3
+Release: 4
%if %{with internal_cairo}
License: LGPL v2.1 or MPL 1.1
%else
@@ -22,6 +22,7 @@
# Source0-md5: ddf40d6f21ab7e8942abd063d460e4fa
Patch0: %{name}-link.patch
Patch1: %{name}-lt.patch
+Patch2: %{name}-libpng.patch
URL: http://www.mono-project.com/
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1:1.7
@@ -94,6 +95,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p0
%build
cd cairo
@@ -149,6 +151,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.62 2010/01/28 18:56:10 arekm
+- rel 4; libpng fixes
+
Revision 1.61 2010/01/28 18:23:20 arekm
- release 3
================================================================
Index: packages/libgdiplus/libgdiplus-libpng.patch
diff -u /dev/null packages/libgdiplus/libgdiplus-libpng.patch:1.1
--- /dev/null Thu Jan 28 19:56:15 2010
+++ packages/libgdiplus/libgdiplus-libpng.patch Thu Jan 28 19:56:10 2010
@@ -0,0 +1,60 @@
+--- src/pngcodec.c.orig 2010-01-16 23:47:17.000000000 +0100
++++ src/pngcodec.c 2010-01-16 23:49:49.000000000 +0100
+@@ -352,7 +352,7 @@
+ info_ptr->palette[i].blue,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].red,
+- info_ptr->trans[i]); /* alpha */
++ info_ptr->trans_alpha[i]); /*
alpha */
+ }
+ }
+
+@@ -418,7 +418,7 @@
+ }
+
+ if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+--- configure.in~ 2009-01-28 23:46:54.000000000 +0100
++++ configure.in 2010-01-28 19:52:59.844022017 +0100
+@@ -293,19 +293,19 @@
+ fi
+
+ dnl Test for libpng
+- AC_MSG_CHECKING(for libpng12)
+- if $PKG_CONFIG --exists libpng12 ; then
++ AC_MSG_CHECKING(for libpng)
++ if $PKG_CONFIG --exists libpng ; then
+ AC_MSG_RESULT(yes)
+ PNG='png'
+- PNG_DEP_CFLAGS_PACKAGES=libpng12
+- LIBPNG=`$PKG_CONFIG --libs libpng12`
++ PNG_DEP_CFLAGS_PACKAGES=libpng
++ LIBPNG=`$PKG_CONFIG --libs libpng`
+ else
+ AC_MSG_RESULT(no)
+ AC_CHECK_LIB(png, png_read_info,
+ [AC_CHECK_HEADER(png.h,
+ png_ok=yes,
+ png_ok=no)],
+- AC_MSG_ERROR(*** libpng12 not found. See
http://www.libpng.org/pub/png/libpng.html.), -lz -lm)
++ AC_MSG_ERROR(*** libpng not found. See
http://www.libpng.org/pub/png/libpng.html.), -lz -lm)
+ if test "$png_ok" = yes; then
+ AC_MSG_CHECKING([for png_structp in png.h])
+ AC_TRY_COMPILE([#include <png.h>],
+@@ -316,10 +316,10 @@
+ if test "$png_ok" = yes; then
+ PNG='png'; LIBPNG='-lpng -lz'
+ else
+- AC_MSG_ERROR(*** libpng12 found, but it is too old. See
http://www.libpng.org/pub/png/libpng.html.)
++ AC_MSG_ERROR(*** libpng found, but it is too old. See
http://www.libpng.org/pub/png/libpng.html.)
+ fi
+ else
+- AC_MSG_ERROR(*** libpng12 not found. See
http://www.libpng.org/pub/png/libpng.html.)
++ AC_MSG_ERROR(*** libpng not found. See
http://www.libpng.org/pub/png/libpng.html.)
+ fi
+ fi
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgdiplus/libgdiplus.spec?r1=1.61&r2=1.62&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
