From ef91b228c2b12b4b807e2b0051078b1c66dc08f3 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Tue, 28 Mar 2006 21:34:42 +0000 Subject: [PATCH] Re-add 64-bit direct rendering patches that got lost in the 1.0.2 bump. Package-Manager: portage-2.1_pre6-r5 --- x11-base/xorg-server/ChangeLog | 10 +++++++- x11-base/xorg-server/Manifest | 24 ++++++++++++------- ...r-1.0.2-r1 => digest-xorg-server-1.0.2-r2} | 0 ...rver-1.0.2-64bit-fix-have-dix-config.patch | 18 ++++++++++++++ ....0.2-64bit-fix-indirect-vertex-array.patch | 17 +++++++++++++ ...-r1.ebuild => xorg-server-1.0.2-r2.ebuild} | 4 +++- 6 files changed, 62 insertions(+), 11 deletions(-) rename x11-base/xorg-server/files/{digest-xorg-server-1.0.2-r1 => digest-xorg-server-1.0.2-r2} (100%) create mode 100644 x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch create mode 100644 x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch rename x11-base/xorg-server/{xorg-server-1.0.2-r1.ebuild => xorg-server-1.0.2-r2.ebuild} (96%) diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index fa0499b70533..f2ab73be8111 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.95 2006/03/24 18:45:00 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.96 2006/03/28 21:34:42 spyderous Exp $ + +*xorg-server-1.0.2-r2 (28 Mar 2006) + + 28 Mar 2006; Donnie Berkholz ; + +files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch, + +files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch, + -xorg-server-1.0.2-r1.ebuild, +xorg-server-1.0.2-r2.ebuild: + Re-add 64-bit direct rendering patches that got lost in the 1.0.2 bump. 24 Mar 2006; Donnie Berkholz ; +files/xprint.init, xorg-server-1.0.2-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index d89be6c9d505..97700df5f888 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,15 +1,21 @@ -MD5 80f0f4a3d92f7caf7ced24ee2002c21d ChangeLog 19762 -RMD160 da13c37b3790d8fac0f6057cf6b4cb68dfc13864 ChangeLog 19762 -SHA256 b4ad004878f9d0cf06ede4861aedaf4188d37a8d9f732cdf11c1b474e7e2ed43 ChangeLog 19762 +MD5 280cf4ed7465f4c45a4cc7edca6cd547 ChangeLog 20117 +RMD160 cc242fb6701fbab73abec10e5ff107eb2654c520 ChangeLog 20117 +SHA256 f270896fe8bed4e2419286309e5f03af8eb59ecaef0ca1c803299cc0659d93e5 ChangeLog 20117 MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 MD5 bf743bd4e1b1c3a6b3d3122f48f8f6a7 files/1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 files/1.0.2-try-to-fix-xorgcfg.patch 3420 SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.0.2-try-to-fix-xorgcfg.patch 3420 -MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r1 771 -RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r1 771 -SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r1 771 +MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r2 771 +RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r2 771 +SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r2 771 +MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 +RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 +SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 +MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 +RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 +SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388 @@ -22,6 +28,6 @@ SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xp MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 -MD5 56dabb9d14e0955848f39e80cbde9bd0 xorg-server-1.0.2-r1.ebuild 5401 -RMD160 2b5dba59a082e4b7776cf93e05dd98394d7bc118 xorg-server-1.0.2-r1.ebuild 5401 -SHA256 9225f21661d7ed337c311ebea694b465aacc821938a97241110ba9e115da8213 xorg-server-1.0.2-r1.ebuild 5401 +MD5 c5c547b7494d1a9bd3b41f16bd54f45e xorg-server-1.0.2-r2.ebuild 5507 +RMD160 37850cfadf7466f2159b7bcea6a2d1278a88934c xorg-server-1.0.2-r2.ebuild 5507 +SHA256 87509ad1a0cfb357b27afb993cc6578b2814f71ecec620819cc4209b24b5b096 xorg-server-1.0.2-r2.ebuild 5507 diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r2 similarity index 100% rename from x11-base/xorg-server/files/digest-xorg-server-1.0.2-r1 rename to x11-base/xorg-server/files/digest-xorg-server-1.0.2-r2 diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch new file mode 100644 index 000000000000..55177bcfed70 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch @@ -0,0 +1,18 @@ +=================================================================== +RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v +rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.70 +retrieving revision 1.71 +diff -u -r1.70 -r1.71 +--- ../Mesa-6.4.2/src/mesa/main/glheader.h 2006/02/11 02:59:38 1.70 ++++ ../Mesa-6.4.2/src/mesa/main/glheader.h 2006/02/15 21:03:34 1.71 +@@ -46,6 +46,9 @@ + #ifndef GLHEADER_H + #define GLHEADER_H + ++#ifdef HAVE_DIX_CONFIG_H ++#include "dix-config.h" ++#endif + + #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER) + #include "xf86_ansic.h" diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch new file mode 100644 index 000000000000..4c1291b107d2 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v +rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c 2005/08/19 18:53:26 1.6 ++++ ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c 2006/02/14 15:04:45 1.7 +@@ -530,7 +530,7 @@ + emit_DrawArrays_header_old( __GLXcontext * gc, + struct array_state_vector * arrays, + size_t * elements_per_request, +- size_t * total_requests, ++ unsigned int * total_requests, + GLenum mode, GLsizei count ) + { + size_t command_size; diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild similarity index 96% rename from x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild rename to x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild index 4cf8d25bd443..315439231433 100644 --- a/x11-base/xorg-server/xorg-server-1.0.2-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.0.2-r1.ebuild,v 1.4 2006/03/24 18:45:00 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2-r2.ebuild,v 1.1 2006/03/28 21:34:42 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -17,6 +17,8 @@ MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" PATCHES="${FILESDIR}/${P}-Sbus.patch ${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch + ${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch + ${FILESDIR}/${P}-64bit-fix-have-dix-config.patch ${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch ${DISTDIR}/${PV}-overlay-window.patch.bz2" -- 2.26.2