diff options
| author |   Matt Turner <mattst88@gmail.com> | 2012-05-10 14:08:51 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-05-10 14:08:51 -0400 |
| commit | 9baa869a425e367b0912e05c076daef4a12cfc8a (patch) | |
| tree | 5f3fa32510ee22514efb64e5ca6e6b81e4641b52 | |
| parent | xorg-server: Sync 1.9 with portage until we can move to 1.10 and beyond (diff) | |
| download | loongson-9baa869a425e367b0912e05c076daef4a12cfc8a.tar.gz loongson-9baa869a425e367b0912e05c076daef4a12cfc8a.tar.bz2 loongson-9baa869a425e367b0912e05c076daef4a12cfc8a.zip | |
x11-base/xorg-server: replace with 9999 ebuild and updated patches
17 files changed, 391 insertions, 1556 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog deleted file mode 100644 index 01538b2..0000000 --- a/x11-base/xorg-server/ChangeLog +++ /dev/null @@ -1,1175 +0,0 @@ -# ChangeLog for x11-base/xorg-server -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.219 2007/02/19 21:34:17 joshuabaergen Exp $ - -*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 index 79e0d21..3e64508 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,14 +1,10 @@ -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.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093ee2775d63f58a43d2d9ffcc709d0b9181749912b70 -AUX xorg-cve-2011-4028+4029.patch 671 RMD160 f9c607b5bfe20259f2adb320b6a1a0819f59f7ab SHA1 84797b66434aa05acc9f6881050d1b46487caf77 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c -AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea -AUX xorg-server-1.9.5-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552 -AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed186ec0163a4a1a81574040592ab8d8e1a06 SHA1 a39df02932f9d24693e79bbcbb80e7e6a5c74fa0 SHA256 a19a28c5f4930348e7e4ed471d3d0e53f9d936e7a4c756281ada480b63ecc039 -AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 -AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SHA256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca +AUX 0001-compiler.h-split-MIPS-and-ARM-code.patch 2848 RMD160 410c16e1d9f51b4958dcbe0b116b405e49253049 SHA1 57d93b61c3c25bdfa27e3b4529552f5346a05629 SHA256 6739a5abb3cac7c473736d476f171090cca8b03175ccc76f8f21d490df2a4b92 +AUX 0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch 3509 RMD160 1a672e811f8c26bbebc2fe3b79cfe40f93728e4f SHA1 66a81dbf50fdc593b3580c119457f8143b5c9f5c SHA256 d0bc87be968fd72dd6c17267457b11e7775274fb693a228f734ca1164b200baf +AUX 0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch 2918 RMD160 72bca5acd05bd7ca236e7673ed6ffcfac58bc4b0 SHA1 2b0f082375fb4f77927e10d2b21bc24d076dd1bc SHA256 4d9ab2d51c833575f4cc6ed2cfe589cee816f6330a496320e157d12134245a23 +AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0 +AUX xdm.confd-4 562 RMD160 3440e564c5d52ec1d30902c870daf282698f04c4 SHA1 630b8e05706050a6b7260d2a1a19d6d54cba59fa SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8 +AUX xdm.initd-8 5703 RMD160 622a05f0f38e8e28137a577545d84feca47022fc SHA1 9b359c5cd8252b11b9bd6e29e7e56b6880002696 SHA256 068954df9d45d46b185e54fb3db77791c8afbd2424bcb49078f1288599142281 +AUX xorg-server-1.12-disable-acpi.patch 275 RMD160 01244888695fc7928c81c06cc1f4fcd3625fc9de SHA1 555a4d16f38ed54ed9efa6fff9ec230d11362e30 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc -EBUILD xorg-server-1.9.5-r1.ebuild 8011 RMD160 4db5d07629aa985fa58f7274985a669ed437ef3d SHA1 32207cbd09f746e7e87d2483ef416002fcfa8b3e SHA256 9eb896d532a72a4962cc085ada9889f63fceb5f34c1df351ed5e9f229b224839 -MISC ChangeLog 46548 RMD160 fd66dad1dc5b8181e294f00b2d867e273f375fed SHA1 c1c264afd91f7d13bd8c4cd5d8d03cc9327e1e14 SHA256 ae56c39d52f287b2e1e0c5be5bffe5207fbc60e0cbf906a15f50f7f849bd69d7 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +EBUILD xorg-server-9999.ebuild 7094 RMD160 c575b468d80924b5cbc64f651a3d27f9cf923f4b SHA1 4229492472a0c80bf3db05d11b6c6c4f2d6d740f SHA256 8a97f163cdccb5cb95fac027916e4b9b3c26cbf7965a3a080c78a99f218cc1f3 +MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f diff --git a/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch b/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch new file mode 100644 index 0000000..b858ecb --- /dev/null +++ b/x11-base/xorg-server/files/0001-compiler.h-split-MIPS-and-ARM-code.patch @@ -0,0 +1,94 @@ +From 66482b79cf539e53a522787fce7fdfe74989a0e4 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Thu, 10 May 2012 13:11:12 -0400 +Subject: [PATCH 1/3] compiler.h: split MIPS and ARM code + +Signed-off-by: Matt Turner <mattst88@gmail.com> +--- + hw/xfree86/common/compiler.h | 55 ++++++++++++++++++++++++++++++++++++----- + 1 files changed, 48 insertions(+), 7 deletions(-) + +diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h +index 0abdfb6..27bce92 100644 +--- a/hw/xfree86/common/compiler.h ++++ b/hw/xfree86/common/compiler.h +@@ -703,12 +703,8 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset, + :"r"(val), "r"(addr), "i"(ASI_PL)); + } + +-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +-#ifdef __arm32__ +-#define PORT_SIZE long +-#else ++#elif defined(__mips__) + #define PORT_SIZE short +-#endif + + _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ + +@@ -754,7 +750,6 @@ inl(unsigned PORT_SIZE port) + IOPortBase); + } + +-#if defined(__mips__) + #ifdef linux /* don't mess with other OSs */ + #if X_BYTE_ORDER == X_BIG_ENDIAN + static __inline__ unsigned int +@@ -780,7 +775,53 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset, + } + #endif + #endif /* !linux */ +-#endif /* __mips__ */ ++ ++#elif (defined(__arm32__) && !defined(__linux__)) ++#define PORT_SIZE long ++ ++_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ ++ ++static __inline__ void ++outb(unsigned PORT_SIZE port, unsigned char val) ++{ ++ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = ++ val; ++} ++ ++static __inline__ void ++outw(unsigned PORT_SIZE port, unsigned short val) ++{ ++ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = ++ val; ++} ++ ++static __inline__ void ++outl(unsigned PORT_SIZE port, unsigned int val) ++{ ++ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = ++ val; ++} ++ ++static __inline__ unsigned int ++inb(unsigned PORT_SIZE port) ++{ ++ return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ++ IOPortBase); ++} ++ ++static __inline__ unsigned int ++inw(unsigned PORT_SIZE port) ++{ ++ return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ++ IOPortBase); ++} ++ ++static __inline__ unsigned int ++inl(unsigned PORT_SIZE port) ++{ ++ return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ++ IOPortBase); ++} + + #elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) + +-- +1.7.3.4 + diff --git a/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch b/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch new file mode 100644 index 0000000..a6bee61 --- /dev/null +++ b/x11-base/xorg-server/files/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch @@ -0,0 +1,104 @@ +From d83874593b04258cc5b866eb57d4d085eed67fae Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Thu, 10 May 2012 13:21:20 -0400 +Subject: [PATCH 2/3] compiler.h: change MIPS IOPortBase to ioBase + +This will allow us to use the existing __powerpc__ code paths in +lnx_video.c. + +Also remove unnecessary casts. + +Signed-off-by: Matt Turner <mattst88@gmail.com> +--- + hw/xfree86/common/compiler.h | 33 ++++++++++++------------------ + hw/xfree86/os-support/linux/lnx_video.c | 5 +++- + 2 files changed, 17 insertions(+), 21 deletions(-) + +diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h +index 27bce92..9669df9 100644 +--- a/hw/xfree86/common/compiler.h ++++ b/hw/xfree86/common/compiler.h +@@ -704,50 +704,43 @@ xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset, + } + + #elif defined(__mips__) +-#define PORT_SIZE short + +-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ ++extern _X_EXPORT volatile unsigned char *ioBase; + + static __inline__ void +-outb(unsigned PORT_SIZE port, unsigned char val) ++outb(unsigned short port, unsigned char val) + { +- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = +- val; ++ *(volatile unsigned char *) (port + (uintptr_t)ioBase) = val; + } + + static __inline__ void +-outw(unsigned PORT_SIZE port, unsigned short val) ++outw(unsigned short port, unsigned short val) + { +- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = +- val; ++ *(volatile unsigned short *) (port + (uintptr_t)ioBase) = val; + } + + static __inline__ void +-outl(unsigned PORT_SIZE port, unsigned int val) ++outl(unsigned short port, unsigned int val) + { +- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = +- val; ++ *(volatile unsigned int *) (port + (uintptr_t)ioBase) = val; + } + + static __inline__ unsigned int +-inb(unsigned PORT_SIZE port) ++inb(unsigned short port) + { +- return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + +- IOPortBase); ++ return *(volatile unsigned char *) (port + (uintptr_t)ioBase); + } + + static __inline__ unsigned int +-inw(unsigned PORT_SIZE port) ++inw(unsigned short port) + { +- return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + +- IOPortBase); ++ return *(volatile unsigned short *) (port + (uintptr_t)ioBase); + } + + static __inline__ unsigned int +-inl(unsigned PORT_SIZE port) ++inl(unsigned short port) + { +- return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + +- IOPortBase); ++ return *(volatile unsigned int *) (port + (uintptr_t)ioBase); + } + + #ifdef linux /* don't mess with other OSs */ +diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c +index 3526a21..cd46f97 100644 +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -472,8 +472,11 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) + /* I/O Permissions section */ + /***************************************************************************/ + +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + volatile unsigned char *ioBase = NULL; ++#endif ++ ++#if defined(__powerpc__) + + #ifndef __NR_pciconfig_iobase + #define __NR_pciconfig_iobase 200 +-- +1.7.3.4 + diff --git a/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch b/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch new file mode 100644 index 0000000..54e7aae --- /dev/null +++ b/x11-base/xorg-server/files/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.patch @@ -0,0 +1,78 @@ +From a20c36d4ea6ae8c553c81bf3def81591ff91dce6 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Thu, 10 May 2012 13:23:12 -0400 +Subject: [PATCH 3/3] Make MIPS use existing PowerPC code paths in lnx_video.c + +This allows X to work on the Lemote Yeeloong laptop. + +Signed-off-by: Matt Turner <mattst88@gmail.com> +--- + hw/xfree86/dri/sarea.h | 2 ++ + hw/xfree86/os-support/linux/lnx_video.c | 14 +++++++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h +index 7a55b49..e3b7763 100644 +--- a/hw/xfree86/dri/sarea.h ++++ b/hw/xfree86/dri/sarea.h +@@ -41,6 +41,8 @@ + /* SAREA area needs to be at least a page */ + #if defined(__alpha__) + #define SAREA_MAX 0x2000 ++#elif defined(__mips__) ++#define SAREA_MAX 0x4000 + #elif defined(__ia64__) + #define SAREA_MAX 0x10000 /* 64kB */ + #else +diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c +index cd46f97..4b228ba 100644 +--- a/hw/xfree86/os-support/linux/lnx_video.c ++++ b/hw/xfree86/os-support/linux/lnx_video.c +@@ -487,16 +487,20 @@ volatile unsigned char *ioBase = NULL; + Bool + xf86EnableIO(void) + { +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + int fd; +- unsigned int ioBase_phys; ++ unsigned long ioBase_phys; + #endif + + if (ExtendedEnabled) + return TRUE; + ++#if defined(__powerpc__) || defined(__mips__) + #if defined(__powerpc__) + ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0); ++#elif defined(__mips__) ++ ioBase_phys = 0x1fd00000; ++#endif + + fd = open("/dev/mem", O_RDWR); + if (ioBase == NULL) { +@@ -514,7 +518,7 @@ xf86EnableIO(void) + #endif + } + close(fd); +-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) ++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) + ErrorF("xf86EnableIOPorts: no I/O ports found\n"); +@@ -540,10 +544,10 @@ xf86DisableIO(void) + { + if (!ExtendedEnabled) + return; +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + munmap(ioBase, 0x20000); + ioBase = NULL; +-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) ++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) + iopl(0); + ioperm(0, 1024, 0); + #endif +-- +1.7.3.4 + diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1 index 365664e..6ed3922 100644 --- a/x11-base/xorg-server/files/xdm-setup.initd-1 +++ b/x11-base/xorg-server/files/xdm-setup.initd-1 @@ -1,7 +1,7 @@ #!/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 $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $ depend() { need localmount diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-4 index 9c560bb..c82fece 100644 --- a/x11-base/xorg-server/files/xdm.confd-3 +++ b/x11-base/xorg-server/files/xdm.confd-4 @@ -5,12 +5,6 @@ # 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 ] +# What display manager do you use ? [ xdm | gdm | kdm | 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 +DISPLAYMANAGER="xdm" diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-8 index ae5f59e..063f88b 100644 --- a/x11-base/xorg-server/files/xdm.initd-3 +++ b/x11-base/xorg-server/files/xdm.initd-8 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# 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-3,v 1.1 2010/09/28 12:43:19 scarabeus Exp $ +# $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. # @@ -45,13 +45,15 @@ depend() { # (#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 + after quota keymaps before alsasound # Start before X - use consolekit xfs + use consolekit dbus xfs } setup_dm() { @@ -66,11 +68,7 @@ setup_dm() { NAME= case "${MY_XDM}" in kdm|kde) - EXE="$(which kdm)" - PIDFILE=/var/run/kdm.pid - ;; - kdm-*) - EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + EXE=/usr/bin/kdm PIDFILE=/var/run/kdm.pid ;; entrance*) @@ -90,9 +88,19 @@ setup_dm() { 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)" + 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 @@ -141,6 +149,7 @@ start() { 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 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 deleted file mode 100644 index 66e77f6..0000000 --- a/x11-base/xorg-server/files/xorg-cve-2011-4028+4029.patch +++ /dev/null @@ -1,22 +0,0 @@ -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.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch new file mode 100644 index 0000000..df43dbd --- /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.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch deleted file mode 100644 index 2b05967..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-1.9.5-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.9.5-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif - - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd = open("/dev/mem", O_RDWR); -+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase == MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); diff --git a/x11-base/xorg-server/files/xorg-server-9999-loongson.patch b/x11-base/xorg-server/files/xorg-server-9999-loongson.patch deleted file mode 100644 index cc94cec..0000000 --- a/x11-base/xorg-server/files/xorg-server-9999-loongson.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 2601693..b631ba4 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -866,42 +866,42 @@ static __inline__ void stw_u(unsigned long val, unsigned short *p) - # define PORT_SIZE short - # endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -+ *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase) = val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -+ *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase) = val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -+ *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase) = val; - } - - static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { -- return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase); -+ return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { -- return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase); -+ return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { -- return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase); -+ return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase); - } - - -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index ed35766..f6df722 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -493,7 +493,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) - /* I/O Permissions section */ - /***************************************************************************/ - --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - volatile unsigned char *ioBase = NULL; - - #ifndef __NR_pciconfig_iobase -@@ -505,7 +505,7 @@ volatile unsigned char *ioBase = NULL; - Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; - #endif -@@ -513,8 +513,12 @@ xf86EnableIO(void) - if (ExtendedEnabled) - return TRUE; - --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) -+#ifdef __powerpc__ - ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0); -+#else -+ ioBase_phys = 0x1fd00000; -+#endif - - fd = open("/dev/mem", O_RDWR); - if (ioBase == NULL) { -@@ -532,7 +536,7 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); -@@ -556,10 +560,10 @@ xf86DisableIO(void) - { - if (!ExtendedEnabled) - return; --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - munmap(ioBase, 0x20000); - ioBase = NULL; --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) - iopl(0); - ioperm(0, 1024, 0); - #endif diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch deleted file mode 100644 index cc80e6c..0000000 --- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-loongson-fix-smi-16bpp.patch b/x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch deleted file mode 100644 index a974b2f..0000000 --- a/x11-base/xorg-server/files/xorg-server-loongson-fix-smi-16bpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.7.3.902/fb/fb.h.orig 2010-02-27 11:45:17.000000000 +0800 -+++ xorg-server-1.7.3.902/fb/fb.h 2010-02-27 10:29:09.000000000 +0800 -@@ -75,7 +75,7 @@ - #define FBPREFIX(x) fb##x - #define WRITE(ptr, val) (*(ptr) = (val)) - #define READ(ptr) (*(ptr)) --#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size)) -+#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size)) - #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size)) - - #endif diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 01c4c00..02528e0 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -2,4 +2,12 @@ <!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='xnest'>Build the Xnest server</flag> + <flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag> + <flag name='xvfb'>Build the Xvfb server</flag> +</use> </pkgmetadata> diff --git a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 275dfd2..7b2d5c5 100644 --- a/x11-base/xorg-server/xorg-server-1.9.5-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,19 +1,19 @@ # 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.9.5-r1.ebuild,v 1.4 2011/10/22 16:57:28 xarthisius Exp $ +# $Header: $ -EAPI=3 -inherit xorg-2 multilib versionator +EAPI=4 +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" -OPENGL_DIR="xorg-x11" - DESCRIPTION="X.Org X servers" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev" +IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev" + RDEPEND=">=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype @@ -21,26 +21,27 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp - >=x11-libs/libpciaccess-0.10.3 + >=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.15.20 + >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 + >=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.5 - >=x11-libs/libXfixes-4.0.3 + >=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.3 + >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 @@ -51,18 +52,20 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 >=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 )" + 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-4.1 + >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 - >=x11-proto/glproto-1.4.11 - >=x11-proto/inputproto-1.9.99.902 + >=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 @@ -72,57 +75,63 @@ DEPEND="${RDEPEND} >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.0.99.3 + >=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? ( - >=app-doc/doxygen-1.6.1 - app-text/xmlto + >=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.3 + >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 - ) - >=x11-apps/xinit-1.3" + )" PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + )" -# These have been sent upstream -UPSTREAMED_PATCHES=( +#UPSTREAMED_PATCHES=( # "${WORKDIR}/patches/" - ) +#) PATCHES=( "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-disable-acpi.patch - "${FILESDIR}"/${PN}-1.9-nouveau-default.patch - "${FILESDIR}"/xorg-cve-2011-4028+4029.patch - # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=21622 - "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch" - "${FILESDIR}/${P}-loongson.patch" - ) + "${FILESDIR}"/${PN}-1.12-disable-acpi.patch + "${FILESDIR}"/0001-compiler.h-split-MIPS-and-ARM-code.patch + "${FILESDIR}"/0002-compiler.h-change-MIPS-IOPortBase-to-ioBase.patch + "${FILESDIR}"/0003-Make-MIPS-use-existing-PowerPC-code-paths-in-lnx_vid.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 - use minimal || ensure_a_server_is_building - # 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=" + XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_enable dmx) $(use_enable kdrive) @@ -130,7 +139,6 @@ pkg_setup() { $(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) @@ -153,11 +161,10 @@ pkg_setup() { --without-dtrace --without-fop --with-os-vendor=Gentoo - ${conf_opts}" + ) # Xorg-server requires includes from OS mesa which are not visible for # users of binary drivers. - # Due to the limitations of CONFIGURE_OPTIONS, we have to export this 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 @@ -166,28 +173,6 @@ pkg_setup() { 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" - - # (#121394) Causes window corruption - filter-flags -fweb - - # Incompatible with GCC 3.x SSP on x86, bug #244352 - if use x86 ; then - if [[ $(gcc-major-version) -lt 4 ]]; then - filter-flags -fstack-protector - fi - fi - - # Incompatible with GCC 3.x CPP, bug #314615 - if [[ $(gcc-major-version) -lt 4 ]]; then - ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x" - ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)" - fi - - # detect if we should inform user about ebuild breakage - if ! has_version "x11-base/xorg-server" || - has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then - INFO="yes" - fi } src_install() { @@ -199,24 +184,23 @@ src_install() { if ! use minimal && use xorg; then # Install xorg.conf.example into docs - dodoc "${WORKDIR}"/${P}_build/hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" + dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example fi - newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed" - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die - newconfd "${FILESDIR}"/xdm.confd-3 xdm || die + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-8 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die + newins "${FILESDIR}"/xorg-sets.conf xorg.conf } pkg_postinst() { # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set --use-old xorg-x11 + eselect opengl set xorg-x11 --use-old - if [[ ${INFO} = yes ]]; then + 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 @@ -228,26 +212,26 @@ pkg_postinst() { 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 } pkg_postrm() { # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi + 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/${OPENGL_DIR}/extensions + 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/${OPENGL_DIR}/extensions + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions fi done eend 0 @@ -261,12 +245,3 @@ server_based_install() { "${D}"/usr/share/man/man1/Xserver.1x fi } - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -} |