diff options
Diffstat (limited to 'x11-base')
32 files changed, 7111 insertions, 0 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog new file mode 100644 index 00000000..3fee7d06 --- /dev/null +++ b/x11-base/xorg-server/ChangeLog @@ -0,0 +1,2958 @@ +# ChangeLog for x11-base/xorg-server +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.527 2010/09/05 11:59:11 remi Exp $ + + 05 Sep 2010; Rémi Cardona <remi@gentoo.org> xorg-server-1.7.6.ebuild, + xorg-server-1.7.7-r1.ebuild, xorg-server-1.8.2.ebuild: + add missing libXv dep, fixes bug #335025 + + 11 Aug 2010; Markus Meier <maekke@gentoo.org> xorg-server-1.7.7-r1.ebuild: + arm stable, bug #330593 + + 06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> + xorg-server-1.7.7-r1.ebuild: + Stable on amd64 wrt bug #330593 + + 06 Aug 2010; Christian Faulhammer <fauli@gentoo.org> + xorg-server-1.7.7-r1.ebuild: + stable x86, bug 330593 + + 02 Aug 2010; Raúl Porcel <armin76@gentoo.org> xorg-server-1.7.6.ebuild: + alpha/ia64/sh/sparc stable wrt #308521 + + 31 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xorg-server-1.7.7-r1.ebuild: + Add patch to prefer nouveau over nv to 1.7.7 too + +*xorg-server-1.7.7-r1 (31 Jul 2010) + + 31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.7.ebuild, +xorg-server-1.7.7-r1.ebuild: + Add patches from nominations branch. So we can open stablerequest for + 1.7.7-r1. + + 22 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.8.0.ebuild, -xorg-server-1.8.1.901.ebuild, + -xorg-server-1.8.1.902.ebuild: + Drop older 1.8 series ebuilds. + +*xorg-server-1.8.2 (21 Jul 2010) + + 21 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +xorg-server-1.8.2.ebuild, +files/xorg-server-1.8-nouveau-default.patch: + Modify autoconfiguration to prefer nouveau over nv. + +*xorg-server-1.8.1.902 (26 Jun 2010) + + 26 Jun 2010; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.8.1.902.ebuild: + bump to 1.8.1.902 + + 18 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.8.1.901.ebuild: + No need to block dtrace anymore. Does not fail if it is around today. + + 10 Jun 2010; Rémi Cardona <remi@gentoo.org> xorg-server-1.8.1.901.ebuild: + add missing eselect-opengl call, fixes bug #321443 + +*xorg-server-1.8.1.901 (09 Jun 2010) + + 09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.8.1-r1.ebuild, +xorg-server-1.8.1.901.ebuild, + -files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF + .patch: + Version bump. Drop old. + + 31 May 2010; Guy Martin <gmsoft@gentoo.org> xorg-server-1.7.6.ebuild: + hppa stable, #308521 + + 20 May 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xorg-server-1.8.1-r1.ebuild: + Depend on >=app-doc/doxygen-1.6.1 for building documentation. + +*xorg-server-1.8.1-r1 (19 May 2010) + + 19 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.8.1.ebuild, +xorg-server-1.8.1-r1.ebuild: + Apply fixes per bug #320475. Thx to Andrew Brouwers for testing. + +*xorg-server-1.8.1 (15 May 2010) + + 15 May 2010; Rémi Cardona <remi@gentoo.org> +xorg-server-1.8.1.ebuild: + bump to 1.8.1, first swing at bug #315347 (based on an idea by Michał + Górny) + + 12 May 2010; Brent Baude <ranger@gentoo.org> xorg-server-1.7.6.ebuild: + Marking xorg-server-1.7.6 ppc64 stable for bug 308521 + + 04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.7.7.ebuild: + Drop already upstreamed patch. + +*xorg-server-1.7.7 (04 May 2010) + + 04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.7.7.ebuild: + Version bump. + + 18 Apr 2010; Markus Meier <maekke@gentoo.org> xorg-server-1.7.6.ebuild: + arm stable, bug #308521 + + 18 Apr 2010; <nixnut@gentoo.org> xorg-server-1.7.6.ebuild: + ppc stable #308521 + + 18 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -files/1.4-fix-kdrive-automake.patch, -xorg-server-1.5.3-r6.ebuild, + -files/1.4-fpic-libxf86config.patch: + Drop xorg-server 1.5 series + + 16 Apr 2010; Pacho Ramos <pacho@gentoo.org> xorg-server-1.7.6.ebuild: + amd64 stable, bug 308521 + + 13 Apr 2010; Lars Wendler <polynomial-c@gentoo.org> + xorg-server-1.8.0.ebuild: + fixing version on xinit blocker (D'oh) + + 13 Apr 2010; Lars Wendler <polynomial-c@gentoo.org> + xorg-server-1.8.0.ebuild: + Adding blocker for <x11-apps/xinit-1.2.1 + Permission granted by scarabeus. + + 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.8.0.ebuild: + Actualy use correct variable. + + 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.8.0.ebuild: + Silence sandbox. Thanks to Brian (ferringb) for help. + + 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.8.0.ebuild: + Remove never triggered sdl dependency. + +*xorg-server-1.8.0 (13 Apr 2010) + + 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +files/1.8.0-match-only-sane-devices.patch, +xorg-server-1.8.0.ebuild, + +files/1.8.0-no-hardcoded-etc.patch, +files/xdm-setup.initd-1, + +files/xdm.confd-3, +files/xdm.initd, + +files/xorg-server-disable-acpi.patch, metadata.xml: + Version bump to xorg-server 1.8. + + 11 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xorg-server-1.7.6.ebuild: + warn user about gcc-3 incompatibility, bug #314615 + + 09 Apr 2010; Christian Faulhammer <fauli@gentoo.org> + xorg-server-1.7.6.ebuild: + stable x86, bug 308521 + + 09 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.5.3-r6.ebuild, xorg-server-1.6.5-r1.ebuild, + xorg-server-1.7.6.ebuild: + Depend on old xinit which ships the init.d and conf.d files. + +*xorg-server-1.7.6 (17 Mar 2010) + + 17 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.5.ebuild, -xorg-server-1.7.5.901.ebuild, + -xorg-server-1.7.5.902.ebuild, -xorg-server-1.7.5.902-r1.ebuild, + +xorg-server-1.7.6.ebuild: + Version bump to 1.7.6. Drop old 1.7 releases. + +*xorg-server-1.7.5.902-r1 (16 Mar 2010) + + 16 Mar 2010; Rémi Cardona <remi@gentoo.org> + +files/1.7.5.902-fix-tslib-1.0-check.patch, -files/tslib-1.0-check.patch, + +xorg-server-1.7.5.902-r1.ebuild: + really fix tslib support, fixes bug #304067 + + 16 Mar 2010; <solar@gentoo.org> xorg-server-1.7.5.902.ebuild: + comment out tslib patch for a few hours. We ended up making it non + optional + + 16 Mar 2010; <solar@gentoo.org> +files/tslib-1.0-check.patch, + xorg-server-1.7.5.902.ebuild: + tslib changed the tslib-0.0.pc to tslib.pc; We check for both. Bug #304067 + +*xorg-server-1.7.5.902 (15 Mar 2010) + + 15 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +xorg-server-1.7.5.902.ebuild: + version bump + +*xorg-server-1.7.5.901 (07 Mar 2010) + + 07 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +xorg-server-1.7.5.901.ebuild: + version bump + +*xorg-server-1.7.5 (16 Feb 2010) + + 16 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.4.ebuild, -xorg-server-1.7.4.902.ebuild, + +xorg-server-1.7.5.ebuild: + Version bump to new release. Drop older. + +*xorg-server-1.7.4.902 (15 Feb 2010) + + 15 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.4.901.ebuild, +xorg-server-1.7.4.902.ebuild: + Add new xorg-server 1.7.5 RC. + +*xorg-server-1.7.4.901 (30 Jan 2010) + + 30 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.7.4.901.ebuild: + Version bump. + + 23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.6.3.901-r2.ebuild: + rm + + 18 Jan 2010; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.6.5-r1.ebuild: + alpha/ia64/sh/sparc stable wrt #294958 + + 14 Jan 2010; Markus Meier <maekke@gentoo.org> xorg-server-1.6.5-r1.ebuild: + arm stable, bug #294958 + + 14 Jan 2010; Jeroen Roovers <jer@gentoo.org> xorg-server-1.6.5-r1.ebuild: + Stable for HPPA (bug #294958). + +*xorg-server-1.7.4 (10 Jan 2010) + + 10 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.3.901-r1.ebuild, -xorg-server-1.7.3.902.ebuild, + +xorg-server-1.7.4.ebuild: + Version bump. Drop older. + +*xorg-server-1.7.3.902 (27 Dec 2009) + + 27 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.7.3.902.ebuild: + Version bump. + + 27 Dec 2009; Joseph Jezak <josejx@gentoo.org> xorg-server-1.6.5-r1.ebuild: + Marked ppc stable for bug #294958. + + 26 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.7.3.901-r1.ebuild: + Depend correctly on mesa again. + + 24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.3.ebuild, -xorg-server-1.7.3.901.ebuild, + xorg-server-1.7.3.901-r1.ebuild: + Pdepend on mesa instead of rdepend. Drop older versions. + +*xorg-server-1.7.3.901-r1 (16 Dec 2009) + + 16 Dec 2009; Jim Ramsay <lack@gentoo.org> + +xorg-server-1.7.3.901-r1.ebuild, + +files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th + .patch: + Upstream patch fixes bug #296514 + + 15 Dec 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.6.5-r1.ebuild: + Marking xorg-server-1.6.5-r1 ppc64 stable for bug 294958 + + 15 Dec 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.6.3.901-r2.ebuild: + alpha/ia64/sh/sparc stable wrt #282290 + + 13 Dec 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r6.ebuild: + clean up blockers + +*xorg-server-1.7.3.901 (13 Dec 2009) + + 13 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.7.3.901.ebuild: + Add new rc. + + 13 Dec 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r6.ebuild: + drop unused VIDEO_CARDS + + 11 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.5.3-r7.ebuild, -xorg-server-1.6.5.ebuild, + -xorg-server-1.7.1.ebuild: + Drop no-longer required ebuild. + + 10 Dec 2009; Christian Faulhammer <fauli@gentoo.org> + xorg-server-1.6.5-r1.ebuild: + x86 stable, bug 294958 + + 10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> + xorg-server-1.6.5-r1.ebuild: + amd64 stable wrt #294958 + + 06 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.2.ebuild: + Drop broken release. + +*xorg-server-1.7.3 (03 Dec 2009) + + 03 Dec 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.7.3.ebuild: + bump to 1.7.3 + + 28 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.5.3-r6.ebuild, xorg-server-1.5.3-r7.ebuild, + xorg-server-1.6.3.901-r2.ebuild, xorg-server-1.6.5.ebuild, + xorg-server-1.6.5-r1.ebuild, xorg-server-1.7.1.ebuild, + xorg-server-1.7.2.ebuild: + Drop --impl-headers since the call was dropped from new eselect, and + should be quite useless anyway. + +*xorg-server-1.7.2 (28 Nov 2009) + + 28 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.7.2.ebuild: + Version bump to new stable from 1.7 series. + + 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -files/1.6.4-re-fix-DGA-removal.patch: + Drop stale patches. + +*xorg-server-1.6.5-r1 (18 Nov 2009) + + 18 Nov 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.6.4.ebuild, + +xorg-server-1.6.5-r1.ebuild: + add patches nominated patches for 1.6.6 + + 29 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.6.5.ebuild: + Drop down the added blockers since they does not work how i expected. + + 29 Oct 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.7.1.ebuild: + sync with the overlay, update dmx deps (fixes bug #290866) + + 29 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.6.5.ebuild: + Add proper blockers for xorg-7.5 stuff we dont want with xorg-server-1.6. + Per bug #290739. + + 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> + xorg-server-1.6.3.901-r2.ebuild: + Stable for HPPA (bug #282290). + +*xorg-server-1.7.1 (23 Oct 2009) + + 23 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.0.902.ebuild, +xorg-server-1.7.1.ebuild: + Version bump. + +*xorg-server-1.7.0.902 (19 Oct 2009) + + 19 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.0.901.ebuild, +xorg-server-1.7.0.902.ebuild: + Bump. Remove old one. + +*xorg-server-1.7.0.901 (14 Oct 2009) + + 14 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch, + -xorg-server-1.7.0.ebuild, +xorg-server-1.7.0.901.ebuild: + Version bup xorg-server 1.7. Remove old one. + +*xorg-server-1.6.5 (12 Oct 2009) + + 12 Oct 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.6.5.ebuild: + bump to 1.6.5, has the DGA fix + + 11 Oct 2009; nixnut <nixnut@gentoo.org> xorg-server-1.6.3.901-r2.ebuild: + ppc stable #282290 + + 09 Oct 2009; Markus Meier <maekke@gentoo.org> + xorg-server-1.6.3.901-r2.ebuild: + arm stable, bug #282290 + + 05 Oct 2009; Christian Faulhammer <fauli@gentoo.org> + xorg-server-1.6.3.901-r2.ebuild: + x86 stable, bug 282290 + +*xorg-server-1.7.0 (03 Oct 2009) + + 03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +files/1.7.0-xkb-check-permissions-on-XKM_OUTPUT_DIR.patch, + +xorg-server-1.7.0.ebuild: + Version bump for xorg-server 1.7. + + 02 Oct 2009; Rémi Cardona <remi@gentoo.org> + +files/1.6.4-re-fix-DGA-removal.patch, xorg-server-1.6.4.ebuild: + add patch to fix crasher bug #286746 + + 30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> + xorg-server-1.6.3.901-r2.ebuild: + amd64 stable wrt #282290 + +*xorg-server-1.6.4 (28 Sep 2009) + + 28 Sep 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.6.4.ebuild: + bump to 1.6.4 + + 28 Sep 2009; Rémi Cardona <remi@gentoo.org> + -files/1.2.0-fix-amd-cpu-detection.patch, + -files/1.3.0.0-fix-dual-head-screen-resolutions.patch, + -files/xorg-server-sam225bw-quirks.patch, + -files/xorg-x11-server-1.0.1-fpic-libxf86config.patch, + -files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch, + -files/xorg-xserver-1.4-cve-2008-1377.diff, + -files/xorg-xserver-1.4-cve-2008-1379.diff, + -files/xorg-xserver-1.4-cve-2008-2360.diff, + -files/xorg-xserver-1.4-cve-2008-2361.diff, + -files/xorg-xserver-1.4-cve-2008-2362.diff, -xorg-server-1.6.3.ebuild, + -files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch, + -files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch, + -files/1.3.0.0-fix-randr-resizing.patch, + -files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch, + -xorg-server-1.6.3.901.ebuild, -xorg-server-1.6.3.901-r1.ebuild, + -files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch, + -files/1.2.0-typo-fix.patch, + -files/1.2.0-zero-out-client-devprivates-on-allocation.patch, + -files/1.3.0.0-fix-xephyr-amd64-segfault.patch, + -files/1.3.0.0-fix-xkb-openoffice-hangs.patch, + -files/1.3.0.0-ramdac.patch, -files/1.3.0.0-use-proc-instead-of-sys.patch, + -files/1.3.0.0-xephyr_crash_at_exit.patch, + -files/1.3-alpha-build-fix.patch, + -files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch, + -files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch, + -files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch, + -files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch, + -files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch, + -files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch, + -files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch, + -files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch, + -files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch + , -files/1.4-document-new-font-catalogs.patch, + -files/1.4-dont-hang-openoffice.patch, -files/1.4-fix-dmx-build.patch, + -files/1.4-fix-dmx-link.patch, -files/1.4-fix-xephyr-link.patch, + -files/1.4-fix-xprint-build.patch, -files/1.4-fix-xprint-link.patch, + -files/1.4-ia64.patch, -files/1.4.0.90-clean-generated-files.patch, + -files/1.5.2-fix-xvesa-with-new-kernels.patch, + -files/1.5.2-force-LC_ALL-C-when-running-awk.patch, + -files/1.5.3-builtin-fonts.patch, + -files/avoid-crash-on-minimized-xv-window.patch, + -files/use-composite-for-unequal-depths.patch, -files/xprint.init: + drop old ebuilds, prune ${FILESDIR} + + 19 Sep 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r6.ebuild, + xorg-server-1.5.3-r7.ebuild: + add missing openssl dep (fixes bug #283841) + + 19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.3.0.0-r6.ebuild, -xorg-server-1.4.2.ebuild: + Cleanup. Removal of old xorg versions. + +*xorg-server-1.6.3.901-r2 (15 Sep 2009) + + 15 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.6.3.901-r2.ebuild: + Version bump to have working env with eselect-opengl 1.0.8 + + 04 Sep 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.6.3.901-r1.ebuild: + small clean ups in ebuild, sync up with -9999 from x11 overlay + +*xorg-server-1.6.3.901-r1 (04 Sep 2009) + + 04 Sep 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.3.901-r1.ebuild, + +files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF + .patch: + add a patch to fix bug #278487, split drivers into x11-base/xorg-drivers + + 26 Aug 2009; Rémi Cardona <remi@gentoo.org> + -xorg-server-1.6.2.901.ebuild: + drop old ebuilds + +*xorg-server-1.6.3.901 (26 Aug 2009) + + 26 Aug 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.3.901.ebuild: + bump to 1.6.3.901 (should fix bugs #280443, #281634 and #281698) + + 14 Aug 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild: + drop the old synaptics driver from DEPEND + + 10 Aug 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r6.ebuild, + xorg-server-1.5.3-r7.ebuild, xorg-server-1.6.2.901.ebuild, + xorg-server-1.6.3.ebuild: + reverting the previous commit, see bug #278487 + + 08 Aug 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.5.3-r6.ebuild, + xorg-server-1.5.3-r7.ebuild, xorg-server-1.6.2.901.ebuild, + xorg-server-1.6.3.ebuild: + Xvfb requires font-cursor-misc runtime, bug #278487. + + 02 Aug 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.6.2.ebuild, + -xorg-server-1.6.2-r1.ebuild: + drop old ebuilds + +*xorg-server-1.6.3 (02 Aug 2009) + + 02 Aug 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.6.3.ebuild: + bump to 1.6.3, drop useless D-Bus sed hack + + 01 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.5.3-r6.ebuild: + Remove fglrx occurance in remaining stable server. Silences repoman quite + well. + + 29 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + Version 1.3 no longer supports fglrx module. + +*xorg-server-1.6.2.901 (28 Jul 2009) + + 28 Jul 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.2.901.ebuild: + bump to 1.6.2.901 with two patches to fix bug #278760 + + 17 Jul 2009; Mart Raudsepp <leio@gentoo.org> xorg-server-1.6.2.ebuild, + xorg-server-1.6.2-r1.ebuild: + Update VIDEO_CARDS=geode dependency to xf86-video-geode-2.11, as earlier + versions do not compile against xorg-server-1.6+ + + 17 Jul 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.6.2-r1.ebuild: + make the ebuild call eautoreconf (fixes bug #276187 again) + + 13 Jul 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild, + xorg-server-1.5.3-r6.ebuild, xorg-server-1.5.3-r7.ebuild, + xorg-server-1.6.2.ebuild, xorg-server-1.6.2-r1.ebuild: + drop unsupported drivers from INPUT_DEVICES (see bug #277521) + + 11 Jul 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.6.2.ebuild, + xorg-server-1.6.2-r1.ebuild: + add newport back (see bug #277034) + + 10 Jul 2009; Rémi Cardona <remi@gentoo.org> + -xorg-server-1.6.1.901-r4.ebuild, -xorg-server-1.6.1.902.ebuild, + -xorg-server-1.6.1.902-r1.ebuild: + drop old ebuilds + +*xorg-server-1.6.2-r1 (10 Jul 2009) + + 10 Jul 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.6.2-r1.ebuild: + backport another few fixes from upstream + + 08 Jul 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.6.2.ebuild: + backport patch to fix build on BSD (fixes bug #276187) + +*xorg-server-1.6.2 (08 Jul 2009) + + 08 Jul 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.6.2.ebuild: + bump to 1.6.2 still with patches (one for libXinerama dep, the other for + xfs bug #236847) + +*xorg-server-1.6.1.902-r1 (06 Jul 2009) + + 06 Jul 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.902-r1.ebuild: + add 2 more patches to drop useless dep on libXinerama (fixes bug #270648) + + 06 Jul 2009; Rémi Cardona <remi@gentoo.org> + -xorg-server-1.6.1.901-r5.ebuild: + drop broken RC + + 06 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xorg-server-1.6.1.902.ebuild: + Adjust ati-drivers dependency on 9.6. + +*xorg-server-1.6.1.902 (03 Jul 2009) + + 03 Jul 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.902.ebuild: + bump to 1.6.1.902, add a couple patches to tentatively fix bug #275861 + +*xorg-server-1.6.1.901-r5 (28 Jun 2009) + + 28 Jun 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.901-r5.ebuild: + backport some more patches from upstream's 1.6 nominations, bump dri2proto + dep to 2.1 + + 28 Jun 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.5.3-r5.ebuild, + -xorg-server-1.6.1.901-r2.ebuild, -xorg-server-1.6.1.901-r3.ebuild: + drop old ebuilds + + 24 Jun 2009; Doug Goldstein <cardoe@gentoo.org> + xorg-server-1.6.1.901-r2.ebuild, xorg-server-1.6.1.901-r3.ebuild, + xorg-server-1.6.1.901-r4.ebuild: + re-apply the same nvidia-drivers fix from several months ago cause it + keeps disapearing. + + 23 Jun 2009; Tobias Klausmann <klausman@gentoo.org> + xorg-server-1.5.3-r6.ebuild: + Stable on alpha, finally + +*xorg-server-1.6.1.901-r4 (23 Jun 2009) +*xorg-server-1.5.3-r7 (23 Jun 2009) + + 23 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> + +xorg-server-1.5.3-r7.ebuild, +xorg-server-1.6.1.901-r4.ebuild: + Apply fix for binary driver collision. Per bug #274959. + + 28 May 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.5.3-r6.ebuild, xorg-server-1.6.1.901-r2.ebuild, + xorg-server-1.6.1.901-r3.ebuild: + Add ~alpha + + 27 May 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.5.3-r6.ebuild: + ia64/sh/sparc stable wrt #269950 + + 25 May 2009; Jeroen Roovers <jer@gentoo.org> xorg-server-1.5.3-r6.ebuild: + Stable for HPPA (bug #269950). + + 25 May 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.5.3-r4.ebuild, + -xorg-server-1.6.1.901.ebuild, -xorg-server-1.6.1.901-r1.ebuild: + prune old versions + +*xorg-server-1.6.1.901-r3 (25 May 2009) + + 25 May 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.901-r3.ebuild: + add 2 more patches from upstream's 1.6 branch + + 24 May 2009; Markus Meier <maekke@gentoo.org> xorg-server-1.5.3-r6.ebuild: + amd64 stable, bug #269950 + +*xorg-server-1.6.1.901-r2 (22 May 2009) + + 22 May 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.901-r2.ebuild: + don't change the font path, the default is perfectly fine now (should fix + bug #264054) + + 22 May 2009; Christian Faulhammer <fauli@gentoo.org> + xorg-server-1.5.3-r6.ebuild: + stable x86, bug 269950 + + 20 May 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3-r6.ebuild: + Marking xorg-server-1.5.3-r6 ppc64 and ppc for bug 269950 + + 20 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.6.1.901.ebuild, + xorg-server-1.6.1.901-r1.ebuild: + drop 3dfx USE flag from 1.6, there's no reason for the server to do that, + xf86-video-tdfx will PDEPEND on glide instead + +*xorg-server-1.6.1.901-r1 (17 May 2009) + + 17 May 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.901-r1.ebuild: + add patches nominated for the 1.6 branch + +*xorg-server-1.6.1.901 (16 May 2009) + + 16 May 2009; Rémi Cardona <remi@gentoo.org> + +xorg-server-1.6.1.901.ebuild: + bump to 1.6.1.901 with patches from the upcoming 1.6.2 + + 15 May 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.5.3-r6.ebuild: + arm stable + + 13 May 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild: + drop XPrint support from 1.3 and 1.4, no-one missed it in 1.5 and dropping + it in the older servers will help with portage-wide clean-ups + + 10 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r5.ebuild, + xorg-server-1.5.3-r6.ebuild: + add x11-apps/xkbcomp to RDEPEND, fixes bug #265480 + +*xorg-server-1.5.3-r6 (07 May 2009) + + 07 May 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r6.ebuild: + rewrite the complete git history in the patchball, add more patches from + upstream's 1.5 branch, add 2 patches to fix a cross-compile bug (see bug + #263679) + + 05 May 2009; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + drop x11-misc/xkbdata support (see bug #196650) + + 05 May 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.4.2.ebuild, + xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild: + hard-disable dtrace support (fixes bug #263274) + + 16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xorg-server-1.5.3-r5.ebuild: + Stable for HPPA (bug #251832). + + 16 Apr 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.4.2.ebuild, + xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild: + Filter SSP when building with <GCC4 on x86 only, bug #244352 + + 15 Apr 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.4.2.ebuild, + xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild: + Filter SSP when building with <GCC4, bug #244352 + + 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.5.3-r5.ebuild: + ia64/sh stable wrt #251832 + + 07 Apr 2009; Rémi Cardona <remi@gentoo.org> -xorg-server-1.5.2.ebuild, + -xorg-server-1.5.3.ebuild, -xorg-server-1.5.3-r1.ebuild, + -xorg-server-1.5.3-r2.ebuild, -xorg-server-1.5.3-r3.ebuild: + prune older versions + + 06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> + xorg-server-1.5.3-r5.ebuild: + Stable on sparc, bug #251832 + + 05 Apr 2009; Markus Meier <maekke@gentoo.org> xorg-server-1.5.3-r5.ebuild: + x86 stable, bug #251832 + + 05 Apr 2009; Olivier Crête <tester@gentoo.org> + xorg-server-1.5.3-r5.ebuild: + Stable on amd64, bug #251832 + + 03 Apr 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3-r5.ebuild: + Marking xorg-server-1.5.3-r5 ppc64 stable for bug 251832 + + 03 Apr 2009; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3-r5.ebuild: + Marking xorg-server-1.5.3-r5 ppc stable for bug 251832 + + 19 Mar 2009; <solar@gentoo.org> xorg-server-1.5.3-r5.ebuild: + - tie in the libXCalibrate to wrap up xtscal support when tslib is enabled + +*xorg-server-1.5.3-r5 (16 Mar 2009) + + 16 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r5.ebuild: + backport patches to fix useless freetype error message (bug #261934) and + to always put the console into RAW mode (evdev related, bug #260700) + + 12 Mar 2009; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.5.3-r4.ebuild: + Add ~arm/~sh + +*xorg-server-1.5.3-r4 (11 Mar 2009) + + 11 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r4.ebuild: + add a patch to fix xfs (bug #236847), remove unsupported video cards (bug + #261799) + + 11 Mar 2009; Markus Ullmann <jokey@gentoo.org> + xorg-server-1.5.3-r3.ebuild: + Add virtualbox use_expand for bug #238848 + +*xorg-server-1.5.3-r3 (07 Mar 2009) + + 07 Mar 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r3.ebuild: + add patches to allow building with libXfont 1.4 + + 02 Mar 2009; Peter Volkov <pva@gentoo.org> xorg-server-1.5.3-r2.ebuild: + newport works on mips, no need to block with it. + + 23 Feb 2009; Joshua Kinard <kumba@gentoo.org> xorg-server-1.5.3-r2.ebuild: + Added ~mips to KEYWORDS for #237411 + + 19 Feb 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r2.ebuild: + drop liblbxutil dep, there are no references to it in the sources + +*xorg-server-1.5.3-r2 (05 Feb 2009) + + 05 Feb 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r2.ebuild: + bump to patchset 4 which fixes a screensaver bug, a xinerama bug (bug + #18668) and hopefully bitmap fonts as well (bugs #257206 and #255082), + drop --with-default-font-path as 'built-ins' is always appended internally + (patch #60) + + 25 Jan 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3-r1.ebuild: + silently update the patch-ball to 03 to fix bug #19691 + +*xorg-server-1.5.3-r1 (13 Jan 2009) + + 13 Jan 2009; Rémi Cardona <remi@gentoo.org> +xorg-server-1.5.3-r1.ebuild: + include patches from upstream's server-1.5-branch and backport more EXA + fixes (including one for bug #251242) + + 16 Dec 2008; Brent Baude <ranger@gentoo.org> xorg-server-1.5.3.ebuild: + Marking xorg-server-1.5.3 ~ppc64 for bug 237411 + + 16 Dec 2008; Jeroen Roovers <jer@gentoo.org> xorg-server-1.5.3.ebuild: + Marked ~hppa (bug #237411). + + 15 Dec 2008; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.3.ebuild: + bump xkeyboard-config dep to 1.4, first version to provide the evdev + ruleset (thanks to Sven Köhler) + +*xorg-server-1.5.3 (15 Dec 2008) + + 15 Dec 2008; Rémi Cardona <remi@gentoo.org> + +files/1.5.3-builtin-fonts.patch, +xorg-server-1.5.3.ebuild: + bump to 1.5.3 with a monster EXA backport from git master + + 13 Dec 2008; Doug Goldstein <cardoe@gentoo.org> xorg-server-1.4.2.ebuild, + xorg-server-1.5.2.ebuild: + each nvidia-drivers pkg now specifies what Xorg version it's compatible + with. Just pull in the best nvidia-drivers version possible now. + + 19 Nov 2008; Luca Barbato <lu_zero@gentoo.org> xorg-server-1.5.2.ebuild: + ati-drivers now support xorg 1.5 + + 02 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> metadata.xml: + Tweak tslib flag descrip. + + 01 Nov 2008; <solar@gentoo.org> metadata.xml, xorg-server-1.4.2.ebuild, + xorg-server-1.5.2.ebuild: + - add local tslib support + + 26 Oct 2008; Rémi Cardona <remi@gentoo.org> + +files/1.5.2-fix-xvesa-with-new-kernels.patch, xorg-server-1.5.2.ebuild: + add patch to fix KDrive's Xvesa build (fixes bug #235789) + + 22 Oct 2008; Rémi Cardona <remi@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild, + xorg-server-1.5.2.ebuild: + pkgmove from xf86-video-i810 to xf86-video-intel + + 21 Oct 2008; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.2.ebuild: + patch has been sent upstream, updating ebuild to reflect that + + 18 Oct 2008; Rémi Cardona <remi@gentoo.org> + -files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch, + +files/1.5.2-force-LC_ALL-C-when-running-awk.patch, + xorg-server-1.5.2.ebuild: + another patch to fix bug #237119 + + 17 Oct 2008; Rémi Cardona <remi@gentoo.org> + +files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch, + xorg-server-1.5.2.ebuild: + add patch to fix build issue with some locales (see bug #237119) + + 14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.3.0.0-r4.ebuild, -xorg-server-1.3.0.0-r5.ebuild, + xorg-server-1.3.0.0-r6.ebuild, -xorg-server-1.4.0.90-r3.ebuild, + -xorg-server-1.4.99.902.ebuild, -xorg-server-1.4.99.905.ebuild, + -xorg-server-1.4.99.906.ebuild, -xorg-server-1.5.0.ebuild, + -xorg-server-1.5.1.ebuild: + Clean up old ebuilds. + + 14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.5.2.ebuild: + Update a few dependencies. Require at least evdev 2.0.6, mutouch 1.2.1, + xtrans 1.2.2. + +*xorg-server-1.5.2 (14 Oct 2008) + + 14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.5.2.ebuild: + Version bump. + + 03 Oct 2008; Raúl Porcel <armin76@gentoo.org> xorg-server-1.5.1.ebuild: + Add ~ia64 wrt #237411 + +*xorg-server-1.5.1 (29 Sep 2008) + + 29 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch, + +xorg-server-1.5.1.ebuild: + (#238841) Version bump. (#236900) Re-enable XTrap and Record extensions + except when USE=minimal. + + 24 Sep 2008; Alexis Ballier <aballier@gentoo.org> + xorg-server-1.5.0.ebuild: + keyword ~x86-fbsd + + 23 Sep 2008; Markus Rothe <corsair@gentoo.org> xorg-server-1.5.0.ebuild: + Added ~ppc + + 15 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.5.0.ebuild: + (#237411) Add VIDEO_CARDS=ast to IUSE. + + 14 Sep 2008; Friedrich Oslage <bluebird@gentoo.org> + xorg-server-1.5.0.ebuild: + Add ~sparc keyword, bug #237411 + + 07 Sep 2008; Carsten Lohrke <carlo@gentoo.org> metadata.xml: + Fix a typo. + + 06 Sep 2008; <chainsaw@gentoo.org> xorg-server-1.5.0.ebuild: + Only depend on x11-drivers/xf86-input-synaptics as the older package does + not build against this new server. Closes bug #236870 by Seemant Kulleen + <seemant_g2@kulleen.org>. + +*xorg-server-1.5.0 (06 Sep 2008) + + 06 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.5.0.ebuild: + Version bump. + + 05 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: + add GLEP 56 USE flag desc from use.local.desc + +*xorg-server-1.4.99.906 (26 Jul 2008) + + 26 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.4.99.906.ebuild: + Bump, keyword ~x86. + + 05 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.99.905.ebuild: + Update dependencies to the new versions I bumped yesterday. + +*xorg-server-1.4.99.905 (01 Jul 2008) + + 01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.4.99.905.ebuild: + Bump to the latest RC. + + 27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.4.2-unbreak-endianess.patch, xorg-server-1.4.2.ebuild: + (#227821) Remove patch because ati 6.9 driver appears to work fine without + it and breaks with it. If anyone wants to revert this, please discuss it + on the bug in advance. + + 27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.2.ebuild, xorg-server-1.4.99.902.ebuild: + Update deps related to xf86-video-ati split out of mach64/r128 drivers. + Pull in the latest versions of each. + + 24 Jun 2008; <chainsaw@gentoo.org> xorg-server-1.4.99.902.ebuild: + As of 173.14.09 we can stop blocking the nVidia proprietary drivers for + the 1.5 pre-release. Closes bug #226151 by Chris Gianelloni + <wolf31o2@gentoo.org>. + + 17 Jun 2008; Hanno Boeck <hanno@gentoo.org> xorg-server-1.4.99.902.ebuild: + Lower pixman dep, pixman 0.11 has many issues. + + 15 Jun 2008; Jeroen Roovers <jer@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + Stable for HPPA (bug #225419). + + 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: + void driver must be at least 1.1.1. + + 13 Jun 2008; Steve Dibb <beandog@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + amd64 stable, bug 225419 + + 13 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + ppc stable, bug #225419 + + 11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch, + -files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.p + atch, -files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch, + -files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch, + -files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.pa + tch, + -files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.pa + tch, + -files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch + , + -files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patc + h, + -files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.pa + tch, + -files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.pa + tch, + -files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.pa + tch, + -files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.pa + tch, + -files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.pa + tch, + -files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patc + h, + -files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.pa + tch, -files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch, + -files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch, + -files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.p + atch, -files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch, + -files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch, + -files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.p + atch, + -files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.pa + tch, + -files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.pat + ch, + -files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.p + atch, + -files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.pat + ch, + -files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window. + patch, + -files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch, + -files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r. + patch, -files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch, + -files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.pa + tch, + -files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts. + patch, + -files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn. + patch, -files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch, + -files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch, + -files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch, + -files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch, + -files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch, + -files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.p + atch, + -files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch, + -files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch, + -files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch, + -files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.pat + ch, + -files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.pa + tch, + -files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch, + -files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa + tch, + -files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patc + h, -files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch, + -files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p + atch, + -files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa + tch, + -files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch, + -files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col. + patch, + -files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA. + patch, -files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch, + -files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch, + -files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.pa + tch, + -files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.p + atch, + -files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.pa + tch, + -files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.pa + tch, + -files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.pat + ch, -xorg-server-1.4.0.90-r4.ebuild: + This had pretty much the same patches that are in 1.4.2. + + 11 Jun 2008; Brent Baude <ranger@gentoo.org> + xorg-server-1.3.0.0-r6.ebuild: + Marking xorg-server-1.3.0.0-r6 ppc64 for bug 225419 + + 11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r6.ebuild: + (#225419) Tested for stable on the bug. + +*xorg-server-1.4.2 (11 Jun 2008) +*xorg-server-1.3.0.0-r6 (11 Jun 2008) + + 11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-xserver-1.4-cve-2008-1377.diff, + +files/xorg-xserver-1.4-cve-2008-2360.diff, + +files/xorg-xserver-1.4-cve-2008-1379.diff, + +files/xorg-xserver-1.4-cve-2008-2361.diff, + +files/xorg-xserver-1.4-cve-2008-2362.diff, + +xorg-server-1.3.0.0-r6.ebuild, +xorg-server-1.4.2.ebuild: + (#225419) Security bump. Local root vulnerability, or must be already + authenticated to access X remotely (via xauth, xhost, etc.). The 1.4.x + series bump also contains large quantities of other bugfixes and will be a + stable candidate in 30 days. + +*xorg-server-1.4.99.902 (10 Jun 2008) + + 10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.4.99.902.ebuild: + Bump to 1.5 RC. Dropped keywords because of the move to libpciaccess. I'm + almost positive it's broken on alpha + <https://bugs.freedesktop.org/show_bug.cgi?id=15169>. Other less + mainstream architectures also need testing and filing of bugs at + bugs.freedesktop.org in the xorg product. + + 21 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.0.90-r3.ebuild, xorg-server-1.4.0.90-r4.ebuild: + (#222683) Make sure libxf86config gets built PIC by always setting + SNAPSHOT=yes. + + 19 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa + tch, -files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch, + -files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p + atch, + -files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa + tch, + -files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch, + -files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col. + patch, + -files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA. + patch, +files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch, + +files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.p + atch, + +files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa + tch, +files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch, + +files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p + atch, + +files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa + tch, + +files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch, + +files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col. + patch, + +files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA. + patch, +files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch, + +files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch, + +files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.pa + tch, + +files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.p + atch, + +files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.pa + tch, + +files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.pa + tch, + +files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.pat + ch: + Update 1.4.0.90 patches to latest in server-1.4-branch, which incorporates + all the Gentoo build/link fixes. + + 10 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa + tch, +files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch, + +files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p + atch, + +files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa + tch, + +files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col. + patch, + +files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch, + +files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA. + patch, xorg-server-1.4.0.90-r4.ebuild: + Add patches in my 'server-1.4-branch-gentoo' branch that I've submitted + upstream and am waiting for them to take. + + 09 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.0.90-r4.ebuild: + (#214233) Require wacom 0.7.9 or newer to fix crashes on startup. + + 09 May 2008; Mart Raudsepp <leio@gentoo.org> + xorg-server-1.4.0.90-r3.ebuild, xorg-server-1.4.0.90-r4.ebuild: + Adapt with xf86-video-amd to xf86-video-geode move. + +*xorg-server-1.4.0.90-r4 (08 May 2008) + + 08 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch, + +files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.p + atch, +files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch, + +files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch, + +files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.pa + tch, + +files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.pa + tch, + +files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch + , + +files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patc + h, + +files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.pa + tch, + +files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.pa + tch, +files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch, + +files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch, + +files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.p + atch, +files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch, + +files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch, + +files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.p + atch, + +files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.pa + tch, + +files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.pa + tch, + +files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.pa + tch, +files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch, + +files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.pa + tch, + +files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patc + h, + +files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.p + atch, + +files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.pa + tch, + +files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.pat + ch, + +files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.pat + ch, + +files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window. + patch, + +files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch, + +files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r. + patch, + +files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.pa + tch, + +files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts. + patch, + +files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn. + patch, +files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch, + +files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch, + +files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch, + +files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch, + +files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch, + +files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch, + +files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch, + +files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.pat + ch, + +files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.pa + tch, + +files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch, + +files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patc + h, +xorg-server-1.4.0.90-r4.ebuild: + Add an unkeyworded new revision with tons of fixes from upstream's 1.4 + branch. More patches may be coming soon, and rekeywording is pending on + that. I expect this to be a candidate for stable. + + 07 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild: + (#213288) Fix xprint build by requiring printproto =1.0.3. + + 25 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.3.0.0-r2.ebuild, -xorg-server-1.4.0.90-r2.ebuild: + Clean up a little. Still waiting on arm/sh stabilization in 1.3.0.0-r5 for + -r4 to get removed. + + 25 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r5.ebuild: + (#219159) Add autotools patch here as well. + + 18 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org> + +files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch, + xorg-server-1.4.0.90-r3.ebuild: + Add patch to fix building against newer autotools. Fixes bug #217128. + + 10 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild: + Switch from via to openchrome for VIDEO_CARDS=via to mirror upstream xorg + switch. + + 10 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org> + xorg-server-1.4.0.90-r2.ebuild, xorg-server-1.4.0.90-r3.ebuild: + Remove print_installed(). Bug #211588. + + 11 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + Marked stable on amd64 as per security bug 208343. + + 09 Feb 2008; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + alpha/ia64/sparc stable wrt security #208343 + + 02 Feb 2008; Jeroen Roovers <jer@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + Stable for HPPA (bug #208343). + + 02 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + ppc stable, bug #208343 + + 02 Feb 2008; Brent Baude <ranger@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + Marking xorg-server-1.3.0.0-r5 ppc64 for bug 208343 + + 02 Feb 2008; Markus Meier <maekke@gentoo.org> + xorg-server-1.3.0.0-r5.ebuild: + x86 stable, security bug #208343 + +*xorg-server-1.4.0.90-r3 (01 Feb 2008) +*xorg-server-1.3.0.0-r5 (01 Feb 2008) + + 01 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch, + +files/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch + , +xorg-server-1.3.0.0-r5.ebuild, +xorg-server-1.4.0.90-r3.ebuild: + (#208343) Another security bump, with two fixes. CVE-2007-6429: The old fix + for the MIT_SHM patch failed to check for the security issue in all cases. + CVE-2007-3920: The second fix is primarily for compiz users. There was a + patch in compiz for this but it was again an incomplete fix, because it + assumed the problem could only be caused by a specifically named executable. + + 18 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r4.ebuild: + Restore keywords, since repoman wouldn't let me commit stable. + +*xorg-server-1.4.0.90-r2 (18 Jan 2008) +*xorg-server-1.3.0.0-r4 (18 Jan 2008) + + 18 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch, + -xorg-server-1.3.0.0-r3.ebuild, +xorg-server-1.3.0.0-r4.ebuild, + -xorg-server-1.4.0.90-r1.ebuild, +xorg-server-1.4.0.90-r2.ebuild: + (#206490, #204362) Fix major regression in the MIT-SHM patch of the security + bump that prevented many applications (but apparently none that any distro + developers use, since this slipped by every distro) from running. + + 17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.2.0-server-damage-version.patch, + -files/xorg-xserver-1.2.0-xcmisc.diff, + -files/1.2.0-server-randr-version.patch, -files/1.2.0-client-leak.patch, + -xorg-server-1.2.0-r3.ebuild, -xorg-server-1.3.0.0.ebuild, + -xorg-server-1.3.0.0-r1.ebuild, -xorg-server-1.4-r2.ebuild, + -xorg-server-1.4.0.90.ebuild: + Security cleanup. Still waiting on mips/sh/arm to stable 1.3.0.0-r3 before I + can pull -r2. + + 17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r3.ebuild: + Add stable keywords from testing on the security bug. + +*xorg-server-1.3.0.0-r3 (17 Jan 2008) + + 17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch, + +files/1.3-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch, + +xorg-server-1.3.0.0-r3.ebuild: + Here's the 1.3 version of those security bumps. + +*xorg-server-1.4.0.90-r1 (17 Jan 2008) + + 17 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-0001-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch, + +files/1.4-0002-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch, + +files/1.4-0003-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch, + +files/1.4-0004-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch, + +files/1.4-0005-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch, + +files/1.4-0006-Fix-for-CVE-2007-5958-File-existence-disclosure.patch, + +xorg-server-1.4.0.90-r1.ebuild: + (#204362) Security bump. Bump for 1.3 series coming in a couple hours. + + 16 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.0.90.ebuild: + Don't print output of pushd/popd (Mike Frysinger). + +*xorg-server-1.4.0.90 (14 Dec 2007) + + 14 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4.0.90-clean-generated-files.patch, + +files/1.4-dont-hang-openoffice.patch, + +files/1.4-fix-kdrive-automake.patch, +xorg-server-1.4.0.90.ebuild: + Bump to 1.4.1 release candidate. It's gotta be an improvement over 1.4, + so i'm letting it go into ~arch. + + (#192221) 'xorg-server-1.4 - keyboard LEDs do not work' fixed upstream. + + (#201047) 'xorg-server 1.4 no longer loads xmodmap via xinitrc properly' + fixed upstream. + + (#197104) 'xorg-server-1.3 and 1.4 consumes 100% CPU, locking the + keyboard, apparently triggered by opening an OpenOffice pulldown menu' + fixed with patch from master branch. + + (#196019) 'xorg-server creates unnecessary file + /etc/X11/X11/Xsession.d/92xprint-xpserverlist' fixed by not installing + the same file twice to 2 different places (Andy Crook). + + (#195886) 'xorg-server-1.4.0-r2 built with hal USE flag crashes on + shutdown if dbus service is not running' fixed upstream. + + (#195551) 'xorg-server-1.4 fails to build w/kdrive on amd64' fixed with + Makefile.am patch designed for easier sed but unsuitable for upstream + because the line gets too long (Michael Gorse). + + (#194503) Don't spit versions when showing drivers to rebuild via qlist, + and also provide a command for people to do it themselves later. + + 30 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + (#200731) Forgot to remove the blocker for ati-drivers (Sascha Beck). + + 29 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + Re-add binary ATI/AMD driver support for 8.433 and newer (Jory Pratt). + + 20 Nov 2007; Joshua Kinard <kumba@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + Stable on mips, per #198525. + + 14 Nov 2007; Jeroen Roovers <jer@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + Stable for HPPA (bug #198525). + + 09 Nov 2007; nixnut <nixnut@gentoo.org> xorg-server-1.3.0.0-r2.ebuild: + Stable on ppc wrt bug 198525 + + 09 Nov 2007; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + alpha/ia64 stable wrt #198525 + + 09 Nov 2007; Ferris McCormick <fmccor@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + Sparc stable --- Bug #198525 + + 09 Nov 2007; Markus Rothe <corsair@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + Stable on ppc64; bug #198525 + + 09 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0-r2.ebuild: + (#198525) Stable on amd64, tested by hparker, approved by kingtaco. + + 09 Nov 2007; Dawid Węgliński <cla@gentoo.org> + xorg-server-1.3.0.0-r2.ebuild: + Stable on x86 + + 07 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3.0.0-fix-xkb-openoffice-hangs.patch, + xorg-server-1.3.0.0-r2.ebuild: + (#197104) Fix a 100% CPU hang on openoffice. (#196019) Don't create a + redundant file with USE=xprint. + + 05 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild, + xorg-server-1.3.0.0-r1.ebuild: + Require older libXrender here too (backport from 1.3.0.0-r2) (Martin MOKREJŠ). + + 29 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + (#197154, fd.o #12982) xorg-server thinks net-dialup/dtrace is Solaris + dtrace, thus dying during the build (Chad Simmons). Add a blocker for now, + until we have an upstream fix. + + 14 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + (#194503) Try adding some output to print the actual drivers that need to be + rebuilt. Use qlist from portage-utils, equery from gentoolkit, epm, and fall + back to internal portage best_version if all else fails. + +*xorg-server-1.3.0.0-r2 (13 Oct 2007) + + 13 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3.0.0-fix-dual-head-screen-resolutions.patch, + +files/1.3.0.0-fix-randr-resizing.patch, + +files/1.3.0.0-fix-xephyr-amd64-segfault.patch, + +files/1.3.0.0-ramdac.patch, +xorg-server-1.3.0.0-r2.ebuild: + (#183721) Fix resizing with RandR. (#179545) Use correct screen resolutions + when there's multiple screens. (#191709) Require older libXrender too. + (#192312) Export ramdac symbols, so e.g. xf86-video-s3 compiles. (#193207) + Fix Xephyr segfault on amd64. (#194026) Set XKB output directory so this + works with xkeyboard-config 1.1. + + 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.4-r1.ebuild: + Clean out a broken ebuild. + + 09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild, + xorg-server-1.3.0.0-r1.ebuild, xorg-server-1.4-r1.ebuild: + Fix quoting issues caught by latest repoman. + + 02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + Stable on amd64 wrt bug #191964. + + 02 Oct 2007; Jeroen Roovers <jer@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + Stable for HPPA (bug #191964). + + 01 Oct 2007; Doug Goldstein <cardoe@gentoo.org> xorg-server-1.4-r1.ebuild, + xorg-server-1.4-r2.ebuild: + add new nvidia-drivers to depend list support + + 01 Oct 2007; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + alpha/ia64/sparc stable wrt #191964 + + 01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + Fix variable quoting caught by my repoman patch. + +*xorg-server-1.4-r2 (01 Oct 2007) + + 01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-ia64.patch, +xorg-server-1.4-r2.ebuild: + (#194026) Fix many keyboard-related issues, particularly special keys, by + setting the XKB output directory to one that actually exists -- /var/lib/xkb + -- instead of /usr/share/X11/xkb/compiled (illusion). (#193978) Fix build on + ia64 (Raúl Porcel). (#193735) Another xprint fix, to the init script this + time (Andy Crook). + + 01 Oct 2007; Joshua Kinard <kumba@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + Stable on mips, per #191964. + + 30 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + ppc stable, bug #191964 + + 30 Sep 2007; Markus Rothe <corsair@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + Stable on ppc64; bug #191964 + + 30 Sep 2007; Markus Meier <maekke@gentoo.org> + xorg-server-1.3.0.0-r1.ebuild: + x86 stable, security bug #191964 + +*xorg-server-1.3.0.0-r1 (30 Sep 2007) + + 30 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/use-composite-for-unequal-depths.patch, + +xorg-server-1.3.0.0-r1.ebuild: + (#191964) Security bump for local exploit in the Composite extension, which + is disabled by default. + + 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xorg-server-1.3.0.0.ebuild: + Stable on mips, per #191615. + + 19 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r1.ebuild: + Restore Nvidia binary driver support with today's release. + + 14 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r1.ebuild: + Require latest versions of some input drivers for compat with the new input + stuff. + + 11 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.4.ebuild: + Drop a broken ebuild. + + 10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r1.ebuild: + More minimal versions for 7.3 and even earlier releases. + + 10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r1.ebuild: + Add minimal version dependencies for X.Org 7.3 release. Also remove blocker + on old keyboard drivers, because the minimal 1.2 dependency when + INPUT_DEVICES=keyboard should be good enough. + +*xorg-server-1.4-r1 (10 Sep 2007) + + 10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.4-r1.ebuild: + (#191822) Try to avoid a fatal DBUS-related error at startup time by + installing the DBUS file to /etc/dbus-1/system.d/xorg-server.conf rather + than /etc/X11/dbus-1/system.d/xorg-server.conf. Also add a tweak to stop + autoreconf from running twice. Both fixes courtesy of Elvis Pranskevichus. + This should be enough to get you a running X server, but input hotplugging + may not work yet. A couple of other changes on the bug need to be examined + in more detail. + + 10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xorg-server-1.3.0.0.ebuild: + Stable for HPPA (bug #191615). + + 10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.ebuild: + (#191820) Fix xprint build when neither dmx or kdrive are enabled; forgot to + autoreconf. + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4.ebuild: + Block binary drivers: nvidia-drivers and ati-drivers -- seems that they + don't have releases built for 1.4 yet. + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild: + (#191709) Require older renderproto as a workaround to make this build again + until we get a proper fix. + + 09 Sep 2007; Raúl Porcel <armin76@gentoo.org> xorg-server-1.3.0.0.ebuild: + alpha/ia64 stable wrt #191615 + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -files/01-no-move-damage.patch, -files/03-tfp-damage.patch, + -files/05-offscreen-pixmaps.patch, -files/1.1.1-fix_acpi_tokenize.patch, + -files/02-dont-backfill-bg-none.patch, + -files/04-mesa-copy-sub-buffer.patch, + -files/06-aiglx-happy-vt-switch.patch, -files/1.1.1-dbe-render.diff, + -files/1.1.1-fix-xrandr-zoom-keys.patch, + -files/1.1.1-fix_big_endian_glx.patch, -files/1.1.1-fixdualhead.patch, + -files/1.1.1-sparc-includes.patch, -files/1.1.1-sparc64-ati-lockups.patch, + -files/xorg-server-1.1.1-install-libxf86config-headers.patch, + -files/xorg-x11-server-1.1.1-mesa-6.5.1.patch, + -files/xorg-conf-example.patch, -xorg-server-1.1.1-r1.ebuild, + -xorg-server-1.1.1-r5.ebuild: + Drop 1.1, everyone's stable on 1.2 or 1.3. + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.2.99.0-fix-sysconfdir-references.patch, + -xorg-server-1.2.99.0.ebuild: + Drop early input-hotplug snapshot. + +*xorg-server-1.4 (09 Sep 2007) + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.4-document-new-font-catalogs.patch, + +files/1.4-fix-dmx-build.patch, +files/1.4-fix-dmx-link.patch, + +files/1.4-fix-xephyr-link.patch, +files/1.4-fix-xprint-build.patch, + +files/1.4-fix-xprint-link.patch, +files/1.4-fpic-libxf86config.patch, + +xorg-server-1.4.ebuild: + Bump. Contains input hotplugging, numerous EXA improvements, improvements to + RandR 1.2, and more. Adds a new dependency on pixman for rendering and an + optional dependency on hal/dbus for input hotplugging. A few of the + fix-*-{build,link} patches still need to go upstream. + + 09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild, xorg-server-1.1.1-r5.ebuild, + xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild: + Fix keyboard driver dep because it doesn't work with 1.2 or newer. + + 08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xorg-server-1.3.0.0.ebuild: + Marked ppc/ppc64 stable for bug #191615. + + 08 Sep 2007; Christoph Mende <angelos@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Stable on amd64 wrt bug #191615 + + 07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.3.0.0.ebuild: + I am reverting the stabilization until a newer ati-drivers package is + stabilized. I apologize if anyone gets caught by this in the short time it + was stable. + + 07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Stable on x86 wrt bug #191615. + + 07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Stable on amd64 wrt bug #191615. + + 09 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0.ebuild: + Need to regenerate autotools files for + xorg-x11-server-1.0.1-fpic-libxf86config.patch (Robert Buchholz). + + 07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Stable on sparc wrt #175465 + + 02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-x11-server-1.0.1-fpic-libxf86config.patch, + xorg-server-1.3.0.0.ebuild: + (#182516) Build libxf86config PIC for other packages that use it on 64-bit + systems. + + 02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.3.0.0-xephyr_crash_at_exit.patch, xorg-server-1.3.0.0.ebuild: + (#185705) Stop Xephyr from crashing when applications quit. + + 01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.2.0-fix-amd-cpu-detection.patch, + +files/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch, + +files/1.2.0-typo-fix.patch, + +files/1.2.0-zero-out-client-devprivates-on-allocation.patch, + +files/1.3.0.0-use-proc-instead-of-sys.patch, + +files/1.3-alpha-build-fix.patch, + +files/avoid-crash-on-minimized-xv-window.patch, + +files/xorg-server-sam225bw-quirks.patch, xorg-server-1.3.0.0.ebuild: + Add patches for various issues. (#171396) Memleaks; (#167052) Fix + multi-domain systems like Sparc and Pegasos; (#181280) Minimized Xv window + crashes X; (#176746) Resolution fix for SyncMaster 225BW; (#164240) Fix + Alpha build with newer kernel headers. + + 31 Jul 2007; Doug Goldstein <doug@gentoo.org> xorg-server-1.1.1-r1.ebuild, + xorg-server-1.1.1-r5.ebuild, xorg-server-1.2.0-r3.ebuild, + xorg-server-1.2.99.0.ebuild, xorg-server-1.3.0.0.ebuild: + nvidia-legacy-drivers moved to nvidia-drivers + + 02 Jul 2007; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.2.0-r3.ebuild: + alpha stable wrt #175465 + + 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> + xorg-server-1.1.1-r1.ebuild, xorg-server-1.1.1-r5.ebuild, + xorg-server-1.2.0-r3.ebuild, xorg-server-1.2.99.0.ebuild, + xorg-server-1.3.0.0.ebuild: + (QA) RESTRICT clean up. + + 24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> + xorg-server-1.2.99.0.ebuild: + (QA) Don't use KEYWORDS="-*". bug #160519. + + 24 Jun 2007; Joshua Kinard <kumba@gentoo.org> xorg-server-1.2.0-r3.ebuild: + Stable on mips, per #175465. + + 04 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0.ebuild: + (#180855) Fix ati-drivers support. My last commit never made it in because + of a conflict I didn't notice. + + 02 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0.ebuild: + (#180611) Remove blocker on ati-drivers so the below change works. + + 20 May 2007; Jeroen Roovers <jer@gentoo.org> xorg-server-1.2.0-r3.ebuild: + Stable for HPPA (bug #175465). + + 12 May 2007; nixnut <nixnut@gentoo.org> xorg-server-1.2.0-r3.ebuild: + Stable on ppc wrt bug 175465 + + 05 May 2007; Daniel Gryniewicz <dang@gentoo.org> + xorg-server-1.2.0-r3.ebuild: + Marked stable on amd64 for bug #175465 + + 05 May 2007; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Add a dependency on libXfixes when building dmx. Thanks to Hopeless of + bug #177173. + + 04 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild: + Allow also nvidia-drivers-8xxx series, and nvidia-legacy-drivers-7xxx for + bug 176648 as they are needed for older cards. Bug 175503 is only about + ati-drivers. + + 02 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.1.1-r4.ebuild, -xorg-server-1.2.0.ebuild, + -xorg-server-1.2.0-r1.ebuild, -xorg-server-1.2.0-r2.ebuild: + Pull versions that will never go stable or are stale. + + 01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild: + Allow also nvidia-drivers-1.0.9631-r1 which appears to be working and + required for older cards. Bug 176650. + + 01 May 2007; Samuli Suominen <drac@gentoo.org> xorg-server-1.3.0.0.ebuild: + Allow nvidia-drivers-1.0.9755-r1 with xorg-server-1.3.0.0 as it works and + blocking them is annoying for users. + + 01 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.3.0.0.ebuild: + Remove VIDEO_CARDS flags for binary drivers and block binary ati and nvidia + drivers, since none of them work yet with 1.3. Since we aren't yet sure + which versions will, block them unconditionally for now and add appropriate + dependencies later. + + 29 Apr 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.2.0-r3.ebuild: + Stable on x86, bug #175465. + + 25 Apr 2007; Raúl Porcel <armin76@gentoo.org> + xorg-server-1.2.0-r3.ebuild: + Stable on ia64 wrt bug #175465 + + 25 Apr 2007; Markus Rothe <corsair@gentoo.org> + xorg-server-1.2.0-r3.ebuild: + Stable on ppc64; bug #175465 + + 22 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.3.0.0.ebuild: + Update randrproto dep to 1.2.1. Fixes #175452. + + 21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org> + -xorg-server-1.2.99.901.ebuild, -xorg-server-1.2.99.902.ebuild, + -xorg-server-1.2.99.903.ebuild, -xorg-server-1.2.99.903-r1.ebuild, + -xorg-server-1.2.99.905.ebuild: + Clean out 1.3 RCs. + +*xorg-server-1.3.0.0 (21 Apr 2007) + + 21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.3.0.0.ebuild: + Bump to 1.3 final. + +*xorg-server-1.2.99.905 (06 Apr 2007) + + 06 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.2.99.905.ebuild: + Add 1.3RC5. This includes the security patch from RC3-r1, as well as a server + respawn fix. Also, fix bug #172713 (steveb). + +*xorg-server-1.2.99.903-r1 (05 Apr 2007) +*xorg-server-1.2.0-r3 (05 Apr 2007) +*xorg-server-1.1.1-r5 (05 Apr 2007) + + 05 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-xserver-1.2.0-xcmisc.diff, +xorg-server-1.1.1-r5.ebuild, + +xorg-server-1.2.0-r3.ebuild, +xorg-server-1.2.99.903-r1.ebuild: + (#172575) Security bump. CVE 2007-1003: XC-MISC extension integer overflow. + +*xorg-server-1.2.99.903 (28 Mar 2007) + + 28 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.2.99.903.ebuild: + Bump to 1.3 RC3. + +*xorg-server-1.2.99.902 (20 Mar 2007) + + 20 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.2.99.902.ebuild: + Bump to 1.3RC2. + +*xorg-server-1.2.0-r2 (17 Mar 2007) + + 17 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.2.0-client-leak.patch, +xorg-server-1.2.0-r2.ebuild: + Fix a memory leak. This fix is already in the 1.3 branch. (Thanks to krtek + for the patch and ebuild - bug #166109) + +*xorg-server-1.2.99.901 (10 Mar 2007) + + 10 Mar 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.2.99.901.ebuild: + Bump to 1.3 RC1. This contains RandR 1.2 for monitor hotplugging etc, + assuming you have a supported driver (only intel at present, radeon in the + works), and you also need the updated libXrandr and x11-apps/xrandr. It also + merges the damage-tracking work for EXA (the newer acceleration + architecture) as well as some other fixes. It does NOT contain input-device + hotplugging despite the higher version number than 1.2.99.0, because of a + change in release-versioning plans. + +*xorg-server-1.2.0-r1 (19 Feb 2007) + + 19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.2.0-server-damage-version.patch, + +files/1.2.0-server-randr-version.patch, +xorg-server-1.2.0-r1.ebuild: + Fix several issues: + + Bug #163613 - Server should report its damage implementation version rather + than the protocol header version. (Todd Merrill) + + Bug #164146 - Xprint file locations have changed since 1.1, so fix the ebuild + to find them correctly. (Ed Catmur) + + Bug #167651 - Server should report its randr implementation version rather + than the protocol header version. (Me) + + 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.0.2-Xprint-xprintdir.patch, -files/1.0.2-dbe-render.diff, + -files/1.0.2-fix-readKernelMapping-overrun.patch, + -files/1.0.2-fix-rom-read-dualhead.patch, + -files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch, + -files/1.0.2-try-to-fix-xorgcfg.patch, -files/x11r7.0-setuid.diff, + -files/xorg-server-1.0.2-64bit-fix-for-glx.patch, + -files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch, + -files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch, + -files/xorg-server-1.0.2-Sbus.patch, + -files/xorg-server-1.0.2-Xprt-build.patch, + -files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch, + -files/xorg-server-1.0.2-xprint-init.patch, + -files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r8.ebuild: + Stop supporting Xorg 7.0. + + 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.0.99.901-Xprint-xprintdir.patch, + -files/xorg-server-1.1.99.901-GetDrawableAttributes.patch, + -files/1.1.99.903-sparc-includes.patch, + -files/xorg-server-1.1.0-setuid.diff, -files/1.1.99.903-mesa-6.5.2.patch, + -xorg-server-1.0.2-r7.ebuild, -xorg-server-1.1.0-r1.ebuild, + -xorg-server-1.1.1.ebuild, -xorg-server-1.1.1-r2.ebuild, + -xorg-server-1.1.1-r3.ebuild, -xorg-server-1.1.99.903-r1.ebuild: + Clean up. + +*xorg-server-1.2.0 (24 Jan 2007) + + 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.2.0.ebuild: + Bump. Upstream incorporated some version of all of our patches, so no more + need for the aiglx USE flag. + + 22 Jan 2007; Steve Dibb <beandog@gentoo.org> xorg-server-1.0.2-r8.ebuild, + xorg-server-1.1.1-r4.ebuild: + amd64 stable, bug 157421 + + 22 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.1.1-fixdualhead.patch, +files/1.1.99.903-sparc-includes.patch, + +files/1.1.1-sparc-includes.patch, xorg-server-1.1.1-r4.ebuild, + xorg-server-1.1.99.903-r1.ebuild: + (#159671) Fix sparc build with current kernel headers. (#159375) Fix dual + head when direct rendering is enabled. No revision bump because these affect + a minority of users. + + 15 Jan 2007; Tim Yamin <plasmaroo@gentoo.org> xorg-server-1.1.1-r4.ebuild: + Stable on IA64; bug #157421. + + 15 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> + xorg-server-1.1.1-r4.ebuild: + Stable on Alpha, bug 157421. + + 14 Jan 2007; René Nussbaumer <killerfox@gentoo.org> + xorg-server-1.1.1-r4.ebuild: + Stable on hppa. See bug #157421. + + 14 Jan 2007; Markus Rothe <corsair@gentoo.org> + xorg-server-1.0.2-r8.ebuild, xorg-server-1.1.1-r4.ebuild: + Stable on ppc64; bug #157421 + + 14 Jan 2007; Ferris McCormick <fmccor@gentoo.org> + xorg-server-1.1.1-r4.ebuild: + Stable on sparc --- Security Bug #157421 --- everything as expected. + + 13 Jan 2007; Andrej Kacian <ticho@gentoo.org> xorg-server-1.0.2-r8.ebuild, + xorg-server-1.1.1-r4.ebuild: + Stable on x86, bug #157421. + + 13 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> + xorg-server-1.1.1-r4.ebuild: + Stable on ppc wrt bug #157421. + +*xorg-server-1.1.1-r4 (13 Jan 2007) +*xorg-server-1.0.2-r8 (13 Jan 2007) + + 13 Jan 2007; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.0.2-dbe-render.diff, +files/1.1.1-dbe-render.diff, + +xorg-server-1.0.2-r8.ebuild, +xorg-server-1.1.1-r4.ebuild: + Fix multiple vulnerabilities in Render and DBE extensions. (Bug #157421) + + 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r3.ebuild: + Only apply the GLX endianness fix if AIGLX is enabled, since it fixes one of + the AIGLX patches. Thanks to Elisamuel Resto and Mike Auty for figuring out + what the problem was. Closes bug #157401. + + 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + Build against the Mesa 6.5.2 release instead of the snapshot. + +*xorg-server-1.1.1-r3 (07 Dec 2006) + + 07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.1.1-fix_big_endian_glx.patch, +xorg-server-1.1.1-r3.ebuild: + Fix GLX endianness on big endian systems. This gets rid of the funky colours + on systems such as PPC when running Compiz/Beryl. (Bug #156715, Rasmus Wiman) + + 05 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.99.903-r1.ebuild, xorg-server-1.2.99.0.ebuild: + Require kbproto 1.0.3. + +*xorg-server-1.1.99.903-r1 (04 Dec 2006) + + 04 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.1.99.903-mesa-6.5.2.patch, -xorg-server-1.1.99.903.ebuild, + +xorg-server-1.1.99.903-r1.ebuild: + Build the 7.2 server against Mesa 6.5.2. Includes a patch from Hanno Böck. + +*xorg-server-1.1.99.903 (02 Dec 2006) + + 02 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/xorg-server-1.1.99.901-GetDrawableAttributes.patch, + -xorg-server-1.1.99.902.ebuild, +xorg-server-1.1.99.903.ebuild: + Version bump for 7.2RC3. Includes several more bugfixes. + + A patch has been added from upstream Bugzilla that fixes Compiz/AIGLX + operation on the server. It's unknown if the patch has any negative + side-effects yet, so it's hidden behind USE="aiglx" again. + + 01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Stable on hppa wrt #144549 + + 14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.99.902.ebuild: + xorgcfg appears to build OK again - re-enable it. + +*xorg-server-1.1.99.902 (13 Nov 2006) + + 13 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + -xorg-server-1.1.99.901.ebuild, +xorg-server-1.1.99.902.ebuild: + Bump for 7.2RC2. Brings quite a few more bugfixes. + +*xorg-server-1.1.1-r2 (09 Nov 2006) + + 09 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.1.1-fix_acpi_tokenize.patch, +xorg-server-1.1.1-r2.ebuild: + Fix X crashes when opening/closing laptop lids on some laptops. (Bug #152184, + Wendall Cada for the report) + + 05 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.2.99.0-fix-sysconfdir-references.patch: + Add missing patch. + + 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + SDL is also currently broken in 1.2.99.0 according to Daniel Stone. + + 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + 1.2.99.0: + - xprint is broken (bug #154067, Cyrill Helg) + - fix install location of dbus configuration file + + 04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + Add DBUS dependency. Bump dependencies on evdev, keyboard and mouse drivers + to enforce input hotplug-compatible versions. + + 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + Add 'dbus' USE-flag and disable dmx correctly. + + 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + 1.2.99 needs libdrm >= 2.2. Thanks to steev again. + + 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + 1.2.99 depends on inputproto >=1.4. Thanks to Steev for the catch. + + 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.2.99.0.ebuild: + Eradicate all references to the currently broken DMX. (Jakub Moc, bug #153928) + +*xorg-server-1.2.99.0 (03 Nov 2006) + + 03 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.2.99.0.ebuild: + Add initial input hotplug development release. + +*xorg-server-1.1.99.901 (30 Oct 2006) + + 30 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.1.99.901.ebuild: + Add 7.2RC1 server snapshot. xorgcfg is broken (probably minorly), and compiz + compatibility patches are also broken. Loads of fixes and changes since 7.1. + + 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Unbreaking kdrive, part 4: Move all the kdrive setup code out to a separate + function kdrive_setup(). Make variables local to that function. + + 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other + servers require them. This replaces the existing fix for bug #136370 and + should also fix bug #152797. + + 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Unbreaking kdrive, part 2: Instead of checking whether a certain VIDEO_CARDS + setting is in a long list of invalid cards for non-x86 systems, check + whether it's the single valid setting; Check whether VIDEO_CARDS settings + are valid kdrive servers before moving into the more complex processing. + + 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Unbreaking kdrive, part 1: Fix logic and variable names when forcing + fbdev/vesa on for Xati; Don't skip binary drivers, it needlessly complicates + the code for no useful end result. + + 18 Oct 2006; Aron Griffis <agriffis@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Mark 1.1.1-r1 stable on alpha. #144549 + + 17 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Don't try to install xorg.conf.example if the xorg server isn't built. (Bug + #151670, Balint Dobai-Pataky) + + 15 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Don't try to install xorg.conf.example with USE="minimal". (Bug #151421, + George Kargiotakis) + + 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Mark 1.1.1-r1 stable on ia64. #144549 + + 13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + AMD64/x86 stable for bug #144549 (X7.1). + + 13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Hide AIGLX patches behind the "aiglx" USE flag, since the patches seem to + cause some EXA slowdowns (bug #147841, reported by Giacomo Perale). + + 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Really fix bug #150052. + + 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/xorg-conf-example.patch, xorg-server-1.1.1-r1.ebuild: + Install xorg.conf.example like 6.x did. (Bug #138623, requested by + Christopher Covington; patch written by Donnie and I) Don't build kdrive + servers that use vm86.h on non-x86 systems. (Bug #150052, Shvetsov Alex) + + 06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild, + xorg-server-1.1.1-r1.ebuild: + Remove references to nvidia-glx now that it has been removed from the tree. + + 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + files/1.1.1-sparc64-ati-lockups.patch: + Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit + kernel/32-bit userland, so sparc64 isn't defined when building the userland. + + 20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Use new glproto for eye candy to work properly. + + 16 Sep 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.1-r1.ebuild: + Fix download URLs. + + 16 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Use Mesa 6.5.1 instead of a random prerelease snapshot. + + 15 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.1.1-remove-altix.patch, +files/1.1.1-sparc64-ati-lockups.patch, + xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild: + Use upstream's fix for sparc mach64 lockups. An 18-line patch instead of a + 582-line patch is a good thing. + + 12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild, + xorg-server-1.1.1-r1.ebuild: + Some comments got displaced to the wrong spot. + + 12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> + xorg-server-1.1.1.ebuild: + Stable on hppa + + 08 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r7.ebuild, xorg-server-1.1.0-r1.ebuild, + xorg-server-1.1.1.ebuild, xorg-server-1.1.1-r1.ebuild: + (#128448) Depend on xplsprinters if USE=xprint, because it's used in profile + scripts. + + 06 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-x11-server-1.1.1-mesa-6.5.1.patch: + Forgot to cvs add the patch, thanks fmccor. + +*xorg-server-1.1.1-r1 (05 Sep 2006) + + 05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/01-no-move-damage.patch, +files/02-dont-backfill-bg-none.patch, + +files/03-tfp-damage.patch, +files/04-mesa-copy-sub-buffer.patch, + +files/05-offscreen-pixmaps.patch, +files/06-aiglx-happy-vt-switch.patch, + +files/xorg-server-1.1.1-install-libxf86config-headers.patch, + +files/1.1.1-fix-xrandr-zoom-keys.patch, +xorg-server-1.1.1-r1.ebuild: + Bump. (#145797) Add patches for AIGLX+compiz. (#146197) Fix resolution + switching with ctrl-alt-+/-. Install libxf86config + headers for + pyxf86config, and extramodes and vesamodes for system-config-display. Do + correct bash substitution for nvidia kdrive server. This uses a mesa + snapshot in anticipation of the 6.5.1 release. Some changes will need to + happen to get it back to using a standard Mesa release tarball. + + 03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + kdrive's VESA driver does not build on AMD64. (Bruno Roggeri, bug #145274) + + 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + Remove trailing whitespace. + + 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + Allow 7.1-compatible nvidia-drivers and nvidia-legacy-drivers. + + 26 Aug 2006; Hanno Boeck <hanno@gentoo.org> xorg-server-1.1.0-r1.ebuild, + xorg-server-1.1.1.ebuild: + linuxwacom moved from x11-misc to x11-drivers. + + 22 Aug 2006; Ferris McCormick <fmccor@gentoo.org> + xorg-server-1.1.1.ebuild: + Stable on sparc, Bug #144549 --- Thanks to dberkholz for incorporating + remove-altix patch. + + 22 Aug 2006; Stephen P. Becker <geoman@gentoo.org> + xorg-server-1.1.1.ebuild: + stable on mips, bug 144549 + + 21 Aug 2006; Markus Rothe <corsair@gentoo.org> xorg-server-1.1.1.ebuild: + Stable on ppc64; bug #144549 + + 21 Aug 2006; Joseph Jezak <josejx@gentoo.org> xorg-server-1.1.1.ebuild: + Marked ppc stable for bug #144549. + + 20 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.1.1-remove-altix.patch, xorg-server-1.1.1.ebuild: + (fd.o #3914) Altix support breaks some sparc64 systems with Mach64 video, so + conditionally patch it out. This patch will be maintained and forward-ported + by the sparc team. This is the last stable blocker for modular X on sparc. + + 18 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1.ebuild: + Move architecture-specific video driver defaults into profiles. + + 12 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + libdmx and dmxproto should be in USE=dmx dep, not USE=minimal. + + 02 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver. + + 19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-server-1.0.2-r7.ebuild: + Stable on hppa. + + 16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Add the warning to this version too. + + 16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1.ebuild: + Add some warnings about the change in reduced blanking behaviour. (Bug + #135544, Steffen Strobel) + + 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Mark 1.1.0-r1 stable on ia64 + + 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1.ebuild: + Also don't build xorgcfg on USE=minimal. + + 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.0.2-r6.ebuild: + Pull old version. + +*xorg-server-1.1.1 (09 Jul 2006) + + 09 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +xorg-server-1.1.1.ebuild: + Bump. Bunches of rendering and crasher fixes, incorporates security fix and + the 2 xprint patches, and more. + + 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: + Update to my new email address. + + 06 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Added blocker on x11-drivers/nvidia-drivers and + x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet. + + 01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> + files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff: + Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688) + + 01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild: + ppc/sparc/mips/alpha/arm/sh stable + + 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild: + sparc shouldn't pull in vesa and vga. + + 30 Jun 2006; Markus Rothe <corsair@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Stable on ppc64 + + 30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> + xorg-server-1.0.2-r7.ebuild: + Stable on amd64. + + 30 Jun 2006; Markus Rothe <corsair@gentoo.org> + xorg-server-1.0.2-r7.ebuild: + Stable on ppc64 + + 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r7.ebuild: + x86 stable. + +*xorg-server-1.0.2-r7 (30 Jun 2006) + + 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.0.2-fix-rom-read-dualhead.patch, +xorg-server-1.0.2-r7.ebuild: + Fix dual-head. + + 30 Jun 2006; Stephen P. Becker <geoman@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + added video_cards_impact to IUSE_VIDEO_CARDS, enable it for mips users + + 27 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873) + + 28 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild: + Fix typo video_cards_3dfx > video_cards_tdfx (Jakub Moc). + + 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Fix kdrive+ATI build. (Priit Laes, bug #136370) + + 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself. + (Patch by Ed Catmur, bug #137991) + + 21 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild: + Fix up VIDEO_CARDS for mips, they don't want ati, mga, sisusb. + +*xorg-server-1.1.0-r1 (20 Jun 2006) +*xorg-server-1.0.2-r6 (20 Jun 2006) + + 20 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-server-1.1.0-setuid.diff, +files/x11r7.0-setuid.diff, + -xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.2-r5.ebuild, + +xorg-server-1.0.2-r6.ebuild, -xorg-server-1.1.0.ebuild, + +xorg-server-1.1.0-r1.ebuild: + Security bump. Failure to check the return value of setuid() in a privileged + process could be used by a local user for file overwriting and possible + privilege escalation in corner cases. See + http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for more + information. + + 17 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0.ebuild: + Drop nvidia and fglrx flags for now and block all nvidia-glx and ati-drivers + versions since neither of the binary drivers are supported currently. + (Jakub Moc, bug #136788) + +*xorg-server-1.0.2-r5 (11 Jun 2006) + + 11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.0.2-fix-readKernelMapping-overrun.patch, + +xorg-server-1.0.2-r5.ebuild: + Fix an overrun that was causing various issues on VT switch. This is already + fixed in 1.1. (Matthias Dahl, bug #127608) + + 04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0.ebuild: + Ensure eautoreconf gets run when building xprint and kdrive. (Walter Meinl, + bug #135263) + + 04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0.ebuild: + Have the ebuild fail if no server will be built, instead of appearing to + complete successfully but not installing enough binaries for a usable X. + (Bug #132140) + +*xorg-server-1.1.0 (23 May 2006) + + 23 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + -xorg-server-1.0.99.903.ebuild, +xorg-server-1.1.0.ebuild: + Bump for 7.1 final. Includes various crash fixes, etc. + + 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r4.ebuild: + Force on xorg-x11 opengl implem for compile, to ensure we have recent enough + glxtokens.h. Reported by johey on freenode. + + 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.99.903.ebuild: + (#133295) Fix kdrive build when s3 is on, because it also sedded out the s3 + from the middle of sis300. Also a fix for turning off sis300 at all. Fixes + by Kent Fredric. + + 14 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.903.ebuild: + Add RESTRICT=stricter, because FEATURES=stricter dies on installing anything + suid with lazy bindings. The X server needs lazy bindings because of how its + module loading works. Hopefully at some point, upstream will change this. + Suggested by Kevin F. Quinn. + + 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.99.903.ebuild: + Move driver dependencies from the meta-ebuild to xorg-server as a + PDEPEND. (Michal Suchanek, bug #132696) + +*xorg-server-1.0.99.903 (13 May 2006) + + 13 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.0.99.902-r1.ebuild, +xorg-server-1.0.99.903.ebuild: + Bump to 7.1RC3. + + 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.902-r1.ebuild: + Force update to libxkbui-1.0.2 per dberkholz' suggestion, hopefully fixing + _XkbStrCaseCmp-related issues. + +*xorg-server-1.0.99.902-r1 (02 May 2006) +*xorg-server-1.0.2-r4 (02 May 2006) + + 02 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/CVE-2006-1526-xrender-mitri.patch, -xorg-server-1.0.2-r3.ebuild, + +xorg-server-1.0.2-r4.ebuild, -xorg-server-1.0.99.902.ebuild, + +xorg-server-1.0.99.902-r1.ebuild: + Security bump and remove all affected versions. Please see Bug #130979 for + details. + + 30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.0.99.901-fix-kdrive-build.patch, + -files/1.0.99.901-wrap-sdk-headers.patch, + -xorg-server-1.0.99.901-r1.ebuild: + Pull old 7.1RC ebuild. + + 30 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.99.902.ebuild: + (#131817) Move the nptl diemsg out of an if, since we also use it in the else. + +*xorg-server-1.0.99.902 (29 Apr 2006) + + 29 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.0.99.902.ebuild: + Version bump. Includes quite a few bugfixes. + + 24 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.99.901-r1.ebuild: + We don't need to apply the xf86Sbus.h creation patch anymore. It was + applying successfully by appending itself to the already-complete file in + the tarball. + + 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.99.901-r1.ebuild: + Fix the USE=-xorg build, can't do use_with() on mesa-source because it won't + accept the --without option. + + 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + files/digest-xorg-server-1.0.99.901-r1: + Fix digest. + + 23 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-server-1.0.2-Xprt-build.patch, + +files/1.0.2-Xprint-xprintdir.patch, + +files/xorg-server-1.0.2-xprint-init.patch, + +files/1.0.99.901-Xprint-xprintdir.patch, xorg-server-1.0.2-r3.ebuild, + xorg-server-1.0.99.901-r1.ebuild: + (#128448) Fix xprint (Ed Catmur). Still needs a dep added on xplsprinters + when xprint is in USE, but arches haven't keyworded it yet. + +*xorg-server-1.0.99.901-r1 (21 Apr 2006) + + 21 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.0.99.901-fix-kdrive-build.patch, + +files/1.0.99.901-wrap-sdk-headers.patch, -xorg-server-1.0.99.901.ebuild, + +xorg-server-1.0.99.901-r1.ebuild: + Add option to build kdrive, tiny X servers; also add VIDEO_CARDS settings to + select kdrive servers to build. Add option to build AIGLX with TLS support + (USE=nptl) -- mesa and xorg-server must be in sync on this. Update some + deps: glproto, scrnsaverproto. Don't need to inherit flag-o-matic, x-modular + eclass does this for us. Make Xdmx build its own USE flag, instead of part + of minimal. Force xorg-x11 OpenGL to build, because it needs a newer + glxtokens.h than some binary drivers provide. Add a server_based_install() + function for any actions dependent on which servers get built. Add USE=xorg + to build the Xorg X server, which will be on by default. + + 17 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.2-r3.ebuild: + Drop the mesa version check since it shouldn't be required. + + 17 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.99.901.ebuild: + AIGLX defaults on, don't need to enable it. + +*xorg-server-1.0.99.901 (14 Apr 2006) + + 14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.0.2-r3.ebuild, -xorg-server-1.0.99.2.ebuild, + +xorg-server-1.0.99.901.ebuild: + Bump xorg-server for 7.1RC1. Change Mesa dependencies on all servers to + account for the changed paths in Mesa 6.5-r2. + +*xorg-server-1.0.99.2 (12 Apr 2006) + + 12 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-1.0.99.2.ebuild: + Add a xorg-server snapshot from upstream. This snapshot compiles against Mesa + 6.5 and has AIGLX enabled. + + 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + xorg-server-1.0.2-r3.ebuild: + Add ~x86-fbsd keyword. + + 31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: + Only need that ChangeLog message once. + +*xorg-server-1.0.2-r3 (31 Mar 2006) + + 31 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/xorg-server-1.0.2-64bit-fix-for-glx.patch, + -xorg-server-1.0.2-r2.ebuild, +xorg-server-1.0.2-r3.ebuild: + Really fix 64-bit direct rendering. glcontextmodes.[ch] doesn't include + glheader.h, so it also needs to include dix-config.h. + +*xorg-server-1.0.2-r2 (28 Mar 2006) + + 28 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +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 <dberkholz@gentoo.org>; +files/xprint.init, + xorg-server-1.0.2-r1.ebuild: + (#127425) Install xprint init scripts and directories, patch by Ed Catmur. + + 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r1.ebuild: + Re-add font-adobe-75dpi to RDEPEND, caught by Jonathan Adamczewski. + + 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2-r1.ebuild: + Add deps on compositeproto 0.3 and fixesproto 4.0, otherwise build may break + with overlay window patch. + +*xorg-server-1.0.2-r1 (24 Mar 2006) + + 24 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + -xorg-server-1.0.2.ebuild, +xorg-server-1.0.2-r1.ebuild: + (#127333) Fix crashing of pretty much all gtk+-2 apps. We had the + client-side updates to composite and fixes extensions, but we didn't let the + server know about them, which resulted in lots of BadRequests. + + 23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.0.2.ebuild: + Depends on media-fonts/font-adobe-75dpi for xorgcfg. + + 23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; + +files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch, + +files/1.0.2-try-to-fix-xorgcfg.patch, xorg-server-1.0.2.ebuild: + (#117299) Fix xorgconfig, which was producing an invalid RgbPath setting. + (#117071) Attempt to fix xorgcfg. I couldn't test without /etc/X11/xorg.conf + because it was producing invalid modes on my monitor, but it worked when + xorg.conf was present. + +*xorg-server-1.0.2 (21 Mar 2006) + + 21 Mar 2006; Donnie Berkholz <dberkholz@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, + -files/xorg-server-1.0.1-Sbus.patch, + -files/xorg-server-1.0.1-amd64-fix-for-glx.patch, + -files/xorg-server-1.0.1-backtrace.patch, + +files/xorg-server-1.0.2-Sbus.patch, + +files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch, + -xorg-server-1.0.1-r4.ebuild, +xorg-server-1.0.2.ebuild: + (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This + does NOT affect 6.8.2. + +*xorg-server-1.0.1-r4 (19 Feb 2006) + + 19 Feb 2006; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-1.0.1-r1.ebuild: + No need to specify configure options that are the default. + + 04 Jan 2006; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + -files/fix-xkb-compile-path-2.patch: + Unused file. + + 09 Dec 2005; Donnie Berkholz <dberkholz@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 dberkholz. + +*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 <dberkholz@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 <dberkholz@gentoo.org>; + -xorg-server-0.99.1_p20051013-r1.ebuild, -xorg-server-0.99.2.ebuild: + Pull old versions. + + 29 Oct 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + Add x11-libs/libXtst for dmx. + + 15 Oct 2005; Donnie Berkholz <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-0.99.1_p20051013.ebuild: + Also wrap dmxproto dep in minimal USE. + + 14 Oct 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; +metadata.xml: + Add metadata. + +*xorg-server-0.99.1-r8 (08 Sep 2005) + + 08 Sep 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Wrap pkg_postrm() module dir removal in ! has_version. + + 12 Aug 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-0.99.1-r3.ebuild: + Remove xinerama USE flag; building without it causes major issues. + + 12 Aug 2005; Donnie Berkholz <dberkholz@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 <dberkholz@gentoo.org>; + +xorg-server-0.99.1-r3.ebuild: + Set /usr/bin/Xorg suid so it starts. + + 12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-0.99.1-r2.ebuild: + Fix the patch that mysteriously broke. + + 12 Aug 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 <dberkholz@gentoo.org>; + xorg-server-0.99.1-r1.ebuild: + Add more deps: inputproto, bigreqsproto, xcmiscproto. All reported by aaronf0. + + 10 Aug 2005; Donnie Berkholz <dberkholz@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 <dberkholz@gentoo.org>; + +xorg-server-0.99.1-r1.ebuild: + Rev bump to make sure people get working GL setup. + + 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add GL handling, /usr/lib/opengl, opengl-update, etc. + + 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add dep on x11-proto/kbproto, again from aaronf0. + + 10 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-0.99.1.ebuild: + Add dep on fontsproto, reported by aaronf0 on irc. + + 09 Aug 2005; Donnie Berkholz <dberkholz@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 <dberkholz@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 <dberkholz@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 00000000..d200cc1e --- /dev/null +++ b/x11-base/xorg-server/Manifest @@ -0,0 +1,38 @@ +AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 +AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec +AUX xdm.confd-4 569 RMD160 ca67d3ef00cc423e945ec36c232e1b7caa28c49d SHA1 1959a421f6f38a605c8ce528aa124008ffcc3cb8 SHA256 b316bd388e31d5212fd871acc0b1194a7a17e62114138568199f2baa74ccffba +AUX xdm.initd 5552 RMD160 5736eae5c22e066dc56e1c54ccb1bc43235630e8 SHA1 dd6fa41096957790c1f07f25506018d3481adce4 SHA256 03af1554068bf14588895eb4557962e65a35f87d3f853eba3e584e4eb726c6c6 +AUX xdm.initd-3 5662 RMD160 c215ee58cf2ab3b336f106d3526256abf98f982e SHA1 67aa7501e61f64c1db5306d72bd3b673c94e36a7 SHA256 633a461f484a993f3edbeca42c724883f1c1de3a201bcefd83ae168492bc9d7e +AUX xdm.initd-4 5728 RMD160 8e61ff132820f17113156ef0fd629b83da421c7a SHA1 2e3abdb000fb1cb11024e6101c4bfea6dce9df0c SHA256 d3094433437bcd39d571d6f11bc3d4bf56843864891c45252bd687635f9bd1e4 +AUX xdm.initd-5 5721 RMD160 785b7b3a8fc15439ed650d4ebb4f57cd28063ea2 SHA1 91905d67069cd82b4f39f6a7997ce3763fc70dae SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13ef55bf8a0fefa +AUX xdm.initd-7 5784 RMD160 095b1cadd23281a0d413d06c79103755491e2df2 SHA1 2b8e232605d40eab1357ac5ee171bedd619fd5b2 SHA256 ce10ceec08530ff4498ec408da48c177304a9b8c17f18e99c38b904518d4e0a5 +AUX xdm.initd-8 5702 RMD160 aef613766ffdd803e86914eecf101103bfcde28d SHA1 6667598ff1b0e02df286932bec934eea7e964d2c SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f +AUX xorg-cve-2011-4028+4029.patch 671 RMD160 f9c607b5bfe20259f2adb320b6a1a0819f59f7ab SHA1 84797b66434aa05acc9f6881050d1b46487caf77 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c +AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 RMD160 4648fafbadebc3bc72f6a7fcac56d4e0e7fbf8ef SHA1 381c6a485505641a41337508be50cc829b17aca8 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e +AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 RMD160 e1384bc8e6345bb9bcfa16874e5032e1ad389af6 SHA1 2f7ab2bd9a405b77d6c1538784152b68777705cd SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d +AUX xorg-server-1.11-dix-send-focus-events.patch 2345 RMD160 286ed4b953c329b8bf289cb759ad986a6ab8a240 SHA1 8065f0c170df65665d992f013e2409bb3a62cb3b SHA256 77e1ce80ebf57718b5aa7cfdb1add109c62c8b8728899405c212239b2576d110 +AUX xorg-server-1.11-log-format-fix.patch 13585 RMD160 2c8328b8f2448bc206d358e95ddbb8f7f1ecfa53 SHA1 cfcc384f189237a28104f49f71e70ff613f76c84 SHA256 2a70be6fa9d77c5dbc831cc1891eb7426005a22fc3e03707810a2e07eebd58c0 +AUX xorg-server-1.11-pointer-to-int-cast.patch 2663 RMD160 26d2262f591cf5951756cd6a804fef01a33a6663 SHA1 5a70178b5f51bd949cc1c9afd725a10b0bf00277 SHA256 22409e5f93826b4292cd69786bb032e8843f74e115640488ed31842ffb8784d6 +AUX xorg-server-1.12-disable-acpi.patch 275 RMD160 01244888695fc7928c81c06cc1f4fcd3625fc9de SHA1 555a4d16f38ed54ed9efa6fff9ec230d11362e30 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 +AUX xorg-server-1.12-xf86edidmodes-array-bounds.patch 1219 RMD160 3b16fb00a44d493e452487c08cf4bd161e72545d SHA1 036a7b31c108dc25250a070aaa48be069d5b31c3 SHA256 d781acc0ab5c34ab52d87135346a1346b529dce663779d1e8641252e260d4de2 +AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea +AUX xorg-server-die-ugly-background.patch 453 RMD160 a1d30c378e740f2ad6fef390a8407e67bb131d94 SHA1 204d76bbe37c3cda7a8aea613c0a66314404c705 SHA256 2a16f43ad5c43d528126b44f172322320e54912481eb538ea79f841c4ee1e754 +AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 +AUX xorg-server-glapi_c.patch 2215 RMD160 2df0b6ef296744b0c6951f4ba76bfeeb09196d62 SHA1 5bb85cef608bd75eca7a091fb581c0243cb36598 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b +AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c +DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5 +DIST xorg-server-1.11.3.tar.bz2 4946629 RMD160 1953ea617911cdbbd56152272034e60844fae3bc SHA1 1ca113eb8d371539467518319aab867f20722930 SHA256 d3852243a42e1d7013ff2b89ce038dfcadcf86ba34ef4f16bcf85e7ebce28918 +DIST xorg-server-1.11.4.tar.bz2 4900810 RMD160 26eafdda9e7c9e21e606281dacc13e67d0144eef SHA1 adb5b0bf95a943385c08f826a647871aa1d8d6eb SHA256 3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc +DIST xorg-server-1.12.0.tar.bz2 5568563 RMD160 04fae4bc77b5dc3ccdca1a0ba10c5c4069b6df7d SHA1 5f48db767f71e9f58ded6ff356f3b8340820e524 SHA256 280a14c5de8697a4aab18dca85429671286e69e5ada0c1535f03666e56f07799 +DIST xorg-server-1.12.2.tar.bz2 5431841 RMD160 47530836ebe44e8823848fb87ef979c7dd805f66 SHA1 2edb151d39571dc0fcdedc299ea0a77fe6bfc076 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5 +DIST xorg-server-1.12.3.tar.bz2 5478028 RMD160 06d0ab8c6be2d0fc0d8510a5cdaf718ae39a72d6 SHA1 f3f3d59f3c5e15459152987ffc644f06a0d1374f SHA256 3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe +DIST xorg-server-1.12.4.tar.bz2 5444761 RMD160 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983 SHA1 6d616874f9c7677bda08dc073c03f83e78fbc585 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 +EBUILD xorg-server-1.10.4.ebuild 7692 RMD160 9e4e33b87ecd97ef80fa4e34e0cdea69a514f1a1 SHA1 442b86809408421820c2f1e2fcc6fb8c91b0f59b SHA256 3dc3d1344446db9c653db3ee21f43160179ed8ab8eb1e4b9e70bdfec575995a0 +EBUILD xorg-server-1.11.3.ebuild 7387 RMD160 48e996aad267c77625c680bfadbd8bc040105994 SHA1 c1252ca932fe2601dbd1a42be9faa7e94f32a036 SHA256 95e14bd41e9a1b8a0951f589ca43615fc8d61a4c24f05845e80c43be356d8e57 +EBUILD xorg-server-1.11.4-r1.ebuild 7834 RMD160 9e200467460bd6f9f7f25b1ea1ca5d3e36546fba SHA1 43965b03a9b79232f543e811a64bb70f9e70a11f SHA256 dfaf2b67a4ae65ea421081b2ad1a3e31bf25bde77ed644019dd58dc09990267c +EBUILD xorg-server-1.12.0-r1.ebuild 7432 RMD160 703a1ca39b4869b4d6d745f8214f2afe5f5c6b49 SHA1 a5f5b618b130947105ab80fa4cda426ef61d347f SHA256 9e4fbd086d127172fe248bf1c5fb0e22d65bb6d091f5114658173d775d7381ca +EBUILD xorg-server-1.12.2.ebuild 7417 RMD160 cfeb8ef26694eebcde72a7f1310f696cec644714 SHA1 131e26099e05735a572e227a1a4441a3c5de3cda SHA256 065da71a9b0ec004dc73d6eff1729d4f723e7bc83197be2578bd61935d704d69 +EBUILD xorg-server-1.12.3.ebuild 7380 RMD160 9267a8bc1c8bacd9413e0c3fcc9fa249076f5ca4 SHA1 51f327ef6571266c6397221eaa8ff08e56a066c5 SHA256 d0f670365989ea2eb38cc244d2430e1ccabd177ea12d08d296af1e98c07d16e2 +EBUILD xorg-server-1.12.4.ebuild 7380 RMD160 9267a8bc1c8bacd9413e0c3fcc9fa249076f5ca4 SHA1 51f327ef6571266c6397221eaa8ff08e56a066c5 SHA256 d0f670365989ea2eb38cc244d2430e1ccabd177ea12d08d296af1e98c07d16e2 +MISC ChangeLog 116761 RMD160 c20c71b1b379e79052c551b0369826a617eec4f8 SHA1 8e6d350ca7139a00b0182efa129274f8fd97e8a7 SHA256 7c727030633fe244e12f75560976ffeefa09c9f554f89974780d413f1ac4cad5 +MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1 new file mode 100644 index 00000000..365664e6 --- /dev/null +++ b/x11-base/xorg-server/files/xdm-setup.initd-1 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ + +depend() { + need localmount +} + +start() { + if get_bootparam "nox" ; then + touch /etc/.noxdm + fi +} diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-3 new file mode 100644 index 00000000..9c560bb1 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.confd-3 @@ -0,0 +1,16 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | kdm-4.3 | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +# +# KDE-specific note: +# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3". +# You can find possible versions by looking at the directories in /usr/kde/. +# - Else, if you are using KDE 3 enter "kdm-3.5" +# - Else, if you are using KDE 4 enter "kdm" without a version +DISPLAYMANAGER="xdm"
\ No newline at end of file diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4 new file mode 100644 index 00000000..de0a7cbf --- /dev/null +++ b/x11-base/xorg-server/files/xdm.confd-4 @@ -0,0 +1,10 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | lxdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="xdm" diff --git a/x11-base/xorg-server/files/xdm.initd b/x11-base/xorg-server/files/xdm.initd new file mode 100755 index 00000000..988becf6 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd @@ -0,0 +1,209 @@ +#!/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/xdm.initd,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota + before alsasound + + # Start before X + use consolekit xfs + @HALD_DEPEND@ +} + +setup_dm() { + local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')" + + # Load our root path from profile.env + # Needed for kdm + PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")" + + case "${MY_XDM}" in + kdm|kde) + EXE="$(which kdm)" + PIDFILE=/var/run/kdm.pid + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ "${EXE}" = "" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE= NAME= PIDFILE= + setup_dm + + if [ -f /etc/.noxdm ] ; then + einfo "Skipping ${EXE}, /etc/.noxdm found" + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ] ; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>/dev/null + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local retval=0 + local curvt= + if [ -t 0 ] ; then + if type fgconsole >/dev/null 2>/dev/null ; then + curvt="$(fgconsole 2>/dev/null)" + else + curvt="$(tty)" + case "${curvt}" in + /dev/ttyv[0-9]*) curvt="${curvt#/dev/ttyv*}" ;; + *) curvt= ;; + esac + fi + fi + local myexe="$(get_options "service")" + local myname="$(get_options "name")" + local mypidfile="$(get_options "pidfile")" + local myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}" ; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=$? + fi + + # switch back to original vt + if [ -n "${curvt}" ] ; then + if type chvt >/dev/null 2>/dev/null ; then + chvt "${curvt}" + else + vidcontrol -s "$((${curvt} + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-3 new file mode 100644 index 00000000..7e2da1a7 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-3 @@ -0,0 +1,218 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.3 2011/11/01 22:53:09 hwoarang Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota + before alsasound + + # Start before X + use consolekit xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE="$(which kdm)" + PIDFILE=/var/run/kdm.pid + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-4 b/x11-base/xorg-server/files/xdm.initd-4 new file mode 100644 index 00000000..d20265e2 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-4 @@ -0,0 +1,220 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-4,v 1.1 2011/11/16 21:49:59 chithanh Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota + after dbus + before alsasound + + # Start before X + use consolekit xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE="$(which kdm)" + PIDFILE=/var/run/kdm.pid + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-5 b/x11-base/xorg-server/files/xdm.initd-5 new file mode 100644 index 00000000..c152e40e --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-5 @@ -0,0 +1,219 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-5,v 1.1 2011/11/24 13:09:40 chithanh Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE="$(which kdm)" + PIDFILE=/var/run/kdm.pid + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-7 b/x11-base/xorg-server/files/xdm.initd-7 new file mode 100644 index 00000000..51fc7004 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-7 @@ -0,0 +1,220 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-7,v 1.1 2012/03/20 16:02:51 ssuominen Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + # (#366753) starting keymaps after X causes problems + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE="$(which kdm)" + PIDFILE=/var/run/kdm.pid + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xdm.initd-8 b/x11-base/xorg-server/files/xdm.initd-8 new file mode 100644 index 00000000..539cac10 --- /dev/null +++ b/x11-base/xorg-server/files/xdm.initd-8 @@ -0,0 +1,216 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $ + +# This is here to serve as a note to myself, and future developers. +# +# Any Display manager (gdm,kdm,xdm) has the following problem: if +# it is started before any getty, and no vt is specified, it will +# usually run on vt2. When the getty on vt2 then starts, and the +# DM is already started, the getty will take control of the keyboard, +# leaving us with a "dead" keyboard. +# +# Resolution: add the following line to /etc/inittab +# +# x:a:once:/etc/X11/startDM.sh +# +# and have /etc/X11/startDM.sh start the DM in daemon mode if +# a lock is present (with the info of what DM should be started), +# else just fall through. +# +# How this basically works, is the "a" runlevel is a additional +# runlevel that you can use to fork processes with init, but the +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM.sh will only be +# run when we specify it to run, thus eliminating respawning +# startDM.sh when "xdm" is not added to the default runlevel, as was +# done previously. +# +# This script then just calls "telinit a", and init will run +# /etc/X11/startDM.sh after the current runlevel completes (this +# script should only be added to the actual runlevel the user is +# using). +# +# Martin Schlemmer +# aka Azarah +# 04 March 2002 + +depend() { + need localmount xdm-setup + + # this should start as early as possible + # we can't do 'before *' as that breaks it + # (#139824) Start after ypbind and autofs for network authentication + # (#145219 #180163) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + # (#291269) Start after quota, since some dm need readable home + # (#390609) gdm-3 will fail when dbus is not running + # (#366753) starting keymaps after X causes problems + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + # Start before X + use consolekit dbus xfs +} + +setup_dm() { + local MY_XDM + + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') + + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + + NAME= + case "${MY_XDM}" in + kdm|kde) + EXE=/usr/bin/kdm + PIDFILE=/var/run/kdm.pid + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + lxdm) + EXE=/usr/sbin/lxdm-binary + PIDFILE=/var/run/lxdm.pid + START_STOP_ARGS="--background" + ;; + lightdm) + EXE=/usr/sbin/lightdm + PIDFILE=/var/run/lightdm.pid + START_STOP_ARGS="--background" + ;; + *) + # first find out if there is such executable + EXE="$(command -v ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ -z "${EXE}" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." + fi + ;; + esac + + if ! [ -x "${EXE}" ]; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + if ! [ -x "/usr/bin/xdm" ]; then + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," + echo " or install x11-apps/xdm package" + eend 255 + fi + fi +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab + elif [ -e /etc/ttys ] ; then + grep -q "^ttyv$(($1 - 1))" /etc/ttys + else + return 1 + fi +} + +start() { + local EXE NAME PIDFILE + setup_dm + + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." + rm /etc/.noxdm + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + + # save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + save_options "start_stop_args" "${START_STOP_ARGS}" + + if [ -n "${CHECKVT-y}" ] ; then + if vtstatic "${CHECKVT:-7}" ; then + if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then + ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" + telinit a >/dev/null 2>&1 + return 0 + else + eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" + return 1 + fi + fi + fi + + /etc/X11/startDM.sh + eend 0 +} + +stop() { + local curvt retval + + retval=0 + if [ -t 0 ]; then + if type fgconsole >/dev/null 2>&1; then + curvt=$(fgconsole 2>/dev/null) + else + curvt=$(tty) + case "${curvt}" in + /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; + *) curvt= ;; + esac + fi + fi + local myexe myname mypidfile myservice + myexe=$(get_options "service") + myname=$(get_options "name") + mypidfile=$(get_options "pidfile") + myservice=${myexe##*/} + + [ -z "${myexe}" ] && return 0 + + ebegin "Stopping ${myservice}" + + if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then + start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ + ${mypidfile:+--pidfile} ${mypidfile} \ + ${myname:+--name} ${myname} + retval=${?} + fi + + # switch back to original vt + if [ -n "${curvt}" ]; then + if type chvt >/dev/null 2>&1; then + chvt "${curvt}" + else + vidcontrol -s "$((curvt + 1))" + fi + fi + + eend ${retval} "Error stopping ${myservice}" + return ${retval} +} + +# vim: set ts=4 : diff --git a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch new file mode 100644 index 00000000..66e77f66 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch @@ -0,0 +1,22 @@ +diff --git a/os/utils.c b/os/utils.c +index e8ecb71..18ff1ca 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -297,7 +297,7 @@ LockServer(void) + FatalError("Could not create lock file in %s\n", tmp); + (void) sprintf(pid_str, "%10ld\n", (long)getpid()); + (void) write(lfd, pid_str, 11); +- (void) chmod(tmp, 0444); ++ (void) fchmod(lfd, 0444); + (void) close(lfd); + + /* +@@ -318,7 +318,7 @@ LockServer(void) + /* + * Read the pid from the existing file + */ +- lfd = open(LockFile, O_RDONLY); ++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); + if (lfd < 0) { + unlink(tmp); + FatalError("Can't read lock file %s\n", LockFile); diff --git a/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch new file mode 100644 index 00000000..facb9727 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-disable-tests-without-ddx.patch @@ -0,0 +1,64 @@ +diff -ur a/test/Makefile.am b/test/Makefile.am +--- a/test/Makefile.am 2011-07-15 15:26:40.000000000 +0200 ++++ b/test/Makefile.am 2012-01-02 01:03:15.232740535 +0100 +@@ -1,21 +1,32 @@ + if ENABLE_UNIT_TESTS + if HAVE_LD_WRAP +-SUBDIRS= . xi2 +-noinst_PROGRAMS = xkb input xtest list misc fixes ++SUBDIRS= . ++noinst_PROGRAMS = list ++if XORG ++# Tests that require at least some DDX functions in order to fully link ++# For now, requires xf86 ddx, could be adjusted to use another ++SUBDIRS += xi2 ++noinst_PROGRAMS += xkb input xtest misc fixes ++endif + check_LTLIBRARIES = libxservertest.la + + TESTS=$(noinst_PROGRAMS) + + AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ +-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \ +- -I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \ ++INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw ++if XORG ++INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \ ++ -I$(top_srcdir)/hw/xfree86/ddc \ + -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ + -I$(top_srcdir)/hw/xfree86/ramdac ++endif + TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) + ++if XORG + if SPECIAL_DTRACE_OBJECTS + TEST_LDADD += $(OS_LIB) $(DIX_LIB) + endif ++endif + + xkb_LDADD=$(TEST_LDADD) + input_LDADD=$(TEST_LDADD) +@@ -24,9 +35,10 @@ + misc_LDADD=$(TEST_LDADD) + fixes_LDADD=$(TEST_LDADD) + ++libxservertest_la_LIBADD = $(XSERVER_LIBS) ++if XORG + nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c +-libxservertest_la_LIBADD = \ +- $(XSERVER_LIBS) \ ++libxservertest_la_LIBADD += \ + $(top_builddir)/hw/xfree86/loader/libloader.la \ + $(top_builddir)/hw/xfree86/os-support/libxorgos.la \ + $(top_builddir)/hw/xfree86/common/libcommon.la \ +@@ -36,7 +48,9 @@ + $(top_builddir)/hw/xfree86/ramdac/libramdac.la \ + $(top_builddir)/hw/xfree86/ddc/libddc.la \ + $(top_builddir)/hw/xfree86/i2c/libi2c.la \ +- $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ ++ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la ++endif ++libxservertest_la_LIBADD += \ + $(top_builddir)/mi/libmi.la \ + $(top_builddir)/os/libos.la \ + @XORG_LIBS@ diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch new file mode 100644 index 00000000..d548c898 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-dix-pointerrootwin-send-focusin.patch @@ -0,0 +1,27 @@ +From 3ce102c362cadcd7087bdcf48440d9498eaf77d0 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 05 Jan 2012 12:08:01 +0000 +Subject: dix: on PointerRootWin send a FocusIn to the sprite window too + +XTS XSetDeviceFocus-7 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +--- +diff --git a/dix/enterleave.c b/dix/enterleave.c +index 2b8c7c5..89a82ab 100644 +--- a/dix/enterleave.c ++++ b/dix/enterleave.c +@@ -1299,7 +1299,10 @@ DeviceFocusEvents(DeviceIntPtr dev, + for (i = 0; i < nscreens; i++) + DeviceFocusEvent(dev, XI_FocusIn, mode, in, screenInfo.screens[i]->root); + if (to == PointerRootWin) ++ { + DeviceFocusInEvents(dev, GetCurrentRootWindow(dev), sprite->win, mode, NotifyPointer); ++ DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyPointer, sprite->win); ++ } + } + else + { +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch new file mode 100644 index 00000000..e9ba0a7c --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-dix-send-focus-events.patch @@ -0,0 +1,48 @@ +From a125aabda3a5cf27aa98cb61f16e49280b66f451 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 05 Jan 2012 12:02:51 +0000 +Subject: dix: send focus events to the immediate parent (#44079) + +For a transition from windows A to B, A->parent did not receive an event. +DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual +window, not it's parent. + +X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079> + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +--- +diff --git a/dix/enterleave.c b/dix/enterleave.c +index a39e640..2b8c7c5 100644 +--- a/dix/enterleave.c ++++ b/dix/enterleave.c +@@ -1292,7 +1292,7 @@ DeviceFocusEvents(DeviceIntPtr dev, + NotifyPointer); + DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from); + /* next call catches the root too, if the screen changed */ +- DeviceFocusOutEvents(dev, from->parent, NullWindow, mode, ++ DeviceFocusOutEvents(dev, from, NullWindow, mode, + NotifyNonlinearVirtual); + } + /* Notify all the roots */ +@@ -1321,7 +1321,7 @@ DeviceFocusEvents(DeviceIntPtr dev, + if (IsParent(to, from)) + { + DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyAncestor, from); +- DeviceFocusOutEvents(dev, from->parent, to, mode, ++ DeviceFocusOutEvents(dev, from, to, mode, + NotifyVirtual); + DeviceFocusEvent(dev, XI_FocusIn, mode, NotifyInferior, to); + if ((IsParent(to, sprite->win)) && +@@ -1353,7 +1353,7 @@ DeviceFocusEvents(DeviceIntPtr dev, + NotifyPointer); + DeviceFocusEvent(dev, XI_FocusOut, mode, NotifyNonlinear, from); + if (from->parent != NullWindow) +- DeviceFocusOutEvents(dev, from->parent, common, mode, ++ DeviceFocusOutEvents(dev, from, common, mode, + NotifyNonlinearVirtual); + if (to->parent != NullWindow) + DeviceFocusInEvents(dev, common, to, mode, NotifyNonlinearVirtual); +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch new file mode 100644 index 00000000..61e7eae6 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-log-format-fix.patch @@ -0,0 +1,441 @@ +Description: extreme backport of upstream log format fixes (CVE-2012-2118). +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/996250 +Origin: http://patchwork.freedesktop.org/patch/10001/ + +Index: xorg-server-1.11.4/os/log.c +=================================================================== +--- xorg-server-1.11.4.orig/os/log.c 2012-05-06 11:03:17.621808123 -0700 ++++ xorg-server-1.11.4/os/log.c 2012-05-06 11:03:18.057814189 -0700 +@@ -167,6 +167,12 @@ + #ifndef X_NOT_IMPLEMENTED_STRING + #define X_NOT_IMPLEMENTED_STRING "(NI)" + #endif ++#ifndef X_DEBUG_STRING ++#define X_DEBUG_STRING "(DB)" ++#endif ++#ifndef X_NONE_STRING ++#define X_NONE_STRING "" ++#endif + + /* + * LogInit is called to start logging to a file. It is also called (with +@@ -223,7 +229,7 @@ + * needed. + */ + if (saveBuffer && bufferSize > 0) { +- free(saveBuffer); /* Must be free(), not free() */ ++ free(saveBuffer); + saveBuffer = NULL; + bufferSize = 0; + } +@@ -265,36 +271,19 @@ + } + + /* This function does the actual log message writes. */ +- +-void +-LogVWrite(int verb, const char *f, va_list args) ++static void ++LogSWrite(int verb, const char *buf, size_t len, Bool end_line) + { +- static char tmpBuffer[1024]; +- int len = 0; + static Bool newline = TRUE; + +- if (newline) { +- sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0); +- len = strlen(tmpBuffer); +- if (logFile) +- fwrite(tmpBuffer, len, 1, logFile); +- } +- +- /* +- * Since a va_list can only be processed once, write the string to a +- * buffer, and then write the buffer out to the appropriate output +- * stream(s). +- */ +- if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) { +- vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args); +- len = strlen(tmpBuffer); +- } +- newline = (tmpBuffer[len-1] == '\n'); +- if ((verb < 0 || logVerbosity >= verb) && len > 0) +- fwrite(tmpBuffer, len, 1, stderr); +- if ((verb < 0 || logFileVerbosity >= verb) && len > 0) { ++ if (verb < 0 || logVerbosity >= verb) ++ fwrite(buf, len, 1, stderr); ++ if (verb < 0 || logFileVerbosity >= verb) { + if (logFile) { +- fwrite(tmpBuffer, len, 1, logFile); ++ if (newline) ++ fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0); ++ newline = end_line; ++ fwrite(buf, len, 1, logFile); + if (logFlush) { + fflush(logFile); + #ifndef WIN32 +@@ -311,13 +300,19 @@ + FatalError("realloc() failed while saving log messages\n"); + } + bufferUnused -= len; +- memcpy(saveBuffer + bufferPos, tmpBuffer, len); ++ memcpy(saveBuffer + bufferPos, buf, len); + bufferPos += len; + } + } + } + + void ++LogVWrite(int verb, const char *f, va_list args) ++{ ++ return LogVMessageVerb(X_NONE, verb, f, args); ++} ++ ++void + LogWrite(int verb, const char *f, ...) + { + va_list args; +@@ -327,60 +322,75 @@ + va_end(args); + } + +-void +-LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) ++/* Returns the Message Type string to prepend to a logging message, or NULL ++ * if the message will be dropped due to insufficient verbosity. */ ++static const char * ++LogMessageTypeVerbString(MessageType type, int verb) + { +- const char *s = X_UNKNOWN_STRING; +- char tmpBuf[1024]; ++ if (type == X_ERROR) ++ verb = 0; + +- /* Ignore verbosity for X_ERROR */ +- if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) { +- switch (type) { +- case X_PROBED: +- s = X_PROBE_STRING; +- break; +- case X_CONFIG: +- s = X_CONFIG_STRING; +- break; +- case X_DEFAULT: +- s = X_DEFAULT_STRING; +- break; +- case X_CMDLINE: +- s = X_CMDLINE_STRING; +- break; +- case X_NOTICE: +- s = X_NOTICE_STRING; +- break; +- case X_ERROR: +- s = X_ERROR_STRING; +- if (verb > 0) +- verb = 0; +- break; +- case X_WARNING: +- s = X_WARNING_STRING; +- break; +- case X_INFO: +- s = X_INFO_STRING; +- break; +- case X_NOT_IMPLEMENTED: +- s = X_NOT_IMPLEMENTED_STRING; +- break; +- case X_UNKNOWN: +- s = X_UNKNOWN_STRING; +- break; +- case X_NONE: +- s = NULL; +- break; +- } ++ if (logVerbosity < verb && logFileVerbosity < verb) ++ return NULL; + +- /* if s is not NULL we need a space before format */ +- snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "", +- s ? " " : "", +- format); +- LogVWrite(verb, tmpBuf, args); ++ switch (type) { ++ case X_PROBED: ++ return X_PROBE_STRING; ++ case X_CONFIG: ++ return X_CONFIG_STRING; ++ case X_DEFAULT: ++ return X_DEFAULT_STRING; ++ case X_CMDLINE: ++ return X_CMDLINE_STRING; ++ case X_NOTICE: ++ return X_NOTICE_STRING; ++ case X_ERROR: ++ return X_ERROR_STRING; ++ case X_WARNING: ++ return X_WARNING_STRING; ++ case X_INFO: ++ return X_INFO_STRING; ++ case X_NOT_IMPLEMENTED: ++ return X_NOT_IMPLEMENTED_STRING; ++ case X_UNKNOWN: ++ return X_UNKNOWN_STRING; ++ case X_NONE: ++ return X_NONE_STRING; ++ case X_DEBUG: ++ return X_DEBUG_STRING; ++ default: ++ return X_UNKNOWN_STRING; + } + } + ++void ++LogVMessageVerb(MessageType type, int verb, const char *format, va_list args) ++{ ++ const char *type_str; ++ char buf[1024]; ++ const size_t size = sizeof(buf); ++ Bool newline; ++ size_t len = 0; ++ ++ type_str = LogMessageTypeVerbString(type, verb); ++ if (!type_str) ++ return; ++ ++ /* if type_str is not "", prepend it and ' ', to message */ ++ if (type_str[0] != '\0') ++ len += Xscnprintf(&buf[len], size - len, "%s ", type_str); ++ ++ if (size - len > 1) ++ len += Xvscnprintf(&buf[len], size - len, format, args); ++ ++ /* Force '\n' at end of truncated line */ ++ if (size - len == 1) ++ buf[len - 1] = '\n'; ++ ++ newline = (buf[len - 1] == '\n'); ++ LogSWrite(verb, buf, len, newline); ++} ++ + /* Log message with verbosity level specified. */ + void + LogMessageVerb(MessageType type, int verb, const char *format, ...) +@@ -404,6 +414,49 @@ + } + + void ++LogVHdrMessageVerb(MessageType type, int verb, const char *msg_format, ++ va_list msg_args, const char *hdr_format, va_list hdr_args) ++{ ++ const char *type_str; ++ char buf[1024]; ++ const size_t size = sizeof(buf); ++ Bool newline; ++ size_t len = 0; ++ ++ type_str = LogMessageTypeVerbString(type, verb); ++ if (!type_str) ++ return; ++ ++ /* if type_str is not "", prepend it and ' ', to message */ ++ if (type_str[0] != '\0') ++ len += Xscnprintf(&buf[len], size - len, "%s ", type_str); ++ ++ if (hdr_format && size - len > 1) ++ len += Xvscnprintf(&buf[len], size - len, hdr_format, hdr_args); ++ ++ if (msg_format && size - len > 1) ++ len += Xvscnprintf(&buf[len], size - len, msg_format, msg_args); ++ ++ /* Force '\n' at end of truncated line */ ++ if (size - len == 1) ++ buf[len - 1] = '\n'; ++ ++ newline = (buf[len - 1] == '\n'); ++ LogSWrite(verb, buf, len, newline); ++} ++ ++void ++LogHdrMessageVerb(MessageType type, int verb, const char *msg_format, ++ va_list msg_args, const char *hdr_format, ...) ++{ ++ va_list hdr_args; ++ ++ va_start(hdr_args, hdr_format); ++ LogVHdrMessageVerb(type, verb, msg_format, msg_args, hdr_format, hdr_args); ++ va_end(hdr_args); ++} ++ ++void + AbortServer(void) _X_NORETURN; + void + SigAbortServer(int signo) _X_NORETURN; +Index: xorg-server-1.11.4/include/Xprintf.h +=================================================================== +--- xorg-server-1.11.4.orig/include/Xprintf.h 2012-05-06 10:32:42.436348011 -0700 ++++ xorg-server-1.11.4/include/Xprintf.h 2012-05-06 11:03:18.057814189 -0700 +@@ -66,4 +66,16 @@ + # define vasprintf Xvasprintf + #endif + ++/* ++ * These functions provide a portable implementation of the linux kernel ++ * scnprintf & vscnprintf routines that return the number of bytes actually ++ * copied during a snprintf, (excluding the final '\0'). ++ */ ++extern _X_EXPORT int ++Xscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, ...) ++_X_ATTRIBUTE_PRINTF(3,4); ++extern _X_EXPORT int ++Xvscnprintf(char *s, int n, const char * _X_RESTRICT_KYWD fmt, va_list va) ++_X_ATTRIBUTE_PRINTF(3,0); ++ + #endif /* XPRINTF_H */ +Index: xorg-server-1.11.4/os/xprintf.c +=================================================================== +--- xorg-server-1.11.4.orig/os/xprintf.c 2012-05-06 10:32:42.472348510 -0700 ++++ xorg-server-1.11.4/os/xprintf.c 2012-05-06 11:03:18.057814189 -0700 +@@ -182,6 +182,50 @@ + return size; + } + ++/** ++ * Varargs snprintf that returns the actual number of bytes (excluding final ++ * '\0') that were copied into the buffer. ++ * This is opposed to the normal sprintf() usually returns the number of bytes ++ * that would have been written. ++ * ++ * @param s buffer to copy into ++ * @param n size of buffer s ++ * @param format printf style format string ++ * @param va variable argument list ++ * @return number of bytes actually copied, excluding final '\0' ++ */ ++int ++Xvscnprintf(char *s, int n, const char *format, va_list args) ++{ ++ int x; ++ if (n == 0) ++ return 0; ++ x = vsnprintf(s, n , format, args); ++ return (x >= n) ? (n - 1) : x; ++} ++ ++/** ++ * snprintf that returns the actual number of bytes (excluding final '\0') that ++ * were copied into the buffer. ++ * This is opposed to the normal sprintf() usually returns the number of bytes ++ * that would have been written. ++ * ++ * @param s buffer to copy into ++ * @param n size of buffer s ++ * @param format printf style format string ++ * @param ... arguments for specified format ++ * @return number of bytes actually copied, excluding final '\0' ++ */ ++int Xscnprintf(char *s, int n, const char *format, ...) ++{ ++ int x; ++ va_list ap; ++ va_start(ap, format); ++ x = Xvscnprintf(s, n, format, ap); ++ va_end(ap); ++ return x; ++} ++ + /* Old api, now deprecated, may be removed in the future */ + char * + Xvprintf(const char *format, va_list va) +Index: xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c +=================================================================== +--- xorg-server-1.11.4.orig/hw/xfree86/common/xf86Helper.c 2012-05-06 10:32:42.488348731 -0700 ++++ xorg-server-1.11.4/hw/xfree86/common/xf86Helper.c 2012-05-06 11:03:18.057814189 -0700 +@@ -1036,25 +1036,13 @@ + xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, + va_list args) + { +- char *tmpFormat; +- + /* Prefix the scrnIndex name to the format string. */ + if (scrnIndex >= 0 && scrnIndex < xf86NumScreens && +- xf86Screens[scrnIndex]->name) { +- tmpFormat = malloc(strlen(format) + +- strlen(xf86Screens[scrnIndex]->name) + +- PREFIX_SIZE + 1); +- if (!tmpFormat) +- return; +- +- snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ", +- xf86Screens[scrnIndex]->name, scrnIndex); +- +- strcat(tmpFormat, format); +- LogVMessageVerb(type, verb, tmpFormat, args); +- free(tmpFormat); +- } else +- LogVMessageVerb(type, verb, format, args); ++ xf86Screens[scrnIndex]->name) ++ LogHdrMessageVerb(type, verb, format, args, "%s(%d): ", ++ xf86Screens[scrnIndex]->name, scrnIndex); ++ else ++ LogVMessageVerb(type, verb, format, args); + } + #undef PREFIX_SIZE + +@@ -1087,15 +1075,18 @@ + xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format, + va_list args) + { +- char *msg; ++ const char *driverName = NULL; ++ const char *deviceName = NULL; + +- if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format) +- == -1) { +- LogVMessageVerb(type, verb, "%s", args); +- } else { +- LogVMessageVerb(type, verb, msg, args); +- free(msg); ++ /* Prefix driver and device names to formatted message. */ ++ if (dev) { ++ deviceName = dev->name; ++ if (dev->drv) ++ driverName = dev->drv->driverName; + } ++ ++ LogHdrMessageVerb(type, verb, format, args, "%s: %s: ", driverName, ++ deviceName); + } + + /* Print input driver message, with verbose level specified directly */ +Index: xorg-server-1.11.4/include/os.h +=================================================================== +--- xorg-server-1.11.4.orig/include/os.h 2012-05-06 11:03:17.621808123 -0700 ++++ xorg-server-1.11.4/include/os.h 2012-05-06 11:03:29.353971366 -0700 +@@ -514,6 +514,7 @@ + X_INFO, /* Informational message */ + X_NONE, /* No prefix */ + X_NOT_IMPLEMENTED, /* Not implemented */ ++ X_DEBUG, /* Debug message */ + X_UNKNOWN = -1 /* unknown -- this must always be last */ + } MessageType; + +@@ -528,6 +529,20 @@ + ...) _X_ATTRIBUTE_PRINTF(3,4); + extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...) + _X_ATTRIBUTE_PRINTF(2,3); ++ ++extern _X_EXPORT void ++LogVHdrMessageVerb(MessageType type, int verb, ++ const char *msg_format, va_list msg_args, ++ const char *hdr_format, va_list hdr_args) ++_X_ATTRIBUTE_PRINTF(3, 0) ++_X_ATTRIBUTE_PRINTF(5, 0); ++extern _X_EXPORT void ++LogHdrMessageVerb(MessageType type, int verb, ++ const char *msg_format, va_list msg_args, ++ const char *hdr_format, ...) ++_X_ATTRIBUTE_PRINTF(3, 0) ++_X_ATTRIBUTE_PRINTF(5, 6); ++ + extern _X_EXPORT void FreeAuditTimer(void); + extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); + extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0); diff --git a/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch b/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch new file mode 100644 index 00000000..beb94a9d --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.11-pointer-to-int-cast.patch @@ -0,0 +1,87 @@ +From b2a4c09507b267495ea5e4c2e05373b323c80edf Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sat, 17 Dec 2011 20:56:59 +0000 +Subject: kdrive/linux: Fix compilation with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast + +Reported-by: Arkadiusz Miśkiewicz <arekm@maven.pl> +Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> +Reviewed-by: Jamey Sharp <jamey@minilop.net> +(cherry picked from commit 1deede3c48d5ac91f50774c79f02afc6e036614e) +--- +diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c +index f5f9d9b..ba2637b 100644 +--- a/hw/kdrive/linux/keyboard.c ++++ b/hw/kdrive/linux/keyboard.c +@@ -692,7 +692,7 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki) + return !Success; + + fd = LinuxConsoleFd; +- ki->driverPrivate = (void *) fd; ++ ki->driverPrivate = (void *) (intptr_t) fd; + + ioctl (fd, KDGKBMODE, &LinuxKbdTrans); + tcgetattr (fd, &LinuxTermios); +@@ -724,7 +724,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki) + if (!ki) + return; + +- fd = (int) ki->driverPrivate; ++ fd = (int) (intptr_t) ki->driverPrivate; + + KdUnregisterFd(ki, fd, FALSE); + ioctl(fd, KDSKBMODE, LinuxKbdTrans); +@@ -753,7 +753,7 @@ LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds) + if (!ki) + return; + +- ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7); ++ ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7); + } + + KdKeyboardDriver LinuxKeyboardDriver = { +diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c +index b6151cd..176e125 100644 +--- a/hw/kdrive/linux/ms.c ++++ b/hw/kdrive/linux/ms.c +@@ -152,7 +152,7 @@ MsEnable (KdPointerInfo *pi) + } + if (KdRegisterFd (port, MsRead, pi)) + return TRUE; +- pi->driverPrivate = (void *)port; ++ pi->driverPrivate = (void *)(intptr_t)port; + + return Success; + +@@ -164,7 +164,7 @@ MsEnable (KdPointerInfo *pi) + static void + MsDisable (KdPointerInfo *pi) + { +- KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); ++ KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE); + } + + static void +diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c +index 465b963..b62d769 100644 +--- a/hw/kdrive/linux/ps2.c ++++ b/hw/kdrive/linux/ps2.c +@@ -159,7 +159,7 @@ Ps2Enable (KdPointerInfo *pi) + return BadAlloc; + } + +- pi->driverPrivate = (void *)fd; ++ pi->driverPrivate = (void *)(intptr_t)fd; + + return Success; + } +@@ -168,7 +168,7 @@ Ps2Enable (KdPointerInfo *pi) + static void + Ps2Disable (KdPointerInfo *pi) + { +- KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); ++ KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE); + } + + static void +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch new file mode 100644 index 00000000..df43dbde --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch @@ -0,0 +1,11 @@ +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2011-10-31 19:40:02.000000000 +0100 ++++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100 +@@ -1624,7 +1624,6 @@ + linux_alpha=yes + ;; + i*86|amd64*|x86_64*|ia64*) +- linux_acpi="yes" + ;; + *) + ;; diff --git a/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch new file mode 100644 index 00000000..8fedc32c --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.12-xf86edidmodes-array-bounds.patch @@ -0,0 +1,35 @@ +Patch by Torsten Kaiser <x11@ariolc.dyndns.org> +taken from https://bugs.freedesktop.org/show_bug.cgi?id=45623 + +diff -ur a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c +--- a/hw/xfree86/modes/xf86EdidModes.c 2012-05-17 19:09:03.000000000 +0200 ++++ b/hw/xfree86/modes/xf86EdidModes.c 2012-05-30 01:27:06.000000000 +0200 +@@ -723,7 +723,13 @@ + 1920, 1200, 75, 0}, { + 1920, 1200, 85, 0}, { + 1920, 1440, 60, 0}, { +-1920, 1440, 75, 0},}; ++1920, 1440, 75, 0}, ++ /* fill up last byte */ ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++ { 0,0,0,0 }, ++}; + + static DisplayModePtr + DDCModesFromEstIII(unsigned char *est) +@@ -732,10 +738,11 @@ + int i, j, m; + + for (i = 0; i < 6; i++) { +- for (j = 7; j > 0; j--) { ++ for (j = 7; j >= 0; j--) { + if (est[i] & (1 << j)) { + m = (i * 8) + (7 - j); +- modes = xf86ModesAdd(modes, ++ if (EstIIIModes[m].w) ++ modes = xf86ModesAdd(modes, + FindDMTMode(EstIIIModes[m].w, + EstIIIModes[m].h, + EstIIIModes[m].r, diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch new file mode 100644 index 00000000..2b05967a --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch @@ -0,0 +1,30 @@ +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index 74016af..9c296f5 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev, + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: ++ switch (dev->device_id) { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[0] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[0] = "nv"; ++ break; ++ default: ++ driverList[0] = "nouveau"; ++ break; ++ } ++ break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; +-- diff --git a/x11-base/xorg-server/files/xorg-server-die-ugly-background.patch b/x11-base/xorg-server/files/xorg-server-die-ugly-background.patch new file mode 100644 index 00000000..db1e2dc4 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-die-ugly-background.patch @@ -0,0 +1,16 @@ +Remove the default root window grey stipple pattern, replacing it with +blackness. + +--- dix/window.c.orig ++++ dix/window.c +@@ -119,8 +119,8 @@ + * + ******/ + +-static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; +-static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; ++static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; ++static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; + + int screenIsSaved = SCREEN_SAVER_OFF; + diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch new file mode 100644 index 00000000..cc80e6ce --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch @@ -0,0 +1,31 @@ +From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 11 Mar 2009 14:02:11 -0400 +Subject: [PATCH] Don't build the ACPI code. + +No good can come of this. +--- + configure.ac | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 72ae67e..04716f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then + case $host_cpu in + ia64*) + linux_ia64=yes +- linux_acpi="yes" + ;; + alpha*) + linux_alpha=yes + ;; + i*86|amd64*|x86_64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.6.1.3 + diff --git a/x11-base/xorg-server/files/xorg-server-glapi_c.patch b/x11-base/xorg-server/files/xorg-server-glapi_c.patch new file mode 100644 index 00000000..e65a969a --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-glapi_c.patch @@ -0,0 +1,78 @@ +From 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 02 Mar 2011 18:21:39 +0000 +Subject: glx: Lobotomize _glapi_get_proc_address + +This isn't a meaningful thing in the indirect glx loader, so just warn +if it ever happens and move on. + +But also, mark it PUBLIC, so if the driver does ever call it we merely +warn instead of aborting because ld.so can't find the symbol. + +Reviewed-by: Dave Airlie <airlied@redhat.com> +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/glx/glapi.c b/glx/glapi.c +index 1814493..79ff6b1 100644 +--- a/glx/glapi.c ++++ b/glx/glapi.c +@@ -54,6 +54,7 @@ + + #include <dix-config.h> + #include <X11/Xfuncproto.h> ++#include <os.h> + #define PUBLIC _X_EXPORT + + #else +@@ -713,43 +714,15 @@ _glapi_add_dispatch( const char * const * function_names, + return offset; + } + +-/** +- * Return pointer to the named function. If the function name isn't found +- * in the name of static functions, try generating a new API entrypoint on +- * the fly with assembly language. ++/* ++ * glXGetProcAddress doesn't exist in the protocol, the drivers never call ++ * this themselves, and neither does the server. warn if it happens though. + */ +-_glapi_proc ++PUBLIC _glapi_proc + _glapi_get_proc_address(const char *funcName) + { +- struct _glapi_function * entry; +- GLuint i; +- +-#ifdef MANGLE +- if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l') +- return NULL; +-#else +- if (funcName[0] != 'g' || funcName[1] != 'l') +- return NULL; +-#endif +- +- /* search extension functions first */ +- for (i = 0; i < NumExtEntryPoints; i++) { +- if (strcmp(ExtEntryTable[i].name, funcName) == 0) { +- return ExtEntryTable[i].dispatch_stub; +- } +- } +- +-#if !defined( XFree86Server ) && !defined( XGLServer ) +- /* search static functions */ +- { +- const _glapi_proc func = get_static_proc_address(funcName); +- if (func) +- return func; +- } +-#endif /* !defined( XFree86Server ) */ +- +- entry = add_function_name(funcName); +- return (entry == NULL) ? NULL : entry->dispatch_stub; ++ ErrorF("_glapi_get_proc_address called!\n"); ++ return NULL; + } + + /** +-- +cgit v0.8.3-6-g21f6 diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf new file mode 100644 index 00000000..5cd8112f --- /dev/null +++ b/x11-base/xorg-server/files/xorg-sets.conf @@ -0,0 +1,6 @@ +# Rebuild all X11 modules (mostly useful after xorg-server ABI change). +[x11-module-rebuild] +class = portage.sets.dbapi.VariableSet +world-candidate = false +variable = CATEGORY +includes = x11-drivers diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml new file mode 100644 index 00000000..587fdba9 --- /dev/null +++ b/x11-base/xorg-server/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>x11</herd> +<use> + <flag name='dmx'>Build the Distributed Multiheaded X server</flag> + <flag name='kdrive'>Build the kdrive X servers</flag> + <flag name='tslib'>Build with tslib support for touchscreen devices</flag> + <flag name='udev'>Enable devices discovery via udev</flag> + <flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag> +</use> +</pkgmetadata> diff --git a/x11-base/xorg-server/xorg-server-1.10.4.ebuild b/x11-base/xorg-server/xorg-server-1.10.4.ebuild new file mode 100644 index 00000000..20523ae1 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.10.4.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2011 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.10.2.ebuild,v 1.6 2011/06/28 21:22:26 ranger Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.10.3 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-1.4 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-4.0.3 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3" + +# dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the +# xorg-2.eclass for next release +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-4.1 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.11 + >=x11-proto/inputproto-1.9.99.902 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.17 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.3 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-disable-acpi.patch + "${FILESDIR}"/${PN}-1.9-nouveau-default.patch + "${FILESDIR}"/${PN}-die-ugly-background.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable tslib xcalibrate) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-3 xdm + newconfd "${FILESDIR}"/xdm.confd-3 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + elog "You should consider reading upgrade guide for this release:" + elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" + echo + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + ewarn + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + ewarn +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.11.3.ebuild b/x11-base/xorg-server/xorg-server-1.11.3.ebuild new file mode 100644 index 00000000..5c6edd25 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.11.3.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2011 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.11.2-r2.ebuild,v 1.1 2011/11/24 13:09:40 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.10.3 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-1.4 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-1.9.99.902 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-disable-acpi.patch + "${FILESDIR}"/${PN}-1.9-nouveau-default.patch + "${FILESDIR}"/${PN}-die-ugly-background.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-5 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + ewarn + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + ewarn +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild new file mode 100644 index 00000000..4c33dbde --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.11.4-r1.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# made using "/var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.4.ebuild,v 1.2 2012/03/02 18:02:14 swift Exp" +# on top of which applied changes introduced up to 1.11.4-r1 v. 1.8 + +EAPI=4 + +XORG_DOC=doc +XORG_EAUTORECONF=yes +inherit flag-o-matic xorg-2 multilib versionator +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.10.3 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-1.9.99.902 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-disable-acpi.patch + "${FILESDIR}"/${PN}-1.9-nouveau-default.patch + "${FILESDIR}"/${PN}-die-ugly-background.patch + "${FILESDIR}"/${PN}-1.11-disable-tests-without-ddx.patch + "${FILESDIR}"/${PN}-1.11-dix-pointerrootwin-send-focusin.patch + "${FILESDIR}"/${PN}-1.11-dix-send-focus-events.patch + "${FILESDIR}"/${PN}-1.11-log-format-fix.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + # Make breakage less obvious, bug #402285. + replace-flags -O3 -O2 +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-5 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + ewarn + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + ewarn +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.12.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.12.0-r1.ebuild new file mode 100644 index 00000000..675a4781 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.12.0-r1.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2012 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.12.0-r1.ebuild,v 1.1 2012/03/20 16:02:52 ssuominen Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + # Make breakage less obvious, bug #402285. + replace-flags -O3 -O2 +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-7 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + echo + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + echo +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild new file mode 100644 index 00000000..0ce6c5df --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.12.2.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2012 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.12.2.ebuild,v 1.6 2012/06/28 21:06:51 maekke Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + "${FILESDIR}"/${PN}-1.12-xf86edidmodes-array-bounds.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +pkg_setup() { + xorg-2_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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-7 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + echo + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + echo +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.12.3.ebuild b/x11-base/xorg-server/xorg-server-1.12.3.ebuild new file mode 100644 index 00000000..2b8278f0 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.12.3.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2012 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.12.3.ebuild,v 1.1 2012/07/12 13:50:29 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +src_configure() { + # 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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-8 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + echo + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + echo +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} diff --git a/x11-base/xorg-server/xorg-server-1.12.4.ebuild b/x11-base/xorg-server/xorg-server-1.12.4.ebuild new file mode 100644 index 00000000..2b8278f0 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.12.4.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2012 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.12.3.ebuild,v 1.1 2012/07/12 13:50:29 chithanh Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + +RDEPEND=">=app-admin/eselect-opengl-1.0.8 + dev-libs/openssl + media-libs/freetype + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont-1.4.2 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/pixman-0.21.8 + >=x11-libs/xtrans-1.2.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-7.8_rc[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=sys-fs/udev-150 ) + >=x11-apps/xinit-1.3 + selinux? ( sec-policy/selinux-xserver )" + +DEPEND="${RDEPEND} + sys-devel/flex + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/compositeproto-0.4 + >=x11-proto/damageproto-1.1 + >=x11-proto/fixesproto-5.0 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/glproto-1.4.14 + >=x11-proto/inputproto-2.1.99.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/xextproto-7.1.99 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/xproto-7.0.22 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.6 + >=x11-libs/libdrm-2.4.20 + )" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." +} + +src_configure() { + # 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-install-setuid needed because sparcs default off + # NOTE: fop is used for doc generating ; and i have no idea if gentoo + # package it somewhere + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable tslib) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal install-libxf86config) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable nptl glx-tls) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontrootdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --disable-config-hal + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + ) + + # Xorg-server requires includes from OS mesa which are not visible for + # users of binary drivers. + mkdir -p "${T}/mesa-symlinks/GL" + for i in gl glx glxmd glxproto glxtokens; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + for i in glext glxext; do + ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die + done + append-cppflags "-I${T}/mesa-symlinks" + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-8 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm.example + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +CONFD_XDM="${ROOT}/etc/conf.d/xdm" +pkg_preinst() { + # backup user /etc/conf.d/xdm + if [ -f "${CONFD_XDM}" ]; then + cp -p "${CONFD_XDM}" "${CONFD_XDM}.backup" + fi +} + +pkg_postinst() { + # Copy config file over + if [ -f "${CONFD_XDM}.backup" ]; then + cp ${CONFD_XDM}.backup ${CONFD_XDM} -p + else + if [ -f "${CONFD_XDM}.example" ] && [ ! -f "${CONFD_XDM}" ]; then + cp ${CONFD_XDM}.example ${CONFD_XDM} -p + fi + fi + + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + eselect opengl set xorg-x11 --use-old + + if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then + ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" + ewarn "because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + ewarn "category using this command:" + ewarn " emerge portage-utils; qlist -I -C x11-drivers/" + ewarn "or using sets from portage-2.2:" + ewarn " emerge @x11-module-rebuild" + fi + + echo + ewarn "/etc/conf.d/xdm is no longer provided, /etc/conf.d/xdm.example is" + ewarn "Your current /etc/conf.d/xdm has been used as new default" + echo +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + 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/xorg-x11/extensions + local x="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions + fi + done + eend 0 +} + +server_based_install() { + if ! use xorg; 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 +} |