summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Nall <nall@gentoo.org>2003-02-06 02:18:25 +0000
committerJon Nall <nall@gentoo.org>2003-02-06 02:18:25 +0000
commitac39be2b99acbbb9d5a9eb4a8efbda25cf5d0e69 (patch)
treede34fc567b23ce94fec9059fd780da67d76343f7 /x11-libs
parentUpdated ebuild. #15004. (diff)
downloadhistorical-ac39be2b99acbbb9d5a9eb4a8efbda25cf5d0e69.tar.gz
historical-ac39be2b99acbbb9d5a9eb4a8efbda25cf5d0e69.tar.bz2
historical-ac39be2b99acbbb9d5a9eb4a8efbda25cf5d0e69.zip
patch for 15/24 bit display endian problems on ppc
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog5
-rw-r--r--x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch34
-rw-r--r--x11-libs/gtk+/gtk+-2.2.1.ebuild8
3 files changed, 45 insertions, 2 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4b85d4df4cca..cf9db08bc4e6 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for x11-libs/gtk+
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.48 2003/02/04 06:01:48 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.49 2003/02/06 02:18:25 nall Exp $
*gtk+-2.2.1 (04 Feb 2003)
+ 05 Feb 2003; Jon Nall <nall@gentoo.org> gtk+--2.2.1.ebuild :
+ added patch to fix endian problem for 15/24 bit displays
+
04 Feb 2003; Spider <spider@gentoo.org> gtk+-2.2.1.ebuild :
bumped version
diff --git a/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch b/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch
new file mode 100644
index 000000000000..aa5ffd48ffb6
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch
@@ -0,0 +1,34 @@
+--- gdk/gdkpixbuf-drawable.c.orig 2003-02-05 19:43:30.000000000 -0600
++++ gdk/gdkpixbuf-drawable.c 2003-02-05 19:44:43.000000000 -0600
+@@ -982,7 +982,7 @@
+ #ifdef LITTLE
+ register guint16 *s; /* read 1 pixels at once */
+ #else
+- register guint8 *s;
++ register guint16 *s;
+ #endif
+ register guint32 *o;
+
+@@ -995,7 +995,7 @@
+ #ifdef LITTLE
+ s = (guint16 *) srow;
+ #else
+- s = srow;
++ s = (guint16 *) srow;
+ #endif
+ o = (guint32 *) orow;
+ for (xx = x1; xx < x2; xx++)
+@@ -1145,8 +1145,11 @@
+ *o++ = 0xff;
+ s += 4;
+ #else
+- *o++ = (*s << 8) | 0xff; /* untested */
+- s++;
++ *o++ = s[1];
++ *o++ = s[2];
++ *o++ = s[3];
++ *o++ = 0xff;
++ s += 4;
+ #endif
+ }
+ srow += bpl;
diff --git a/x11-libs/gtk+/gtk+-2.2.1.ebuild b/x11-libs/gtk+/gtk+-2.2.1.ebuild
index 31deb4f7396b..d55987934f89 100644
--- a/x11-libs/gtk+/gtk+-2.2.1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.1 2003/02/04 06:01:48 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.2 2003/02/06 02:18:25 nall Exp $
inherit eutils libtool flag-o-matic
@@ -35,6 +35,12 @@ src_unpack() {
cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
# should speed up metacity
cd ${S}; epatch ${FILESDIR}/gtk+-wm.patch
+
+ if [ "${ARCH}" == "ppc" ]
+ then
+ einfo "Fixing endianness issue in gdkpixbuf for 24-bit and 15-bit displays"
+ cd ${S}; epatch ${FILESDIR}/gtk+-2.2.1-gdkpixbuf-bigendian.patch
+ fi
}
src_compile() {