From 4d209061a61f0be06c008309fa2dbfa2bb5680e9 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Fri, 2 Sep 2005 01:56:42 +0000 Subject: [PATCH] Makes certain draw code endian-safe. Should fix things for big-endian arches. Thanks to Stanislaw Skowronek and geoman in bug #104318. Package-Manager: portage-2.0.51.22-r2 --- x11-base/xorg-server/ChangeLog | 16 ++++++++++++++- x11-base/xorg-server/Manifest | 17 ++++------------ ...0.99.1-r5 => digest-xorg-server-0.99.1-r6} | 0 .../files/make-fbcompose-endian-safe.patch | 20 +++++++++++++++++++ ...r5.ebuild => xorg-server-0.99.1-r6.ebuild} | 5 +++-- 5 files changed, 42 insertions(+), 16 deletions(-) rename x11-base/xorg-server/files/{digest-xorg-server-0.99.1-r5 => digest-xorg-server-0.99.1-r6} (100%) create mode 100644 x11-base/xorg-server/files/make-fbcompose-endian-safe.patch rename x11-base/xorg-server/{xorg-server-0.99.1-r5.ebuild => xorg-server-0.99.1-r6.ebuild} (96%) diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 7de39286c830..65f101044855 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.35 2005/08/30 13:15:35 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.36 2005/09/02 01:56:42 joshuabaergen Exp $ + + 02 Sep 2005; Joshua Baergen + +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild, + +xorg-server-0.99.1-r6.ebuild: + Makes certain draw code endian-safe. Should fix things for big-endian + arches. Thanks to Stanislaw Skowronek and geoman in bug #104318. + +*xorg-server-0.99.1-r6 (02 Sep 2005) + + 02 Sep 2005; Joshua Baergen + +files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r5.ebuild, + +xorg-server-0.99.1-r6.ebuild: + Added fix to make colour calculations endian safe. Thanks to Stanislaw + Skowronek for the patch and geoman for the heads-up. Fixes bug #104318. 30 Aug 2005; Herbie Hopkins xorg-server-0.99.1-r5.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6680131e8ab6..50200301a536 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 790669b658cbafeb12022147568f5d61 xorg-server-0.99.1-r5.ebuild 3700 -MD5 520d1e65c678874d2aee81d915d4e6c7 ChangeLog 6869 +MD5 2c6af8ccbe6e3bb4a5475878f99d7614 ChangeLog 7533 +MD5 4b652634d51f98cf63bf75c30e835db9 xorg-server-0.99.1-r6.ebuild 3754 MD5 1fa8d5da48c29537eeca2a0b63fd31a2 files/fix-xnest.patch 682 MD5 bef863b379ee69c1339b0e01e4d51284 files/0.99.1-r5-check-for-glproto.patch 859 -MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r5 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDFFwN2G5bA0cA/ScRAp7cAKDZ2SLaQ84HTalWFv36YzM+ztNvqQCfTpaP -MZWPqjgUMKN4l81f+hPbcI8= -=x6Lp ------END PGP SIGNATURE----- +MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r6 241 +MD5 55216957eaf15355f76c7499c9127760 files/make-fbcompose-endian-safe.patch 803 diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r5 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r6 similarity index 100% rename from x11-base/xorg-server/files/digest-xorg-server-0.99.1-r5 rename to x11-base/xorg-server/files/digest-xorg-server-0.99.1-r6 diff --git a/x11-base/xorg-server/files/make-fbcompose-endian-safe.patch b/x11-base/xorg-server/files/make-fbcompose-endian-safe.patch new file mode 100644 index 000000000000..b1cd5706ee23 --- /dev/null +++ b/x11-base/xorg-server/files/make-fbcompose-endian-safe.patch @@ -0,0 +1,20 @@ +--- fb/fbcompose.c.orig 2005-09-01 19:19:58.996039250 -0600 ++++ fb/fbcompose.c 2005-09-01 19:23:33.865467750 -0600 +@@ -1022,7 +1022,7 @@ + int i; + CARD32 *pixel = (CARD32 *)bits + x; + for (i = 0; i < width; ++i) +- *pixel++ = (values[i] & 0xff00ff00) | ((values[i] >> 16) && 0xff) | ((values[i] & 0xff) << 16); ++ *pixel++ = (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16); + } + + static FASTCALL void +@@ -1031,7 +1031,7 @@ + int i; + CARD32 *pixel = (CARD32 *)bits + x; + for (i = 0; i < width; ++i) +- *pixel++ = (values[i] & 0x0000ff00) | ((values[i] >> 16) && 0xff) | ((values[i] & 0xff) << 16); ++ *pixel++ = (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16); + } + + static FASTCALL void diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r6.ebuild similarity index 96% rename from x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild rename to x11-base/xorg-server/xorg-server-0.99.1-r6.ebuild index c547ef3af057..aa194ae9f166 100644 --- a/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild +++ b/x11-base/xorg-server/xorg-server-0.99.1-r6.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/x11-base/xorg-server/xorg-server-0.99.1-r5.ebuild,v 1.3 2005/08/30 13:15:35 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r6.ebuild,v 1.1 2005/09/02 01:56:42 joshuabaergen Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -19,7 +19,8 @@ CVS_UPDATE_DATE="20050822-1" PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch ${FILESDIR}/${PVR}-check-for-glproto.patch - ${FILESDIR}/fix-xnest.patch" + ${FILESDIR}/fix-xnest.patch + ${FILESDIR}/make-fbcompose-endian-safe.patch" SRC_URI="${SRC_URI} mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 -- 2.26.2