summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-05-22 01:06:36 +0000
committerMike Frysinger <vapier@gentoo.org>2005-05-22 01:06:36 +0000
commit1438e6feed95b15870ea06bacbe3d5e1e6eaa727 (patch)
tree4b04d78b70a3b8c91afd8ff7dab8d1498290e0de /media-libs
parentAdded perl patch thanks to DerCorny. (diff)
downloadhistorical-1438e6feed95b15870ea06bacbe3d5e1e6eaa727.tar.gz
historical-1438e6feed95b15870ea06bacbe3d5e1e6eaa727.tar.bz2
historical-1438e6feed95b15870ea06bacbe3d5e1e6eaa727.zip
fix png types #83603
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/devil/Manifest7
-rw-r--r--media-libs/devil/devil-1.6.7.ebuild8
-rw-r--r--media-libs/devil/files/devil-1.6.7-png-types.patch16
3 files changed, 27 insertions, 4 deletions
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 448373d012cf..4a52cc8bf9dc 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -1,6 +1,7 @@
-MD5 626733ec2481dc685f50549d16f8546e devil-1.6.6-r2.ebuild 1267
MD5 4c2001514fc1fe99e978c2021792c97f ChangeLog 1738
-MD5 62ff0644492265ef18ea5cbd6abef603 devil-1.6.7.ebuild 1092
+MD5 626733ec2481dc685f50549d16f8546e devil-1.6.6-r2.ebuild 1267
+MD5 b1d0332565f2a5604730bfd28084cfe7 devil-1.6.7.ebuild 1177
+MD5 6d366044841f5d55e08b7791864b0d59 files/digest-devil-1.6.6-r2 63
MD5 23e87e84b73b2c7994b446040df2738e files/1.6.6-configure.in.patch 8140
MD5 28d09fde772494441e9f5a30e2b20097 files/digest-devil-1.6.7 64
-MD5 6d366044841f5d55e08b7791864b0d59 files/digest-devil-1.6.6-r2 63
+MD5 00ece5df43475a333ec6812e0ba74af4 files/devil-1.6.7-png-types.patch 348
diff --git a/media-libs/devil/devil-1.6.7.ebuild b/media-libs/devil/devil-1.6.7.ebuild
index 00274101b064..5fb12c794f48 100644
--- a/media-libs/devil/devil-1.6.7.ebuild
+++ b/media-libs/devil/devil-1.6.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.7.ebuild,v 1.3 2005/04/21 19:18:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.7.ebuild,v 1.4 2005/05/22 01:06:36 vapier Exp $
inherit eutils libtool
@@ -23,6 +23,12 @@ RDEPEND="X? ( virtual/x11 )
S=${WORKDIR}/DevIL-${PV}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-png-types.patch
+}
+
src_compile() {
econf \
$(use_with X x) \
diff --git a/media-libs/devil/files/devil-1.6.7-png-types.patch b/media-libs/devil/files/devil-1.6.7-png-types.patch
new file mode 100644
index 000000000000..41bf7c868865
--- /dev/null
+++ b/media-libs/devil/files/devil-1.6.7-png-types.patch
@@ -0,0 +1,16 @@
+Make sure the internal types match that of png.
+
+http://bugs.gentoo.org/83603
+
+--- src-IL/src/il_png.c
++++ src-IL/src/il_png.c
+@@ -284,7 +284,8 @@
+ {
+ ILuint i;
+ png_bytepp row_pointers = NULL;
+- ILuint width, height, channels;
++ ILuint channels;
++ png_uint_32 width, height;
+ ILdouble screen_gamma = 1.0, image_gamma;
+ ILuint bit_depth;
+