From d649f7a04a3cefdcf938455ee090b98bf37bfdc6 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 8 Jun 2011 15:02:15 -0400 Subject: [PATCH] xorg-server: Remove old versions. --- x11-base/xorg-server/Manifest | 11 - ...0001-xfree86-Add-DontLie-server-flag.patch | 128 -------- .../files/1.7.5.902-fix-tslib-1.0-check.patch | 19 -- .../files/1.8.0-match-only-sane-devices.patch | 63 ---- .../files/1.8.0-no-hardcoded-etc.patch | 28 -- x11-base/xorg-server/files/xdm.initd | 203 ------------ x11-base/xorg-server/xorg-server-1.7.7.ebuild | 270 ---------------- x11-base/xorg-server/xorg-server-1.8.0.ebuild | 293 ------------------ .../xorg-server/xorg-server-1.8.1-r1.ebuild | 286 ----------------- 9 files changed, 1301 deletions(-) delete mode 100644 x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch delete mode 100644 x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch delete mode 100644 x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch delete mode 100644 x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch delete mode 100755 x11-base/xorg-server/files/xdm.initd delete mode 100644 x11-base/xorg-server/xorg-server-1.7.7.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.8.0.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 64b3804..47da613 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,22 +1,11 @@ AUX 0001-xaa-Free-the-scratch-pixmap-header-before-freeing-th.patch 1123 RMD160 7b11ccee412d4de0efc063821dcdd4f7f0c7f006 SHA1 1552b4c356fde066c72e9edbed209af2ec4d5ef7 SHA256 aef87d2307c9f15e152c7f4666272f3a58a938c682c842c3d186440d7a55aa96 -AUX 0001-xfree86-Add-DontLie-server-flag.patch 4746 RMD160 87de996ac0eaab5d0bdc7013319ee8b0c7cd1727 SHA1 f5ba61e4a1a08b6d8f35be96d7295599edae0b84 SHA256 904cdde3750fdc23572286cd8d8fb6e6372b8c56021dcb8b1a14a5e1e5101759 AUX 0002-Remove-the-cacheing-of-the-last-scratch-PixmapRec.patch 8449 RMD160 978b89e43da6d4fea1b4767a2ba599c382ea2f69 SHA1 fa48c334e0064d982ba9938079d1cdcc62e84c27 SHA256 730194ae24f38423daa00726486860c552cdae97e930ec7864e678c90fe36041 AUX 0003-shm-Replace-open-coded-version-of-GetScratchPixmapHe.patch 1460 RMD160 8a05de2c0ab885c7b4469160aa0f596af3da0791 SHA1 fdee7f6459b9e942ba8cf771836ff3ac58abfa84 SHA256 18e7728c546ba670810e7a0540ec3ea266c2ff2266cfe8a98d015b21ac0947d5 AUX 0004-shadow-Remove-unused-ModifyPixmapHeader-wrapping.patch 1501 RMD160 7837abca53cc6263ca3afc26a2c173b13af3b9e2 SHA1 56eada8b1c1427dc1d9e701f1a87f307d8bb7149 SHA256 4b5d1c0726fc346675a26c521c00b6fd51b2e5e349f5a22ef80d54e985e9e8af -AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea -AUX 1.8.0-match-only-sane-devices.patch 1980 RMD160 4fee29076bb30e8fb1b820ef58a1c26f3bd63c73 SHA1 98d4ea8e493a31f141e39f4a468458469ebff58f SHA256 95f6ab36fa1b6b80786ff90fb2ee1f7fe02d964a1d10c90277060b4982d8eace -AUX 1.8.0-no-hardcoded-etc.patch 833 RMD160 9e3736556f8c74c1c78561590cf03e9316d28a75 SHA1 0063e0c520f128507e71134571de6dd95a00079c SHA256 2168832548dbb8d6619df7b2a54b22f118de588522b4014dabaa98829331a6b9 AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec -AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd30222c7941d50fc0f62c5008a0e3b97e2d00e0 SHA256 8f1d35638559d12ed14e8cc2e26800e0ee9a10f14c7be912c834c73d12913601 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff -DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77 -DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d -EBUILD xorg-server-1.7.7.ebuild 7220 RMD160 ed925fe7fccf08ae58ce59314a0c472535f13ec0 SHA1 5d72d32a1b8c9c4f40f88627b42d749ed4223e7b SHA256 f70710b49e1ca43c8cc765fe20ab9819bc5b2793eff0064cee607e4703d73ccc -EBUILD xorg-server-1.8.0.ebuild 8221 RMD160 6aa53ec1042a8c12b9aa06c1aee767a50e1c2445 SHA1 d1e770f5108c161fb5d20207c612c568c32cfdc8 SHA256 5e21d8ab052b17774c40b67fb20981847a289ddbad39b8753501d21b50a6d450 -EBUILD xorg-server-1.8.1-r1.ebuild 7998 RMD160 c1035725f811ee2b5723a8bdac73cb3eeb3f6dd0 SHA1 08cf52506fb9eb2261b9c3d64dd8807fd95daeb5 SHA256 43b5bc070b8f479c08532f4a5c62b332cf8f579ee5f49614ffb256a1bb746a1a EBUILD xorg-server-9999.ebuild 6983 RMD160 8e70bf7fa72a84fc82f7682adbe85852262f86b5 SHA1 3ee6e768666fad5ea93738ec56d35c9b79d3cb49 SHA256 6c9c1246cce29638d736fb138321c334b1e2954fe925ab7f0595f7464c0df3ac diff --git a/x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch b/x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch deleted file mode 100644 index 939aab1..0000000 --- a/x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 1557c71c858c7e16a54f959135faa1620cad11ab Mon Sep 17 00:00:00 2001 -From: Nick Bowler -Date: Wed, 6 Jan 2010 10:42:17 -0500 -Subject: [PATCH] xfree86: Add DontLie server flag. - -Since commit fff00df94d7ebd18a8e24537ec96073717375a3f, RandR 1.2 drivers -lie about the resolution of the attached screen by default. When the -reported resolution is wrong, fonts and other UI elements that use -physical units are not sized correctly. - -This patch adds a new server flag, DontLie, which encourages the server -to be honest by default. - -Signed-off-by: Nick Bowler ---- - hw/xfree86/common/xf86Config.c | 6 +++++- - hw/xfree86/common/xf86Globals.c | 1 + - hw/xfree86/common/xf86Privstr.h | 2 ++ - hw/xfree86/doc/man/xorg.conf.man.pre | 6 ++++++ - hw/xfree86/modes/xf86RandR12.c | 12 ++++++++++++ - 5 files changed, 26 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 1e9543f..eb0b23e 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -715,7 +715,8 @@ typedef enum { - FLAG_AUTO_ENABLE_DEVICES, - FLAG_GLX_VISUALS, - FLAG_DRI2, -- FLAG_USE_SIGIO -+ FLAG_USE_SIGIO, -+ FLAG_DONTLIE - } FlagValues; - - /** -@@ -779,6 +780,8 @@ static OptionInfoRec FlagOptions[] = { - {0}, FALSE }, - { FLAG_USE_SIGIO, "UseSIGIO", OPTV_BOOLEAN, - {0}, FALSE }, -+ { FLAG_DONTLIE, "DontLie", OPTV_BOOLEAN, -+ {0}, FALSE }, - { -1, NULL, OPTV_NONE, - {0}, FALSE }, - }; -@@ -836,6 +839,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); - xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); - xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); -+ xf86GetOptValBool(FlagOptions, FLAG_DONTLIE, &xf86Info.dontLie); - - xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); - if (xf86Info.ignoreABI) { -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index 8b483f3..6402329 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -110,6 +110,7 @@ xf86InfoRec xf86Info = { - .dontVTSwitch = FALSE, - .dontZap = FALSE, - .dontZoom = FALSE, -+ .dontLie = FALSE, - .notrapSignals = FALSE, - .caughtSignal = FALSE, - .currentScreen = NULL, -diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h -index b2095aa..05166f9 100644 ---- a/hw/xfree86/common/xf86Privstr.h -+++ b/hw/xfree86/common/xf86Privstr.h -@@ -68,6 +68,8 @@ typedef struct { - Bool dontVTSwitch; - Bool dontZap; - Bool dontZoom; -+ Bool dontLie; -+ - Bool notrapSignals; /* don't exit cleanly - die at fault */ - Bool caughtSignal; - -diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre -index f7ff6f6..e2e5a55 100644 ---- a/hw/xfree86/doc/man/xorg.conf.man.pre -+++ b/hw/xfree86/doc/man/xorg.conf.man.pre -@@ -550,6 +550,12 @@ When this option is enabled, those key sequences have no special meaning - and are passed to clients. - Default: off. - .TP 7 -+.BI "Option \*qDontLie\*q \*q" boolean \*q -+This option suggests that the server should avoid lying whenever possible. -+Currently this means that RandR 1.2 drivers will try to compute the proper DPI -+instead of making it up. -+Default: off. -+.TP 7 - .BI "Option \*qDisableVidModeExtension\*q \*q" boolean \*q - This disables the parts of the VidMode extension used by the xvidtune client - that can be used to change the video modes. -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 7ba09b6..c51857b 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) - else - { - xf86OutputPtr output = xf86CompatOutput(pScrn); -+ xf86CrtcPtr crtc = output->crtc; - - if (output && - output->conf_monitor && -@@ -818,6 +819,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) - mmWidth = output->conf_monitor->mon_width; - mmHeight = output->conf_monitor->mon_height; - } -+ else if (xf86Info.dontLie && crtc && crtc->mode.HDisplay && -+ output->mm_width && output->mm_height) -+ { -+ /* -+ * If the output has a mode and a declared size, use that -+ * to scale the screen size -+ */ -+ DisplayModePtr mode = &crtc->mode; -+ mmWidth = output->mm_width * width / mode->HDisplay; -+ mmHeight = output->mm_height * height / mode->VDisplay; -+ } - else - { - /* --- -1.7.0.4 - diff --git a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch deleted file mode 100644 index 3675822..0000000 --- a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.ac 2010-03-16 22:24:14.000000000 +0100 -+++ configure.ac.new 2010-03-16 22:33:10.000000000 +0100 -@@ -1915,8 +1915,14 @@ - AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server]) - fi - -- -- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) -+dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files... -+ PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [ -+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [ -+ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [ -+ HAVE_TSLIB="no" -+ ]) -+ ]) -+ ]) - if test "x$HAVE_TSLIB" = xno; then - AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) - fi diff --git a/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch b/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch deleted file mode 100644 index 6ece211..0000000 --- a/x11-base/xorg-server/files/1.8.0-match-only-sane-devices.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c8a608cb6ce8f9c86258c1ab49084f691fa9cc51 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 07 Apr 2010 00:04:38 +0000 -Subject: config: only match sane devices in 10-evdev.conf - -Having a generic catchall also adds devices like accelerometers. These -devices make X unusable, hence restrict matching to "known sane" devices -like pointers, touchpads, keyboards, tablets and touchscreens. - -Signed-off-by: Peter Hutterer -Acked-by: Julien Cristau -Acked-by: Dan Nicholson -Acked-by: James Cloos ---- -diff --git a/config/10-evdev.conf b/config/10-evdev.conf -index 7406f4e..cc83ab2 100644 ---- a/config/10-evdev.conf -+++ b/config/10-evdev.conf -@@ -1,8 +1,40 @@ - # - # Catch-all evdev loader for udev-based systems --# -+# We don't simply match on any device since that also adds accelerometers -+# and other devices that we don't really want to use. The list below -+# matches everything but joysticks. -+ - Section "InputClass" -- Identifier "evdev-catchall" -+ Identifier "evdev pointer catchall" -+ MatchIsPointer "on" -+ MatchDevicePath "/dev/input/event*" - Driver "evdev" -+EndSection -+ -+Section "InputClass" -+ Identifier "evdev keyboard catchall" -+ MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" -+ Driver "evdev" -+EndSection -+ -+Section "InputClass" -+ Identifier "evdev touchpad catchall" -+ MatchIsTouchpad "on" -+ MatchDevicePath "/dev/input/event*" -+ Driver "evdev" -+EndSection -+ -+Section "InputClass" -+ Identifier "evdev tablet catchall" -+ MatchIsTablet "on" -+ MatchDevicePath "/dev/input/event*" -+ Driver "evdev" -+EndSection -+ -+Section "InputClass" -+ Identifier "evdev touchscreen catchall" -+ MatchIsTouchscreen "on" -+ MatchDevicePath "/dev/input/event*" -+ Driver "evdev" - EndSection --- -cgit v0.8.3-6-g21f6 diff --git a/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch b/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch deleted file mode 100644 index 33a2862..0000000 --- a/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7fc78783018cf2ce27f8e6829f9eff1d9032541c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 7 Apr 2010 09:27:59 +1000 -Subject: [PATCH] config: don't hardcode /etc for 10-evdev.conf - -Use sysconfdir instead to avoid amusements like /usr/etc/ and the like. - -Signed-off-by: Peter Hutterer ---- - config/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config/Makefile.am b/config/Makefile.am -index eed7454..2e468cf 100644 ---- a/config/Makefile.am -+++ b/config/Makefile.am -@@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS) - libconfig_la_SOURCES += udev.c - libconfig_la_LIBADD = $(UDEV_LIBS) - --xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) -+xorgconfddir = $(sysconfdir)/$(XF86CONFIGDIR) - xorgconfd_DATA = 10-evdev.conf - - else --- -1.6.6.1 - diff --git a/x11-base/xorg-server/files/xdm.initd b/x11-base/xorg-server/files/xdm.initd deleted file mode 100755 index 6d10e1f..0000000 --- a/x11-base/xorg-server/files/xdm.initd +++ /dev/null @@ -1,203 +0,0 @@ -#!/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 - ;; - *) - # 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 "^[^#]+.*\" /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}" - - 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 : \ No newline at end of file diff --git a/x11-base/xorg-server/xorg-server-1.7.7.ebuild b/x11-base/xorg-server/xorg-server-1.7.7.ebuild deleted file mode 100644 index 5ec29a8..0000000 --- a/x11-base/xorg-server/xorg-server-1.7.7.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2010 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.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $ - -EAPI="2" - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular multilib versionator - -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" - -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - dev-libs/openssl - >=x11-libs/libXfont-1.3.3 - >=x11-libs/xtrans-1.2.2 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libpciaccess-0.10.3 - >=x11-libs/pixman-0.15.20 - media-libs/freetype - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - x11-apps/xkbcomp - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - <=x11-apps/xinit-1.2.1 - >=app-admin/eselect-opengl-1.0.8 - 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/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXtst-1.0.3 - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=x11-libs/libXres-1.0.3 - >=media-libs/mesa-7.4[nptl=] - ) - >=x11-libs/libxkbui-1.0.2 - kdrive? ( - >=x11-libs/libXext-1.0.5 - sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # xkbcomp is launched at startup but not checked by ./configure - -## Deps that don't have a version in configure.ac but do here: -# x11-proto/resourceproto -# x11-proto/fontsproto -# x11-libs/libXau -# x11-libs/libXfont -# x11-libs/libXdmcp -# x11-libs/libXext -# x11-libs/libX11 -# x11-libs/libXrender -# x11-libs/libXmu -# x11-libs/libXfixes -# x11-libs/libXtst -# x11-proto/xineramaproto -# x11-proto/dmxproto -## Deps that are larger here than in configure.ac -# x11-libs/libpciaccess-0.8.0 -# - -DEPEND="${RDEPEND} - !!net-dialup/dtrace - sys-devel/flex - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/renderproto-0.11 - >=x11-proto/fixesproto-4.1 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.99.3 - >=x11-proto/xproto-7.0.13 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/compositeproto-0.4 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/inputproto-1.9.99.902 - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/glproto-1.4.9 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.1 - >=x11-libs/libdrm-2.3.0 - )" - -PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# These have been sent upstream -UPSTREAMED_PATCHES=( - #"${WORKDIR}/patches/" - # Fix for bug #304067 - "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch" - ) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}/0001-xfree86-Add-DontLie-server-flag.patch" - ) - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else - conf_opts="${conf_opts} --disable-xsdl" - fi - - # 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 - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(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 xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --without-dtrace - ${conf_opts}" - - # (#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 - - OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set ${OPENGL_DIR} -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example (see bugs #151421 and #151670) - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - echo - ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" - ewarn "or earlier, 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/" - - ebeep 5 - epause 10 -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - local x="" - for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! 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 -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set ${OLD_IMPLEM} -} - -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." -} diff --git a/x11-base/xorg-server/xorg-server-1.8.0.ebuild b/x11-base/xorg-server/xorg-server-1.8.0.ebuild deleted file mode 100644 index ab3acf0..0000000 --- a/x11-base/xorg-server/xorg-server-1.8.0.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2010 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.8.0.ebuild,v 1.6 2010/04/13 21:56:38 polynomial-c Exp $ - -EAPI=3 -XORG_EAUTORECONF="yes" -inherit xorg-2 multilib versionator -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" - -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} doc hal 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.3.3 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/pixman-0.15.20 - >=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.5 - >=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.3 - ) - !udev? ( hal? ( sys-apps/hal ) ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - ) - !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[extras] )" - -DEPEND="${RDEPEND} - !!net-dialup/dtrace - !=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.0.99.3 - >=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.13 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) - doc? ( app-doc/doxygen ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.1 - >=x11-libs/libdrm-2.3.0 - )" - -PDEPEND=" - >=x11-apps/xinit-1.2.1-r1 - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# These have been sent upstream -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -# ) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-disable-acpi.patch - "${FILESDIR}"/${PV}-no-hardcoded-etc.patch - "${FILESDIR}"/${PV}-match-only-sane-devices.patch - "${FILESDIR}/0001-xfree86-Add-DontLie-server-flag.patch" - ) - -pkg_setup() { - local myconf - - xorg-2_pkg_setup - - use minimal || ensure_a_server_is_building - - # HAL shebang - if use hal; then - ewarn "Usage of hal is strongly discouraged. Please migrate to udev." - ewarn "From next major release on the hal support will be fully disabled." - fi - if use hal && use udev; then - ewarn "Both hal and udev flags are enabled." - ewarn "Enabling only udev!" - myconf=" - $(use_enable udev config-udev) - --disable-config-hal - " - else - myconf=" - $(use_enable hal config-hal) - $(use_enable udev config-udev) - " - fi - - # 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 - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(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 xorg) - $(use_enable nptl glx-tls) - $(use_with doc doxygen) - ${myconf} - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontrootdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --without-dtrace - --with-os-vendor=Gentoo - ${conf_opts}" - - # (#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 " /dev/null - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h - done - popd &> /dev/null - export CPPFLAGS="${CPPFLAGS:+${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 "