Make xorg-server build again on ppc

Package-Manager: portage-2.1.5.5

4 files changed, 55 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 71b893fd11ec..4631f08139e9 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.338 2008/06/13 23:47:31 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.339 2008/06/15 14:21:40 lu_zero Exp $
+
+  15 Jun 2008; Luca Barbato <lu_zero@gentoo.org>
+  +files/1.4.2-unbreak-endianess.patch, xorg-server-1.4.2.ebuild:
+  Make xorg-server build again on ppc
 
   13 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.4.2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cd375203a608..6a602b48443b 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -35,6 +32,7 @@ AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
 AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
+AUX 1.4.2-unbreak-endianess.patch 1350 RMD160 a963d2bcfc71fd707e6481755954a7139cda9b58 SHA1 de57a016bccb5f963c2a098cb37b0714e738327e SHA256 2c9a3c4f48c7706543e5e916eebc8d34995fbfb1699cf8ade50169d6f5baa769
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
 AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 RMD160 06d03313a419fcad6b3668888e32dad28defb3a4 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
@@ -57,14 +55,7 @@ EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18114 RMD160 e6fffcc39506db21aafee5e70b8bb043026d5290 SHA1 3e716d92bc096757eb29c3e1e7ae9365a1925f07 SHA256 bb90fb9650d061d42625d99aefefe4de9e032c0b8e517be7c19a5b9ea15a742d
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18359 RMD160 8f37ef97f5a7d32889db08f65a8016f947892ae6 SHA1 afed5df9f92698215a919982be46e23619ab884b SHA256 1704e5b011df9efa828d052b9042c568b330423e9056323b106a59a2aa988756
 EBUILD xorg-server-1.4.0.90-r3.ebuild 19023 RMD160 6e6f374d79d0fb7ca2404e33314816829766085b SHA1 0c3707ddbf15604cf887843a52dcccc43c94db70 SHA256 3530c253f1087d4c7c782a2260294b0ca0d1bdd0eb11e4b1553ce93c68a1f319
-EBUILD xorg-server-1.4.2.ebuild 17913 RMD160 46f1ce46c760a8f693711f7f20e0924f8b745355 SHA1 b8c58dbd4e2e028a5f354364892f73dc1aaf939f SHA256 5df22ca7c1a7c092607cfb5751b99af74f9af3a046422997a45c27f603408d66
+EBUILD xorg-server-1.4.2.ebuild 17995 RMD160 242b87a67d78e8d3f5fc4aae106b67b2a805d6f2 SHA1 a5dcd57c60c631dd2d6ab02dfb2e45f3e2289760 SHA256 2921025f5625f9dc05bb7fe469197f595335d6f1738b712c2dde43b5ea19da46
 EBUILD xorg-server-1.4.99.902.ebuild 17595 RMD160 354412d2e44c6169e1967fdbcc552920050ef087 SHA1 fc57a9b7179aabd4c0281ef5a9770cb847cc3cf3 SHA256 3da84ccbca046dbb2184f5d5e621423d360d405c497b50d4693cf64eb6b20fa5
-MISC ChangeLog 83456 RMD160 3825f5745b42eaf2265728f0bc615e9cf93268c7 SHA1 cecbbd434ec820b34254bd85edd1826de78ca894 SHA256 db79e18d8d526c4d4af79977b19657f8e735df18351c9278f820cbc87e8324be
+MISC ChangeLog 83608 RMD160 11216ae1449ae54c331e535af3e8d6e0e26752a3 SHA1 8c83ddf6f9df6894a09ec92355e43a3883817626 SHA256 ad165801dc286067825a662ee8fd3a18c7935890cc8979af2654f0972c1afe64
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhTBx0ACgkQXVaO67S1rtsQ8wCfefN24QClJWh37+kH6MpJIpsU
-Mj4AoOuZbhbNxpuob6eFf8DNmVbtK6qt
-=4vw5
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.4.2-unbreak-endianess.patch b/x11-base/xorg-server/files/1.4.2-unbreak-endianess.patch
new file mode 100644
index 000000000000..7169b2ad61c5
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.2-unbreak-endianess.patch
@@ -0,0 +1,43 @@
+--- configure.ac.orig	2008-06-15 03:34:11.000000000 +0200
++++ configure.ac	2008-06-15 04:02:34.000000000 +0200
+@@ -1104,18 +1104,8 @@
+ AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
+ 
+ XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
+-AC_DEFINE_UNQUOTED(_X_BYTE_ORDER,[$ENDIAN],[Endian order])
+ AH_VERBATIM([X_BYTE_ORDER],[
+-/* Deal with multiple architecture compiles on Mac OS X */
+-#ifndef __APPLE_CC__
+-#define X_BYTE_ORDER _X_BYTE_ORDER
+-#else
+-#ifdef __BIG_ENDIAN__
+-#define X_BYTE_ORDER X_BIG_ENDIAN
+-#else
+-#define X_BYTE_ORDER X_LITTLE_ENDIAN
+-#endif
+-#endif
++#include <X11/Xarch.h>
+ ])
+ 
+ AC_SUBST([XSERVER_LIBS])
+--- include/dix-config.h.in.orig	2008-06-15 12:46:48.000000000 +0200
++++ include/dix-config.h.in	        2008-06-15 12:47:32.000000000 +0200
+@@ -429,17 +429,7 @@
+ #undef XVENDORNAME
+ 
+ /* Endian order */
+-#undef _X_BYTE_ORDER
+-/* Deal with multiple architecture compiles on Mac OS X */
+-#ifndef __APPLE_CC__
+-#define X_BYTE_ORDER _X_BYTE_ORDER
+-#else
+-#ifdef __BIG_ENDIAN__
+-#define X_BYTE_ORDER X_BIG_ENDIAN
+-#else
+-#define X_BYTE_ORDER X_LITTLE_ENDIAN
+-#endif
+-#endif
++#include <X11/Xarch.h>
+ 
+ /* Enable GNU and other extensions to the C environment for GLIBC */
+ #undef _GNU_SOURCE
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index f54386c19420..7b27bce6cd1b 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.2 2008/06/13 23:47:31 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.3 2008/06/15 14:21:40 lu_zero Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -276,6 +276,7 @@ PATCHES="
 	${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
 	${FILESDIR}/1.4-fpic-libxf86config.patch
 	${FILESDIR}/1.4-fix-kdrive-automake.patch
+	${FILESDIR}/1.4.2-unbreak-endianess.patch
 	"
 
 pkg_setup() {
@@ -328,7 +329,8 @@ pkg_setup() {
 
 	# (#121394) Causes window corruption
 	filter-flags -fweb
-
+	# Workaround
+	append-flags -D_GNU_SOURCE
 	# Nothing else provides new enough glxtokens.h
 	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
 	OLD_IMPLEM="$(eselect opengl show)"