diff options
Diffstat (limited to 'x11-base/xorg-server')
24 files changed, 1562 insertions, 0 deletions
diff --git a/x11-base/xorg-server/CVS/Entries b/x11-base/xorg-server/CVS/Entries new file mode 100644 index 0000000..44c259a --- /dev/null +++ b/x11-base/xorg-server/CVS/Entries @@ -0,0 +1,5 @@ +/metadata.xml/1.1/Fri Sep 9 07:15:31 2005// +D/files//// +/ChangeLog/1.88/Sun Feb 19 03:54:56 2006// +/xorg-server-1.0.1-r4.ebuild/1.1/Sun Feb 19 03:54:56 2006// +/Manifest/1.118/Sun Feb 19 03:57:17 2006// diff --git a/x11-base/xorg-server/CVS/Repository b/x11-base/xorg-server/CVS/Repository new file mode 100644 index 0000000..8571710 --- /dev/null +++ b/x11-base/xorg-server/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/x11-base/xorg-server diff --git a/x11-base/xorg-server/CVS/Root b/x11-base/xorg-server/CVS/Root new file mode 100644 index 0000000..c108e17 --- /dev/null +++ b/x11-base/xorg-server/CVS/Root @@ -0,0 +1 @@ +spyderous@cvs.gentoo.org:/var/cvsroot diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog new file mode 100644 index 0000000..c78b07a --- /dev/null +++ b/x11-base/xorg-server/ChangeLog @@ -0,0 +1,464 @@ +# 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.88 2006/02/19 03:54:56 spyderous Exp $ + +*xorg-server-1.0.1-r4 (19 Feb 2006) + + 19 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch, + +files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch, + -xorg-server-1.0.1-r3.ebuild, +xorg-server-1.0.1-r4.ebuild: + Really fix GLX on 64-bit systems. + + 14 Feb 2006; Markus Rothe <corsair@gentoo.org> + xorg-server-1.0.1-r3.ebuild: + Added ~ppc64 + +*xorg-server-1.0.1-r3 (13 Feb 2006) + + 13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-1.0.1-amd64-fix-for-glx.patch, + -xorg-server-1.0.1-r2.ebuild, +xorg-server-1.0.1-r3.ebuild: + (#122140) Add patch to fix OpenGL on amd64, thanks to Igor V. Kovalenko + <garrison@mail.ru>. Also update to Mesa 6.4.2 tarball so people only need to + download one version of it. + + 06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.1-r2.ebuild: + Add an OR dependency with xkbdata for new x11-misc/xkeyboard-config, and + prefer it over xkbdata. + + 03 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.1-r2.ebuild: + (#121394) Filter -fweb, because it causes window corruption. + + 31 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> + xorg-server-1.0.1-r2.ebuild: + Unstable on hppa. + +*xorg-server-1.0.1-r2 (26 Jan 2006) + + 26 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-1.0.1-backtrace.patch, -xorg-server-1.0.1.ebuild, + -xorg-server-1.0.1-r1.ebuild, +xorg-server-1.0.1-r2.ebuild: + Fix the automatic backtraces at the bottom of /var/log/Xorg.*.log on segfaults. + + 19 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.1.ebuild, xorg-server-1.0.1-r1.ebuild: + Update the license. + + 04 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.1-r1.ebuild: + No need to specify configure options that are the default. + + 04 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.1-r1.ebuild: + No need to manually create Xorg -> X symlink anymore. + +*xorg-server-1.0.1-r1 (03 Jan 2006) + + 03 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.0.1-r1.ebuild: + Fix the libglx* relocation routine to look in the right place so that xorg-x11 + will play nice with eselect. Bug #117100. + + 26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> + xorg-server-1.0.1.ebuild: + Marked ~alpha + +*xorg-server-1.0.1 (23 Dec 2005) + + 23 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-1.0.1-Sbus.patch, -xorg-server-0.99.4-r2.ebuild, + -xorg-server-1.0.0.ebuild, +xorg-server-1.0.1.ebuild: + Bump for 7.0. (#111361) Add patch to fix sparc build. + +*xorg-server-1.0.0 (17 Dec 2005) + + 17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.0.0.ebuild: + Bump for 7.0RC4. + + 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/fix-xkb-compile-path-2.patch: + Unused file. + + 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + -xorg-server-0.99.2-r2.ebuild, -xorg-server-0.99.3.ebuild, + -xorg-server-0.99.3-r1.ebuild, -xorg-server-0.99.4.ebuild, + -xorg-server-0.99.4-r1.ebuild: + Pull old versions. + +*xorg-server-0.99.4-r2 (06 Dec 2005) + + 06 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-0.99.4-r2.ebuild: + Build against Mesa 6.4.1 instead of Mesa 6.4. Caught by dagb. + +*xorg-server-0.99.4-r1 (05 Dec 2005) + + 05 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-0.99.4-r1.ebuild: + It would appear that libglx (silently) fails to build if libdrm is not >= + version 2. Rev-bump so that anyone who has merged this already gets a forced + re-merge and thus gets a working glx extension. + +*xorg-server-0.99.4 (04 Dec 2005) + + 04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-0.99.4.ebuild: + Bump for 7.0RC3. + + 14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch, + xorg-server-0.99.3-r1.ebuild: + Remove CVS tags from patch as they don't do anything but break installs. + Fixes bug #112476. + +*xorg-server-0.99.3-r1 (14 Nov 2005) + + 14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/fix-xkb-compile-path.patch, +xorg-server-0.99.3-r1.ebuild: + Fix xkb issue spotted by spyderous. + +*xorg-server-0.99.3 (11 Nov 2005) + + 11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-0.99.3.ebuild: + Bump for 7.0RC2. + +*xorg-server-0.99.2-r2 (09 Nov 2005) + + 09 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; + -xorg-server-0.99.2-r1.ebuild, +xorg-server-0.99.2-r2.ebuild: + Build against mesa 6.4 instead of 6.3.2. + + 31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + -xorg-server-0.99.1_p20051013-r1.ebuild, -xorg-server-0.99.2.ebuild: + Pull old versions. + + 29 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.2-r1.ebuild: + Note that X->Xorg symlink will be taken care of for any new snapshots, so we + can remove the line from the ebuild. + + 20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.2-r1.ebuild: + Use --enable-install-setuid instead of manually changing permissions. + +*xorg-server-0.99.2-r1 (20 Oct 2005) + + 20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.2-r1.ebuild: + (#109926) No need to specify xkb path anymore, it's wrong now as well. + +*xorg-server-0.99.2 (20 Oct 2005) + + 20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.2.ebuild: + Bump for 7.0 RC1. + + 19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> + xorg-server-0.99.1_p20051013-r1.ebuild: + added ~mips keyword + + 17 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1_p20051013-r1.ebuild: + (#109354) In some mystical way all the dependency changes got reverted in + the new revision. + + 16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/0.99.1-r10-check-for-glproto.patch, + -files/0.99.1-r10_CAN-2005-2495.patch, -files/fix-transparencies.patch, + -xorg-server-0.99.1-r10.ebuild, -xorg-server-0.99.1_p20051013.ebuild: + Pull old ebuilds. + +*xorg-server-0.99.1_p20051013-r1 (16 Oct 2005) + + 16 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.1_p20051013-r1.ebuild: + (#109467) Set a non-broken default font path so things like Xvfb actually work. + + 15 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + Add x11-libs/libXtst for dmx. + + 15 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + (#109354) Add lots of deps -- libXaw, libXpm, libXxf86misc, libXxf86vm. Add + notes on which parts depend on them. + + 14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + Also wrap dmxproto dep in minimal USE. + + 14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + (#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres + dep within there, because it's for dmx. + + 14 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-0.99.1_p20051013.ebuild: + Add missing deps (x11-libs/libXres and x11-libs/libxkbui). + + 14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/0.99.1-r9_CAN-2005-2495.patch, + -files/0.99.1-r9-check-for-glproto.patch, -xorg-server-0.99.1-r9.ebuild: + Drop old revision. + +*xorg-server-0.99.1_p20051013 (14 Oct 2005) + + 14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.1_p20051013.ebuild: + Update to today's CVS. Enable xprint USE flag. Stop filtering + -fomit-frame-pointer, because it works now. Add dep on + >=x11-proto/glproto-1.4.1_pre20051013 to fix build breakage. + + 04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/0.99.1-r10-check-for-glproto.patch, + +files/0.99.1-r10_CAN-2005-2495.patch: + Oops, forgot the version-dependent patches. + +*xorg-server-0.99.1-r10 (04 Oct 2005) + + 04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/fix-transparencies.patch, +xorg-server-0.99.1-r10.ebuild: + Added fix for OO/wine transparencies from bug #96053. Thanks to bartron for + both patches. + + 27 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r9.ebuild: + As of 20050927, xprint will require mkfontdir/mkfontscale for XpConfig. + + 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> + -files/0.99.1-r6-check-for-glproto.patch, + -files/0.99.1-r8-check-for-glproto.patch, -files/fix-xnest.patch, + -files/make-fbcompose-endian-safe.patch, -xorg-server-0.99.1-r7.ebuild, + -xorg-server-0.99.1-r8.ebuild: + Remove old versions and patches. + +*xorg-server-0.99.1-r9 (13 Sep 2005) + + 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +files/0.99.1-r9_CAN-2005-2495.patch, + +files/0.99.1-r9-check-for-glproto.patch, +xorg-server-0.99.1-r9.ebuild: + Bump to include security fix from bug #105688. + + 12 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r8.ebuild: + Add some deps so we get a server that actually runs after emerging it. In + specific: media-fonts/font-misc-misc media-fonts/font-cursor-misc + x11-misc/xbitmaps x11-misc/xkbdata x11-apps/iceauth x11-apps/rgb + x11-apps/xauth x11-apps/xinit. + + 09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml: + Add metadata. + +*xorg-server-0.99.1-r8 (08 Sep 2005) + + 08 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/0.99.1-r8-check-for-glproto.patch, +xorg-server-0.99.1-r8.ebuild: + Update to CVS HEAD as of 20050907. Update glproto patch to apply cleanly. + + 06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r7.ebuild: + Make --enable-xcsecurity always on, remove nvidia USE. + + 03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> + xorg-server-0.99.1-r7.ebuild: + Changed opengl-update envocation to use eselect instead. + + 03 Sep 2005; Doug Goldstein <cardoe@gentoo.org> + +xorg-server-0.99.1-r7.ebuild, -xorg-server-0.99.1-r6.ebuild: + Added support for the XCSecurity option, which is what's needed to make + binary Nvidia drivers work + + 02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> + -files/0.99.1-r5-check-for-glproto.patch, + +files/0.99.1-r6-check-for-glproto.patch: + Apparently this patch has a package revision-based name. + + 02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +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 <joshuabaergen@gentoo.org> + +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 <herbs@gentoo.org> + xorg-server-0.99.1-r5.ebuild: + s/lib/$(get_libdir) + + 23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch, + -files/xorg-server-0.99.1-x86_64-1.patch, -xorg-server-0.99.1-r4.ebuild: + Pull old version. + + 23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild: + (#fd.o 3990) Add 0.99.1-r5-check-for-glproto.patch. Pass + --with-xkb-path=/usr/lib/X11/xkb in attempt to get VT switching closer to + working. Update CVS patch to 20050822-1, which makes xprint almost work. + +*xorg-server-0.99.1-r5 (22 Aug 2005) + + 22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/fix-xnest.patch, +xorg-server-0.99.1-r5.ebuild: + Update to CVS as of 20050822. This should make amd64 and sparc work. Update + included mesa to 6.3.2. Stop forcing glx on, it's on by default. Add + --disable-static so we don't build .a files for server modules. Add + fix-xnest.patch to fix breakage in the Xnest linking, caused by the + configure.ac reworking a couple of days ago. + + 21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r4.ebuild: + xprint build is broken; force it off. + + 21 Aug 2005; Luca Barbato <lu_zero@gentoo.org> + xorg-server-0.99.1-r4.ebuild: + Marked ~ppc + + 21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/xorg-composite.patch, -files/xorg-server-fbmmx-local.patch, + -xorg-server-0.99.1.ebuild, -xorg-server-0.99.1-r1.ebuild, + -xorg-server-0.99.1-r2.ebuild, -xorg-server-0.99.1-r3.ebuild: + Drop old versions. + +*xorg-server-0.99.1-r4 (21 Aug 2005) + + 21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.1-r4.ebuild: + Update to today's CVS. This adds a USE flag for xprint. Also, get rid of the + glx USE flag, because everybody should get it. + + 20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild, xorg-server-0.99.1-r1.ebuild, + xorg-server-0.99.1-r2.ebuild, xorg-server-0.99.1-r3.ebuild: + panoramixproto moved to xineramaproto. + + 17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-fbmmx-local.patch, xorg-server-0.99.1-r3.ebuild: + (fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenò + <flameeyes@gentoo.org>. + + 16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Wrap opengl things in `if use glx..` + + 15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> + xorg-server-0.99.1-r3.ebuild: + Marked ~amd64. + + 14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-server-0.99.1-x86_64-1.patch, xorg-server-0.99.1-r3.ebuild: + Add xorg-server-0.99.1-x86_64-1.patch to fix configure.ac on amd64. + + 14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Wrap pkg_postrm() module dir removal in ! has_version. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + No longer necessary to force --enable-composite; it's on by default. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Update opengl-update dependency to 2.2.3 for proper handling of + /usr/libdir/modules/extensions/. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Remove xinerama USE flag; building without it causes major issues. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Add pkg_postrm() to get rid of /usr/lib/xorg/modules. This should make + things work better for people crazy enough to downgrade to monolithic. + +*xorg-server-0.99.1-r3 (12 Aug 2005) + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.1-r3.ebuild: + Set /usr/bin/Xorg suid so it starts. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r2.ebuild: + Fix the patch that mysteriously broke. + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch, + +xorg-server-0.99.1-r2.ebuild: + Re-add, this time with a huge patch on the mirror. + + 12 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> + -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch, + -files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch, + -xorg-server-0.99.1-r2.ebuild: + Removed 0.99.1-r2 version (3.3MB patch is not good). + +*xorg-server-0.99.1-r2 (12 Aug 2005) + + 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch, + +files/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch, + +xorg-server-0.99.1-r2.ebuild: + Add xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch to fix big-endian + breakage, composite, some other stuff. Split out non-composite things from + xorg-composite.patch to check-for-glproto.patch and fix-xf86misc-typo.patch. + + 11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r1.ebuild: + Make an X->Xorg symlink in here until upstream can make one. + + 11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r1.ebuild: + Add more deps: inputproto, bigreqsproto, xcmiscproto. All reported by aaronf0. + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1-r1.ebuild: + Move confopts into pkg_setup(), and therefore also CONFIGURE_OPTIONS. + +*xorg-server-0.99.1-r1 (10 Aug 2005) + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-server-0.99.1-r1.ebuild: + Rev bump to make sure people get working GL setup. + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add GL handling, /usr/lib/opengl, opengl-update, etc. + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add dep on x11-proto/kbproto, again from aaronf0. + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add dep on fontsproto, reported by aaronf0 on irc. + + 09 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild: + (#101883) Add trapproto and panoramixproto as deps. + + 08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> + xorg-server-0.99.1.ebuild: + Add ~sparc keyword (prepare for X Modular testing). + + 08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-0.99.1.ebuild: + (#101749) Add dependencies on videoproto, scrnsaverproto and evieext. + Reported by Georgi Georgiev <chutz@gg3.net>. + +*xorg-server-0.99.1 (08 Aug 2005) + + 08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + +files/xorg-composite.patch, +xorg-server-0.99.1.ebuild: + Initial commit for modular X. + diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest new file mode 100644 index 0000000..664e3d9 --- /dev/null +++ b/x11-base/xorg-server/Manifest @@ -0,0 +1,51 @@ +MD5 aaa75aa89086e496d9725756b1afc201 ChangeLog 17685 +RMD160 e712c8500911bfe730c69c9085201faa6249b472 ChangeLog 17685 +SHA256 bfeb5d9c18c506bf906e85442ffbbffbcb9fd08e3c0f72ff9ab4711a1f1d68ab ChangeLog 17685 +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 911a31da943e7f9e4501079a307db6ab files/aiglx-gl-include-inferiors.patch 1184 +RMD160 d4d92cef47e2f526925710e3d259c562d4e200b6 files/aiglx-gl-include-inferiors.patch 1184 +SHA256 a08a5180c9dbb61f84cf577bc761064ff7fdc2db5b4d7cb42055d5590d410652 files/aiglx-gl-include-inferiors.patch 1184 +MD5 5d7647b1c0b0e09eedb4572142c624df files/aiglx-tfp-damage.patch 4534 +RMD160 6efe82089e0ac7e280bfa7c0feeed5ecf33042f5 files/aiglx-tfp-damage.patch 4534 +SHA256 faa62e2cb5cfafabbaef42d3ecac42d4139684b321b31f597b4d6f3b62fcb1a1 files/aiglx-tfp-damage.patch 4534 +MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r3 771 +RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r3 771 +SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r3 771 +MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-xorg-server-9999 247 +RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-xorg-server-9999 247 +SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/digest-xorg-server-9999 247 +MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414 +RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414 +SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414 +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 +MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 +RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 +SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 +MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-9999-Sbus.patch 2388 +RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-9999-Sbus.patch 2388 +SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-9999-Sbus.patch 2388 +MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598 +RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598 +SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598 +MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 +RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 +SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 +MD5 0e077fb908176f1df385ce959c806553 xorg-server-1.0.2-r3.ebuild 5559 +RMD160 806cb4ac59ca473af68277bf28c5bc6ffe1d6f23 xorg-server-1.0.2-r3.ebuild 5559 +SHA256 4fc5dec306702c6a4199e65389f419aadfcd089695d0b37fc3c87f7cadb3c5cf xorg-server-1.0.2-r3.ebuild 5559 +MD5 117293ecbef2b2dba8bc2e63733c5e83 xorg-server-9999.ebuild 6489 +RMD160 4411d7eac43f38d770b20b7c59fcc82a03f5418f xorg-server-9999.ebuild 6489 +SHA256 a3f1698687e1444f47d637d7e721065ccbb0c2280372bda6123134ed16664569 xorg-server-9999.ebuild 6489 diff --git a/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch b/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch new file mode 100644 index 0000000..dd10673 --- /dev/null +++ b/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch @@ -0,0 +1,55 @@ +Index: xorg/hw/xfree86/utils/xorgconfig/cards.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v +retrieving revision 1.4 +diff -u -b -B -r1.4 cards.c +--- xorg/hw/xfree86/utils/xorgconfig/cards.c 1 Jul 2005 22:43:35 -0000 1.4 ++++ xorg/hw/xfree86/utils/xorgconfig/cards.c 23 Mar 2006 07:42:26 -0000 +@@ -19,7 +19,7 @@ + + /* Some vars to make path names in texts more flexible. */ + #ifndef PROJECTROOT +-# define PROJECTROOT "/usr/X11R6" ++# define PROJECTROOT "/usr" + #endif + #define TREEROOT PROJECTROOT + #define TREEROOTLX TREEROOT "/lib/X11" +Index: xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v +retrieving revision 1.19 +diff -u -b -B -r1.19 xorgconfig.c +--- xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 8 Nov 2005 06:33:30 -0000 1.19 ++++ xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 23 Mar 2006 07:42:28 -0000 +@@ -157,11 +157,12 @@ + * may be more irritated than Unix users + */ + #ifndef PROJECTROOT +-#define PROJECTROOT "/usr/X11R6" ++#define PROJECTROOT "/usr" + #endif + #define TREEROOT PROJECTROOT + #define TREEROOTLX TREEROOT "/lib/X11" + #define TREEROOTCFG TREEROOT "/etc/X11" ++#define TREEROOTSHARE TREEROOT "/share/X11" + #ifdef XDOCDIR + # define TREEROOTDOC XDOCDIR + #else +@@ -495,7 +496,7 @@ + #elif defined(__FreeBSD__) + # define DEF_MOUSEDEV "/dev/sysmouse"; + #else +-# define DEF_MOUSEDEV "/dev/mouse"; ++# define DEF_MOUSEDEV "/dev/input/mice"; + #endif + + #ifndef __UNIXOS2__ +@@ -1970,7 +1971,7 @@ + "# file minus the extension (like \".txt\" or \".db\"). There is normally\n" + "# no need to change the default.\n" + "\n" +-" RgbPath \"" TREEROOTLX "/rgb\"\n" ++"# RgbPath \"" TREEROOTSHARE "/rgb\"\n" + "\n" + "# Multiple FontPath entries are allowed (which are concatenated together),\n" + "# as well as specifying multiple comma-separated entries in one FontPath\n" diff --git a/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch b/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch new file mode 100644 index 0000000..288d79c --- /dev/null +++ b/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch @@ -0,0 +1,95 @@ +Index: xorg/hw/xfree86/utils/xorgcfg/interface.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v +retrieving revision 1.8 +diff -u -b -B -r1.8 interface.c +--- xorg/hw/xfree86/utils/xorgcfg/interface.c 8 Nov 2005 06:33:30 -0000 1.8 ++++ xorg/hw/xfree86/utils/xorgcfg/interface.c 23 Mar 2006 07:42:49 -0000 +@@ -65,7 +65,7 @@ + #ifdef PROJECT_ROOT + #define DefaultXFree86Dir PROJECT_ROOT + #else +-#define DefaultXFree86Dir "/usr/X11R6" ++#define DefaultXFree86Dir "/usr" + #endif + + #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \ +Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v +retrieving revision 1.5 +diff -u -b -B -r1.5 keyboard-cfg.c +--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 8 Nov 2005 06:33:30 -0000 1.5 ++++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 23 Mar 2006 07:42:51 -0000 +@@ -72,7 +72,7 @@ + */ + static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules; + static int num_xkb_desc; +-static char *XkbRulesDir = "lib/X11/xkb/rules/"; ++static char *XkbRulesDir = "share/X11/xkb/rules/"; + #ifdef XFREE98_XKB + static char *XkbRulesFile = "xfree98"; + #else +Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v +retrieving revision 1.3 +diff -u -b -B -r1.3 keyboard-cfg.h +--- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 4 Dec 2004 00:43:11 -0000 1.3 ++++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 23 Mar 2006 07:42:51 -0000 +@@ -38,7 +38,7 @@ + /* + * All file names are from XProjectRoot or XWINHOME environment variable. + */ +-#define XkbConfigDir "lib/X11/xkb/" ++#define XkbConfigDir "share/X11/xkb/" + #define XkbConfigFile "X0-config.keyboard" + + /* +Index: xorg/hw/xfree86/utils/xorgcfg/loader.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v +retrieving revision 1.5 +diff -u -b -B -r1.5 loader.c +--- xorg/hw/xfree86/utils/xorgcfg/loader.c 8 Dec 2005 17:54:40 -0000 1.5 ++++ xorg/hw/xfree86/utils/xorgcfg/loader.c 23 Mar 2006 07:42:51 -0000 +@@ -55,7 +55,7 @@ + #include <stdarg.h> + + #ifndef OPTIONSPATH +-#define OPTIONSPATH "/usr/X11R6/lib/X11" ++#define OPTIONSPATH "/usr/lib/X11" + #endif + + #ifndef SIGNALRETURNSINT +Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v +retrieving revision 1.6 +diff -u -b -B -r1.6 text-mode.c +--- xorg/hw/xfree86/utils/xorgcfg/text-mode.c 8 Dec 2005 17:54:40 -0000 1.6 ++++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c 23 Mar 2006 07:42:55 -0000 +@@ -52,12 +52,12 @@ + (strcmp((X), "keyboard") == 0)) + + #ifndef PROJECT_ROOT +-#define PROJECT_ROOT "/usr/X11R6" ++#define PROJECT_ROOT "/usr" + #endif + + #ifndef XKB_RULES_DIR + #ifndef __UNIXOS2__ +-#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules" ++#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules" + #else + #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules" + #endif +@@ -558,7 +558,7 @@ + #elif defined(__UNIXOS2__) + str = "mouse$"; + #else +- str = "/dev/mouse"; ++ str = "/dev/input/mice"; + #endif + + ClearScreen(); diff --git a/x11-base/xorg-server/files/CVS/Entries b/x11-base/xorg-server/files/CVS/Entries new file mode 100644 index 0000000..39f5829 --- /dev/null +++ b/x11-base/xorg-server/files/CVS/Entries @@ -0,0 +1,7 @@ +/xorg-server-1.0.1-amd64-fix-for-glx.patch/1.1/Mon Feb 13 05:29:01 2006// +/xorg-server-1.0.1-Sbus.patch/1.1/Mon Feb 13 05:29:01 2006// +/xorg-server-1.0.1-backtrace.patch/1.1/Mon Feb 13 05:29:01 2006// +/digest-xorg-server-1.0.1-r4/1.1/Sun Feb 19 03:55:47 2006// +/xorg-server-1.0.1-64bit-fix-have-dix-config.patch/1.1/Sun Feb 19 03:56:07 2006// +/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch/1.1/Sun Feb 19 03:56:07 2006// +D diff --git a/x11-base/xorg-server/files/CVS/Repository b/x11-base/xorg-server/files/CVS/Repository new file mode 100644 index 0000000..9b39241 --- /dev/null +++ b/x11-base/xorg-server/files/CVS/Repository @@ -0,0 +1 @@ +gentoo-x86/x11-base/xorg-server/files diff --git a/x11-base/xorg-server/files/CVS/Root b/x11-base/xorg-server/files/CVS/Root new file mode 100644 index 0000000..c108e17 --- /dev/null +++ b/x11-base/xorg-server/files/CVS/Root @@ -0,0 +1 @@ +spyderous@cvs.gentoo.org:/var/cvsroot diff --git a/x11-base/xorg-server/files/aiglx-gl-include-inferiors.patch b/x11-base/xorg-server/files/aiglx-gl-include-inferiors.patch new file mode 100644 index 0000000..9fc3f0d --- /dev/null +++ b/x11-base/xorg-server/files/aiglx-gl-include-inferiors.patch @@ -0,0 +1,32 @@ +Index: hw/xfree86/dri/dri.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dri/dri.c,v +retrieving revision 1.19.2.1 +diff -u -p -r1.19.2.1 dri.c +--- hw/xfree86/dri/dri.c 24 Feb 2006 05:49:33 -0000 1.19.2.1 ++++ hw/xfree86/dri/dri.c 5 Mar 2006 18:59:55 -0000 +@@ -1132,6 +1132,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen, + { + DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); + DRIDrawablePrivPtr pDRIDrawablePriv, pOldDrawPriv; ++ RegionPtr pClipList; + WindowPtr pWin, pOldWin; + int i; + +@@ -1223,8 +1224,14 @@ DRIGetDrawableInfo(ScreenPtr pScreen, + #endif + *W = (int)(pWin->drawable.width); + *H = (int)(pWin->drawable.height); +- *numClipRects = REGION_NUM_RECTS(&pWin->clipList); +- *pClipRects = (drm_clip_rect_t *)REGION_RECTS(&pWin->clipList); ++ ++ if (1) /* glIncludeInferiors */ ++ pClipList = &pWin->borderClip; ++ else ++ pClipList = &pWin->clipList; ++ ++ *numClipRects = REGION_NUM_RECTS(pClipList); ++ *pClipRects = (drm_clip_rect_t *)REGION_RECTS(pClipList); + + if (!*numClipRects && pDRIPriv->fullscreen) { + /* use fake full-screen clip rect */ diff --git a/x11-base/xorg-server/files/aiglx-tfp-damage.patch b/x11-base/xorg-server/files/aiglx-tfp-damage.patch new file mode 100644 index 0000000..0ae7dc7 --- /dev/null +++ b/x11-base/xorg-server/files/aiglx-tfp-damage.patch @@ -0,0 +1,144 @@ +? GL/glx/glxinterface.h +? doc/Xserver.1x +Index: GL/glx/glxcmds.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxcmds.c,v +retrieving revision 1.10.2.5 +diff -u -p -r1.10.2.5 glxcmds.c +--- GL/glx/glxcmds.c 6 Mar 2006 00:11:40 -0000 1.10.2.5 ++++ GL/glx/glxcmds.c 6 Mar 2006 00:38:37 -0000 +@@ -1245,6 +1245,7 @@ int DoCreateGLXPixmap(__GLXclientState * + pGlxPixmap->pGlxScreen = pGlxScreen; + pGlxPixmap->pScreen = pScreen; + pGlxPixmap->idExists = True; ++ pGlxPixmap->pDamage = NULL; + pGlxPixmap->refcnt = 0; + + pGlxPixmap->modes = modes; +Index: GL/glx/glxdrawable.h +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxdrawable.h,v +retrieving revision 1.4.10.1 +diff -u -p -r1.4.10.1 glxdrawable.h +--- GL/glx/glxdrawable.h 24 Feb 2006 05:49:33 -0000 1.4.10.1 ++++ GL/glx/glxdrawable.h 6 Mar 2006 00:38:37 -0000 +@@ -41,6 +41,8 @@ + ** + */ + ++#include <damage.h> ++ + typedef struct { + + DrawablePtr pDraw; +@@ -49,7 +51,7 @@ typedef struct { + ScreenPtr pScreen; + Bool idExists; + int refcnt; +- ++ DamagePtr pDamage; + } __GLXpixmap; + + struct __GLXdrawable { +Index: GL/glx/glxdri.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/GL/glx/Attic/glxdri.c,v +retrieving revision 1.1.2.11 +diff -u -p -r1.1.2.11 glxdri.c +--- GL/glx/glxdri.c 6 Mar 2006 00:11:40 -0000 1.1.2.11 ++++ GL/glx/glxdri.c 6 Mar 2006 00:38:37 -0000 +@@ -334,13 +334,36 @@ __glXDRIbindTexImage(__GLXcontext *baseC + int buffer, + __GLXpixmap *glxPixmap) + { ++ RegionPtr pRegion; + PixmapPtr pixmap; +- int bpp; +- Bool npot; ++ int bpp, xoff, yoff, width, height; ++ GLenum target, format, type; + + pixmap = (PixmapPtr) glxPixmap->pDraw; +- bpp = pixmap->drawable.depth >= 24 ? 4 : 2; /* XXX 24bpp packed, 8, etc */ +- ++ if (!glxPixmap->pDamage) { ++ glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone, ++ TRUE, glxPixmap->pScreen, NULL); ++ if (!glxPixmap->pDamage) ++ return BadAlloc; ++ ++ DamageRegister ((DrawablePtr) pixmap, glxPixmap->pDamage); ++ } else { ++ pRegion = DamageRegion(glxPixmap->pDamage); ++ if (REGION_NIL(pRegion)) ++ return Success; ++ } ++ ++ /* XXX 24bpp packed, 8, etc */ ++ if (pixmap->drawable.depth >= 24) { ++ bpp = 4; ++ format = GL_BGRA; ++ type = GL_UNSIGNED_BYTE; ++ } else { ++ bpp = 2; ++ format = GL_RGB; ++ type = GL_UNSIGNED_SHORT_5_6_5; ++ } ++ + CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, + pixmap->devKind / bpp) ); + CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, +@@ -351,22 +374,27 @@ __glXDRIbindTexImage(__GLXcontext *baseC + if (pixmap->drawable.depth == 24) + glxFillAlphaChannel(pixmap); + +- npot = !(glxCountBits(pixmap->drawable.width) == 1 && +- glxCountBits(pixmap->drawable.height) == 1) /* || +- strstr(CALL_GetString(GL_EXTENSIONS, +- "GL_ARB_texture_non_power_of_two")) */ ; +- ++ if (!(glxCountBits(pixmap->drawable.width) == 1 && ++ glxCountBits(pixmap->drawable.height) == 1) ++ /* || strstr(CALL_GetString(GL_EXTENSIONS, ++ "GL_ARB_texture_non_power_of_two")) */) ++ target = GL_TEXTURE_RECTANGLE_ARB; ++ else ++ target = GL_TEXTURE_2D; ++ + CALL_TexImage2D( GET_DISPATCH(), +- ( npot ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D, ++ ( target, + 0, + bpp == 4 ? 4 : 3, + pixmap->drawable.width, + pixmap->drawable.height, + 0, +- bpp == 4 ? GL_BGRA : GL_RGB, +- bpp == 4 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5, ++ format, ++ type, + pixmap->devPrivate.ptr ) ); + ++ DamageEmpty(glxPixmap->pDamage); ++ + return Success; + } + +Index: GL/glx/glxext.c +=================================================================== +RCS file: /cvs/xorg/xserver/xorg/GL/glx/glxext.c,v +retrieving revision 1.6.10.3 +diff -u -p -r1.6.10.3 glxext.c +--- GL/glx/glxext.c 6 Mar 2006 00:11:40 -0000 1.6.10.3 ++++ GL/glx/glxext.c 6 Mar 2006 00:38:37 -0000 +@@ -140,6 +140,10 @@ static int PixmapGone(__GLXpixmap *pGlxP + + pGlxPixmap->idExists = False; + if (!pGlxPixmap->refcnt) { ++ if (pGlxPixmap->pDamage) { ++ DamageUnregister (pGlxPixmap->pDraw, pGlxPixmap->pDamage); ++ DamageDestroy(pGlxPixmap->pDamage); ++ } + /* + ** The DestroyPixmap routine should decrement the refcount and free + ** only if it's zero. diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3 new file mode 100644 index 0000000..b2e8218 --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r3 @@ -0,0 +1,9 @@ +MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388 +RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388 +SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388 +MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009 +RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009 +SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009 +MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486 +RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486 +SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486 diff --git a/x11-base/xorg-server/files/digest-xorg-server-9999 b/x11-base/xorg-server/files/digest-xorg-server-9999 new file mode 100644 index 0000000..13d7ad4 --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-9999 @@ -0,0 +1,3 @@ +MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009 +RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009 +SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009 diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch new file mode 100644 index 0000000..23aa89a --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.2-64bit-fix-for-glx.patch @@ -0,0 +1,12 @@ +--- ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c 2005-11-30 02:02:16.000000000 +0300 ++++ ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c 2006-02-07 10:38:46.000000000 +0300 +@@ -39,6 +39,9 @@ + # include "imports.h" + # define __glXMemset memset + #else ++# if defined (HAVE_DIX_CONFIG_H) ++# include <dix-config.h> ++# endif + # include <X11/X.h> + # include <GL/glx.h> + # include "GL/glxint.h" 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 0000000..55177bc --- /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 0000000..4c1291b --- /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/files/xorg-server-1.0.2-Sbus.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch new file mode 100644 index 0000000..f9b8e7b --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch @@ -0,0 +1,73 @@ +--- hw/xfree86/os-support/bus/xf86Sbus.h- 2005-12-19 19:30:39.000000000 +0000 ++++ hw/xfree86/os-support/bus/xf86Sbus.h 2005-12-19 19:30:39.000000000 +0000 +@@ -0,0 +1,70 @@ ++/* ++ * Platform specific SBUS and OpenPROM access declarations. ++ * ++ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com) ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER ++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ ++ ++#ifdef HAVE_XORG_CONFIG_H ++#include <xorg-config.h> ++#endif ++ ++#ifndef _XF86_SBUS_H ++#define _XF86_SBUS_H ++ ++#if defined(linux) ++#include <asm/types.h> ++#include <linux/fb.h> ++#include <asm/fbio.h> ++#include <asm/openpromio.h> ++#elif defined(SVR4) ++#include <sys/fbio.h> ++#include <sys/openpromio.h> ++#elif defined(__OpenBSD__) && defined(__sparc64__) ++/* XXX */ ++#elif defined(CSRG_BASED) ++#if defined(__FreeBSD__) ++#include <sys/types.h> ++#include <sys/fbio.h> ++#include <dev/ofw/openpromio.h> ++#else ++#include <machine/fbio.h> ++#endif ++#else ++#include <sun/fbio.h> ++#endif ++ ++#ifndef FBTYPE_SUNGP3 ++#define FBTYPE_SUNGP3 -1 ++#endif ++#ifndef FBTYPE_MDICOLOR ++#define FBTYPE_MDICOLOR -1 ++#endif ++#ifndef FBTYPE_SUNLEO ++#define FBTYPE_SUNLEO -1 ++#endif ++#ifndef FBTYPE_TCXCOLOR ++#define FBTYPE_TCXCOLOR -1 ++#endif ++#ifndef FBTYPE_CREATOR ++#define FBTYPE_CREATOR -1 ++#endif ++ ++#endif /* _XF86_SBUS_H */ diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch new file mode 100644 index 0000000..13a66d4 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch @@ -0,0 +1,16 @@ +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.4 +retrieving revision 1.5 +diff -u -r1.4 -r1.5 +--- xorg.orig/xserver/xorg/cfb/cfbrrop.h 2005/07/03 07:01:15 1.4 ++++ xorg/xserver/xorg/cfb/cfbrrop.h 2006/03/20 18:43:18 1.5 +@@ -284,6 +284,7 @@ + #define RROP_UNROLL_CASE4(p,i) RROP_UNROLL_CASE2(p,(i)+2) RROP_UNROLL_CASE2(p,i) + #define RROP_UNROLL_CASE8(p,i) RROP_UNROLL_CASE4(p,(i)+4) RROP_UNROLL_CASE4(p,i) + #define RROP_UNROLL_CASE16(p,i) RROP_UNROLL_CASE8(p,(i)+8) RROP_UNROLL_CASE8(p,i) ++#define RROP_UNROLL_CASE32(p,i) RROP_UNROLL_CASE16(p,(i)+16) RROP_UNROLL_CASE16(p,i) + #define RROP_UNROLL_CASE3(p) RROP_UNROLL_CASE2(p,2) RROP_UNROLL_CASE1(p,1) + #define RROP_UNROLL_CASE7(p) RROP_UNROLL_CASE4(p,4) RROP_UNROLL_CASE3(p) + #define RROP_UNROLL_CASE15(p) RROP_UNROLL_CASE8(p,8) RROP_UNROLL_CASE7(p) diff --git a/x11-base/xorg-server/files/xorg-server-9999-Sbus.patch b/x11-base/xorg-server/files/xorg-server-9999-Sbus.patch new file mode 100644 index 0000000..f9b8e7b --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-9999-Sbus.patch @@ -0,0 +1,73 @@ +--- hw/xfree86/os-support/bus/xf86Sbus.h- 2005-12-19 19:30:39.000000000 +0000 ++++ hw/xfree86/os-support/bus/xf86Sbus.h 2005-12-19 19:30:39.000000000 +0000 +@@ -0,0 +1,70 @@ ++/* ++ * Platform specific SBUS and OpenPROM access declarations. ++ * ++ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com) ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER ++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ ++ ++#ifdef HAVE_XORG_CONFIG_H ++#include <xorg-config.h> ++#endif ++ ++#ifndef _XF86_SBUS_H ++#define _XF86_SBUS_H ++ ++#if defined(linux) ++#include <asm/types.h> ++#include <linux/fb.h> ++#include <asm/fbio.h> ++#include <asm/openpromio.h> ++#elif defined(SVR4) ++#include <sys/fbio.h> ++#include <sys/openpromio.h> ++#elif defined(__OpenBSD__) && defined(__sparc64__) ++/* XXX */ ++#elif defined(CSRG_BASED) ++#if defined(__FreeBSD__) ++#include <sys/types.h> ++#include <sys/fbio.h> ++#include <dev/ofw/openpromio.h> ++#else ++#include <machine/fbio.h> ++#endif ++#else ++#include <sun/fbio.h> ++#endif ++ ++#ifndef FBTYPE_SUNGP3 ++#define FBTYPE_SUNGP3 -1 ++#endif ++#ifndef FBTYPE_MDICOLOR ++#define FBTYPE_MDICOLOR -1 ++#endif ++#ifndef FBTYPE_SUNLEO ++#define FBTYPE_SUNLEO -1 ++#endif ++#ifndef FBTYPE_TCXCOLOR ++#define FBTYPE_TCXCOLOR -1 ++#endif ++#ifndef FBTYPE_CREATOR ++#define FBTYPE_CREATOR -1 ++#endif ++ ++#endif /* _XF86_SBUS_H */ diff --git a/x11-base/xorg-server/files/xprint.init b/x11-base/xorg-server/files/xprint.init new file mode 100644 index 0000000..e5fed1b --- /dev/null +++ b/x11-base/xorg-server/files/xprint.init @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $ + +opts="${opts} get_xpserverlist lsprinters" + +depend() { + use cupsd +} + +start() { + ebegin "Starting xprint" + /usr/lib/misc/xprint start > /dev/null + eend $? +} + +get_xpserverlist() { + /usr/lib/misc/xprint get_xpserverlist +} + +lsprinters() { + /usr/lib/misc/xprint lsprinters +} + +stop() { + ebegin "Stopping xprint" + /usr/lib/misc/xprint stop > /dev/null + eend $? +} diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml new file mode 100644 index 0000000..01c4c00 --- /dev/null +++ b/x11-base/xorg-server/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>x11</herd> +</pkgmetadata> diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild new file mode 100644 index 0000000..672e988 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.0.2-r3.ebuild @@ -0,0 +1,191 @@ +# 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-r3.ebuild,v 1.3 2006/04/14 16:04:12 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +# Hack to make sure autoreconf gets run +#SNAPSHOT="yes" + +inherit flag-o-matic x-modular multilib + +OPENGL_DIR="xorg-x11" + +MESA_PN="Mesa" +MESA_PV="6.4.2" +MESA_P="${MESA_PN}-${MESA_PV}" +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}/${P}-64bit-fix-for-glx.patch + ${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch + ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch + ${DISTDIR}/${PV}-overlay-window.patch.bz2" + +SRC_URI="${SRC_URI} + mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 + http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2" +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="dri ipv6 minimal xprint" +RDEPEND="x11-libs/libXfont + x11-libs/xtrans + x11-libs/libXau + x11-libs/libXext + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXi + media-libs/freetype + media-libs/mesa + media-fonts/font-adobe-75dpi + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + x11-misc/xbitmaps + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/iceauth + x11-apps/rgb + x11-apps/xauth + x11-apps/xinit + app-admin/eselect-opengl + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXxf86misc + x11-libs/libXxf86vm + !minimal? ( x11-libs/libdmx + x11-libs/libXtst + x11-libs/libXres ) + x11-libs/libxkbui + x11-libs/liblbxutil" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent + # liblbxutil is lbx- dependent +DEPEND="${RDEPEND} + x11-proto/randrproto + x11-proto/renderproto + >=x11-proto/fixesproto-4 + x11-proto/damageproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86rushproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/compositeproto-0.3 + x11-proto/recordproto + x11-proto/resourceproto + x11-proto/videoproto + x11-proto/scrnsaverproto + x11-proto/evieext + x11-proto/trapproto + >=x11-proto/xineramaproto-1.1-r1 + x11-proto/fontsproto + >=x11-proto/kbproto-1.0-r1 + x11-proto/inputproto + x11-proto/bigreqsproto + x11-proto/xcmiscproto + >=x11-proto/glproto-1.4.1_pre20051013 + !minimal? ( x11-proto/dmxproto ) + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 ) + xprint? ( x11-proto/printproto + x11-apps/mkfontdir + x11-apps/mkfontscale )" +LICENSE="${LICENSE} MIT" + +pkg_setup() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + + # --enable-xorg needed because darwin defaults off + # --enable-install-setuid needed because sparcs default off + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable !minimal dmx) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable dri) + $(use_enable xprint) + --with-mesa-source=${WORKDIR}/${MESA_P} + --enable-xorg + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1" + + # (#121394) Causes window corruption + filter-flags -fweb +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + use xprint && xprint_src_install +} + +pkg_postinst() { + switch_opengl_implem +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then + rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + fi + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +xprint_src_install() { + # RH-style init script, we provide a wrapper + exeinto /usr/$(get_libdir)/misc + # Actually a shell script, someone messed up + newexe ${S}/Xprint/etc/init.d/xprint.cpp xprint + sed -e 's/XCOMM/#/' -i ${D}/usr/$(get_libdir)/misc/xprint + # Install the wrapper + newinitd ${FILESDIR}/xprint.init xprint + # Install profile scripts + insinto /etc/profile.d + doins ${S}/Xprint/etc/profile.d/xprint* + insinto /etc/X11/xinit/xinitrc.d + newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \ + 92xprint-xpserverlist.sh + # Patch profile scripts + sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ + get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ + ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh + # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo + dodoc ${D}/etc/profile.d/xprint* + rm -f ${D}/etc/profile.d/xprint* +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild new file mode 100644 index 0000000..6592a09 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -0,0 +1,258 @@ +# 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.1-r4.ebuild,v 1.1 2006/02/19 03:54:56 spyderous Exp $ + +# Must be before x-modular eclass is inherited +# Hack to make sure autoreconf gets run +SNAPSHOT="yes" + +inherit x-modular multilib cvs + +ECVS_SERVER="anoncvs.freedesktop.org:/cvs/xorg" +ECVS_MODULE="xserver/xorg" +S=${WORKDIR}/${ECVS_MODULE} +SRC_URI="" + +OPENGL_DIR="xorg-x11" + +MESA_PN="Mesa" +MESA_P="${MESA_PN}" + +PATCHES="${FILESDIR}/${P}-Sbus.patch + ${FILESDIR}/aiglx-gl-include-inferiors.patch + ${FILESDIR}/aiglx-tfp-damage.patch" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~ppc ~sparc ~x86" + +IUSE_VIDEO_CARDS=" + video_cards_chips + video_cards_epson + video_cards_fbdev + video_cards_glint + video_cards_i810 + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_nv + video_cards_r128 + video_cards_radeon + video_cards_siliconmotion + video_cards_vesa + video_cards_via" +IUSE="${IUSE_VIDEO_CARDS} + dmx dri ipv6 kdrive minimal nptl sdl xprint" +RDEPEND="x11-libs/libXfont + x11-libs/xtrans + x11-libs/libXau + x11-libs/libXext + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXi + media-libs/freetype + >=media-libs/mesa-6 + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + x11-misc/xbitmaps + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/iceauth + x11-apps/rgb + x11-apps/xauth + x11-apps/xinit + app-admin/eselect-opengl + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXxf86misc + x11-libs/libXxf86vm + !minimal? ( x11-libs/libdmx + x11-libs/libXtst + x11-libs/libXres ) + x11-libs/libxkbui + x11-libs/liblbxutil + kdrive? ( sdl? ( media-libs/libsdl ) )" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent + # liblbxutil is lbx- dependent +DEPEND="${RDEPEND} + x11-proto/randrproto + x11-proto/renderproto + x11-proto/fixesproto + x11-proto/damageproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86rushproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + x11-proto/compositeproto + x11-proto/recordproto + x11-proto/resourceproto + x11-proto/videoproto + >=x11-proto/scrnsaverproto-1.1.0 + x11-proto/evieext + x11-proto/trapproto + >=x11-proto/xineramaproto-1.1-r1 + x11-proto/fontsproto + >=x11-proto/kbproto-1.0-r1 + x11-proto/inputproto + x11-proto/bigreqsproto + x11-proto/xcmiscproto + >=x11-proto/glproto-1.4.6 + !minimal? ( x11-proto/dmxproto ) + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 ) + xprint? ( x11-proto/printproto + x11-apps/mkfontdir + x11-apps/mkfontscale )" +LICENSE="${LICENSE} MIT" + +pkg_setup() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + + # --enable-xorg needed because darwin defaults off + # --enable-install-setuid needed because sparcs default off + + # USE=minimal should set it up so no server builds except for the desired + # one. In other words: + # If USE=minimal + USE=(dmx|kdrive|xprint), then don't build the Xorg server + XORG="yes" + if use minimal; then + if use dmx || use kdrive || use xprint; then + XORG="no" + fi + fi + + if [[ "${XORG}" = "yes" ]]; then + conf_opts="${conf_opts} + --enable-xorg + --with-mesa-source=${WORKDIR}/${MESA_P}" + else + conf_opts="${conf_opts} --disable-xorg" + fi + + # SDL only available in kdrive build + if use kdrive && use sdl; then + conf_opts="${conf_opts} --enable-xsdl" + else + conf_opts="${conf_opts} --disable-xsdl" + fi + + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable dri) + $(use_enable xprint) + $(use_enable nptl glx-tls) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 + ${conf_opts}" + + if built_with_use media-libs/mesa nptl; then + local diemsg="You must build xorg-server and mesa with the same nptl USE setting." + use nptl || die "${diemsg}" + else + use nptl && die "${diemsg}" + fi + + # (#121394) Causes window corruption + filter-flags -fweb + + # Nothing else provides new enough glxtokens.h + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set --impl-headers ${OPENGL_DIR} +} + +src_unpack() { + # Don't patch before everything's ready + PATCHES="" mesa_cvs_src_unpack + cvs_src_unpack + + # Set up kdrive servers to build + if use kdrive; then + for card in ${IUSE_VIDEO_CARDS}; do + real_card=${card/glint/pm2} + real_card=${real_card/radeon/ati} + real_card=${real_card/nv/nvidia} + real_card=${real_card/siliconmotion/smi} + if ! use ${card}; then + sed -i \ + -e "s:${real_card}::g" \ + ${S}/hw/kdrive/Makefile.am + fi + done + fi + + x-modular_reconf_source +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + server_based_install +} + +pkg_postinst() { + switch_opengl_implem +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then + rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + fi + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +server_based_install() { + if [[ "${XORG}" != "yes" ]]; then + rm ${D}/usr/share/man/man1/Xserver.1x \ + ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ + ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + ${D}/usr/share/man/man1/Xserver.1x + fi +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo +# eselect opengl set --use-old ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} +} + +mesa_cvs_src_unpack() { + local ECVS_SERVER="pdx.freedesktop.org:/cvs/mesa" + local ECVS_MODULE="Mesa" + cvs_src_unpack +} |