summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-11-22 11:59:12 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-11-22 11:59:12 -0300
commitb39660af33c01a124dd52a16931cc7b97c213680 (patch)
treec26c77f0d61aa768967fa43328073aa175562927
parent89d2acc563e58b7200b89f6c8be9f77024dd8bc6 (diff)
downloadabslibre-b39660af33c01a124dd52a16931cc7b97c213680.tar.gz
abslibre-b39660af33c01a124dd52a16931cc7b97c213680.tar.bz2
abslibre-b39660af33c01a124dd52a16931cc7b97c213680.zip
xorg-server: remove from [libre] since nvidia-drm-outputclass.conf has been removed -> https://bugs.archlinux.org/task/45973
-rw-r--r--libre/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch210
-rw-r--r--libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch55
-rw-r--r--libre/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch134
-rw-r--r--libre/xorg-server/PKGBUILD151
-rw-r--r--libre/xorg-server/autoconfig-sis.patch21
-rw-r--r--libre/xorg-server/xorg-server.install18
-rw-r--r--libre/xorg-server/xvfb-run180
-rw-r--r--libre/xorg-server/xvfb-run.1282
8 files changed, 0 insertions, 1051 deletions
diff --git a/libre/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch b/libre/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
deleted file mode 100644
index 86744f140..000000000
--- a/libre/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 5 May 2015 14:18:54 +1000
-Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask
-
-Allows a mask to carry both accelerated and unaccelerated motion at the same
-time.
-
-This is required for xf86-input-libinput where the pointer acceleration
-happens in libinput already, but parts of the server, specifically raw events
-and DGA rely on device-specific unaccelerated data.
-
-To ease integration add this as a second set to the ValuatorMask rather than
-extending all APIs to carry a second, possibly NULL set of valuators.
-
-Note that a valuator mask should only be used in either accel/unaccel or
-standard mode at any time. Switching requires either a valuator_mask_zero()
-call or unsetting all valuators one-by-one. Trying to mix the two will produce
-a warning.
-
-The server has a shortcut for changing a mask with the
-valuator_mask_drop_unaccelerated() call. This saves us from having to loop
-through all valuators on every event, we can just drop the bits we know we
-don't want.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
----
- dix/inpututils.c | 82 +++++++++++++++++++++++++++++++++++++++---
- hw/xfree86/common/xf86Module.h | 2 +-
- include/input.h | 15 ++++++++
- include/inpututils.h | 2 ++
- 4 files changed, 95 insertions(+), 6 deletions(-)
-
-diff --git a/dix/inpututils.c b/dix/inpututils.c
-index 5c2a32d..1363988 100644
---- a/dix/inpututils.c
-+++ b/dix/inpututils.c
-@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int valuator)
- return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator);
- }
-
--/**
-- * Set the valuator to the given floating-point data.
-- */
--void
--valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
-+static inline void
-+_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
- {
- mask->last_bit = max(valuator, mask->last_bit);
- SetBit(mask->mask, valuator);
-@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
- }
-
- /**
-+ * Set the valuator to the given floating-point data.
-+ */
-+void
-+valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
-+{
-+ BUG_WARN_MSG(mask->has_unaccelerated,
-+ "Do not mix valuator types, zero mask first\n");
-+ _valuator_mask_set_double(mask, valuator, data);
-+}
-+
-+/**
- * Set the valuator to the given integer data.
- */
- void
-@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator)
-
- ClearBit(mask->mask, valuator);
- mask->valuators[valuator] = 0.0;
-+ mask->unaccelerated[valuator] = 0.0;
-
- for (i = 0; i <= mask->last_bit; i++)
- if (valuator_mask_isset(mask, i))
- lastbit = max(lastbit, i);
- mask->last_bit = lastbit;
-+
-+ if (mask->last_bit == -1)
-+ mask->has_unaccelerated = FALSE;
- }
- }
-
-@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src)
- valuator_mask_zero(dest);
- }
-
-+Bool
-+valuator_mask_has_unaccelerated(const ValuatorMask *mask)
-+{
-+ return mask->has_unaccelerated;
-+}
-+
-+void
-+valuator_mask_drop_unaccelerated(ValuatorMask *mask)
-+{
-+ memset(mask->unaccelerated, 0, sizeof(mask->unaccelerated));
-+ mask->has_unaccelerated = FALSE;
-+}
-+
-+/**
-+ * Set both accelerated and unaccelerated value for this mask.
-+ */
-+void
-+valuator_mask_set_unaccelerated(ValuatorMask *mask,
-+ int valuator,
-+ double accel,
-+ double unaccel)
-+{
-+ BUG_WARN_MSG(mask->last_bit != -1 && !mask->has_unaccelerated,
-+ "Do not mix valuator types, zero mask first\n");
-+ _valuator_mask_set_double(mask, valuator, accel);
-+ mask->has_unaccelerated = TRUE;
-+ mask->unaccelerated[valuator] = unaccel;
-+}
-+
-+double
-+valuator_mask_get_accelerated(const ValuatorMask *mask,
-+ int valuator)
-+{
-+ return valuator_mask_get_double(mask, valuator);
-+}
-+
-+double
-+valuator_mask_get_unaccelerated(const ValuatorMask *mask,
-+ int valuator)
-+{
-+ return mask->unaccelerated[valuator];
-+}
-+
-+Bool
-+valuator_mask_fetch_unaccelerated(const ValuatorMask *mask,
-+ int valuator,
-+ double *accel,
-+ double *unaccel)
-+{
-+ if (valuator_mask_isset(mask, valuator)) {
-+ if (accel)
-+ *accel = valuator_mask_get_accelerated(mask, valuator);
-+ if (unaccel)
-+ *unaccel = valuator_mask_get_unaccelerated(mask, valuator);
-+ return TRUE;
-+ }
-+ else
-+ return FALSE;
-+}
-+
- int
- CountBits(const uint8_t * mask, int len)
- {
-diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
-index e68fe9c..6133641 100644
---- a/hw/xfree86/common/xf86Module.h
-+++ b/hw/xfree86/common/xf86Module.h
-@@ -81,7 +81,7 @@ typedef enum {
- */
- #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
- #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0)
--#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0)
-+#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 1)
- #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0)
- #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
-
-diff --git a/include/input.h b/include/input.h
-index bf22dc7..0a4c4f7 100644
---- a/include/input.h
-+++ b/include/input.h
-@@ -674,6 +674,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask,
- extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask,
- int valnum, double *val);
-
-+extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask);
-+extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask,
-+ int valuator,
-+ double accel,
-+ double unaccel);
-+extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask,
-+ int valuator);
-+extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask,
-+ int valuator);
-+extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask,
-+ int valuator,
-+ double *accel,
-+ double *unaccel);
-+extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask);
-+
- /* InputOption handling interface */
- extern _X_EXPORT InputOption *input_option_new(InputOption *list,
- const char *key,
-diff --git a/include/inpututils.h b/include/inpututils.h
-index 53c96ba..4e90815 100644
---- a/include/inpututils.h
-+++ b/include/inpututils.h
-@@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS];
-
- struct _ValuatorMask {
- int8_t last_bit; /* highest bit set in mask */
-+ int8_t has_unaccelerated;
- uint8_t mask[(MAX_VALUATORS + 7) / 8];
- double valuators[MAX_VALUATORS]; /* valuator data */
-+ double unaccelerated[MAX_VALUATORS]; /* valuator data */
- };
-
- extern void verify_internal_event(const InternalEvent *ev);
---
-2.4.1
-
diff --git a/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch b/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch
deleted file mode 100644
index 9daadf6f6..000000000
--- a/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 780a69aff0ff57ef813179a2f09556eaf488cdfc Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@gmail.com>
-Date: Mon, 22 Jun 2015 21:13:05 +0200
-Subject: systemd-logind: do not rely on directed signals
-
-Right now, Xorg does not install DBus matches for "PauseDevice" /
-"ResumeDevice". Therefore, it should usually not receive those DBus
-signals from logind. It is just a coincidence that systemd-logind sends
-those signals in a directed manner right now. Therefore, dbus-daemon
-bypasses the broadcast matches.
-
-However, this is not ABI and Xorg should not rely on this. systemd-logind
-is free to send those signals as broadcasts, in which case Xorg will
-freeze the VT. Fix this by always installing those matches.
-
-Cc: Hans de Goede <hdegoede@redhat.com>
-Cc: Keith Packard <keithp@keithp.com>
-Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com>
-Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-Tested-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-
-diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
-index 69e2f67..2612d9e 100644
---- a/hw/xfree86/os-support/linux/systemd-logind.c
-+++ b/hw/xfree86/os-support/linux/systemd-logind.c
-@@ -507,6 +507,24 @@ connect_hook(DBusConnection *connection, void *data)
- goto cleanup;
- }
-
-+ dbus_bus_add_match(connection,
-+ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='PauseDevice'",
-+ &error);
-+ if (dbus_error_is_set(&error)) {
-+ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
-+ error.message);
-+ goto cleanup;
-+ }
-+
-+ dbus_bus_add_match(connection,
-+ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='ResumeDevice'",
-+ &error);
-+ if (dbus_error_is_set(&error)) {
-+ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
-+ error.message);
-+ goto cleanup;
-+ }
-+
- /*
- * HdG: This is not useful with systemd <= 208 since the signal only
- * contains invalidated property names there, rather than property, val
---
-cgit v0.10.2
-
diff --git a/libre/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch b/libre/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
deleted file mode 100644
index 6b8b1e5b5..000000000
--- a/libre/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 5 May 2015 14:48:41 +1000
-Subject: [PATCH] dix: hook up the unaccelerated valuator masks
-
-If present, access the unaccelerated valuator mask values for DGA and XI2 raw
-events.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
----
- dix/getevents.c | 31 ++++++++++++++++++++++---------
- hw/xfree86/common/xf86Xinput.c | 4 ++++
- 2 files changed, 26 insertions(+), 9 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 6fb12c5..64bf76e 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
- }
-
- static void
--set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data)
-+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,
-+ BOOL use_unaccel, double *data)
- {
- int i;
-
-+ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask);
-+
- for (i = 0; i < valuator_mask_size(mask); i++) {
- if (valuator_mask_isset(mask, i)) {
-+ double v;
-+
- SetBit(event->valuators.mask, i);
-- data[i] = valuator_mask_get_double(mask, i);
-+
-+ if (use_unaccel)
-+ v = valuator_mask_get_unaccelerated(mask, i);
-+ else
-+ v = valuator_mask_get_double(mask, i);
-+
-+ data[i] = v;
- }
- }
- }
-@@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
- valuator_mask_copy(&mask, mask_in);
-
- init_raw(pDev, raw, ms, type, key_code);
-- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
-
- clipValuators(pDev, &mask);
-
-- set_raw_valuators(raw, &mask, raw->valuators.data);
-+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
-
- event = &events->device_event;
- init_device_event(event, pDev, ms);
-@@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
- num_events++;
-
- init_raw(pDev, raw, ms, type, buttons);
-- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
- }
-
-+ valuator_mask_drop_unaccelerated(&mask);
-+
- /* valuators are in driver-native format (rel or abs) */
-
- if (flags & POINTER_ABSOLUTE) {
-@@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
- transformAbsolute(pDev, &mask);
- clipAbsolute(pDev, &mask);
- if ((flags & POINTER_NORAW) == 0 && raw)
-- set_raw_valuators(raw, &mask, raw->valuators.data);
-+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
- }
- else {
- transformRelative(pDev, &mask);
-@@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
- if (flags & POINTER_ACCELERATE)
- accelPointer(pDev, &mask, ms);
- if ((flags & POINTER_NORAW) == 0 && raw)
-- set_raw_valuators(raw, &mask, raw->valuators.data);
-+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
-
- moveRelative(pDev, flags, &mask);
- }
-@@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
- events++;
- num_events++;
- init_raw(dev, raw, ms, type, client_id);
-- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
-+ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
- }
-
- event = &events->device_event;
-@@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
- screeny = dev->spriteInfo->sprite->hotPhys.y;
- }
- if (need_rawevent)
-- set_raw_valuators(raw, &mask, raw->valuators.data);
-+ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
-
- /* Indirect device touch coordinates are not used for cursor positioning.
- * They are merely informational, and are provided in device coordinates.
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 1fb5b16..5ce4c71 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
- dx = valuator_mask_get(mask, 0);
- if (is_absolute)
- dx -= device->last.valuators[0];
-+ else if (valuator_mask_has_unaccelerated(mask))
-+ dx = valuator_mask_get_unaccelerated(mask, 0);
- }
-
- if (valuator_mask_isset(mask, 1)) {
- dy = valuator_mask_get(mask, 1);
- if (is_absolute)
- dy -= device->last.valuators[1];
-+ else if (valuator_mask_has_unaccelerated(mask))
-+ dy = valuator_mask_get_unaccelerated(mask, 1);
- }
-
- if (DGAStealMotionEvent(device, idx, dx, dy))
---
-2.4.1
-
diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
deleted file mode 100644
index f7feffac6..000000000
--- a/libre/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# $Id: PKGBUILD 249791 2015-10-27 13:18:40Z lcarlier $
-# Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
-# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-pkgbase=xorg-server
-pkgname=('xorg-server')
-pkgver=1.17.4
-pkgrel=2.parabola1
-arch=('i686' 'x86_64' 'armv7h')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto'
- 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
- 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv'
- 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
- 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
- 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
- 'libxshmfence' 'libunwind')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
- xvfb-run
- xvfb-run.1
- 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
- 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
- 0001-systemd-logind-do-not-rely-on-directed-signals.patch)
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
- 'C383B778255613DFDB409D91DB221A6900000011'
- 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457'
- 'SKIP'
- 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
- '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
- '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
- '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
- '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c')
-
-prepare() {
- cd "${pkgbase}-${pkgver}"
- # fix FS#45229, merged upstream
- patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
- patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
-
- # fix VT switching with kdbus; from upstream
- patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch
-
- # fix os name:
- #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR=""
- #Current Operating System = --kernel-name --nodename --kernel-release --kernel-version --machine
- # to:
- #Build Operating System = OSNAME="--operating-system" OSVENDOR="--machine - kernel --kernel-release"
- #Current Operating System = OSNAME="--operating-system" --nodename --machine - kernel --kernel-release --kernel-version
- # see: man uname
-
- sed -i '\|Current Operating System| s|%s %s %s %s %s|%s %s %s - kernel %s %s|
- s|name.sysname, name.nodename, name.release|OSNAME, name.nodename, name.machine|
- s|name.version, name.machine|name.release, name.version|
- ' hw/xfree86/common/xf86Init.c
- sed -i 's|Linux|GNU/Linux|
- s|GNU Hurd|GNU/Hurd|
- ' hw/xfree86/man/{Xorg,xorg.conf}.man
- sed -i 's|uname -srm|uname -o|
- s|uname -s|uname -o|
- ' ChangeLog config.guess configure.ac configure compile
-
- autoreconf -fvi
-}
-
-build() {
- cd "${pkgbase}-${pkgver}"
- ./configure --prefix=/usr \
- --enable-ipv6 \
- --enable-dri \
- --enable-dmx \
- --enable-xvfb \
- --enable-xnest \
- --enable-composite \
- --enable-xcsecurity \
- --enable-libunwind \
- --enable-xorg \
- --enable-xephyr \
- --enable-glamor \
- --enable-xwayland \
- --enable-glx-tls \
- --enable-kdrive \
- --enable-kdrive-evdev \
- --enable-kdrive-kbd \
- --enable-kdrive-mouse \
- --enable-config-udev \
- --enable-systemd-logind \
- --enable-suid-wrapper \
- --disable-install-setuid \
- --enable-record \
- --disable-xfbdev \
- --disable-xfake \
- --disable-static \
- --libexecdir=/usr/lib/xorg-server \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/var/lib/xkb \
- --with-fontrootdir=/usr/share/fonts \
- --with-sha1=libgcrypt \
- --with-os-name="$(uname -o)" \
- --with-os-vendor="$(uname -m) - kernel $(uname -r)"
-
-# --without-dtrace \
-# --disable-linux-acpi --disable-linux-apm \
-
- make
-
- # Disable subdirs for make install rule to make splitting easier
- sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
- -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
- -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
- -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
- -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \
- -i hw/Makefile
-}
-
-package_xorg-server() {
- pkgdesc="Xorg X server, without nonfree nvidia driver support"
- depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau "xorg-server-common=$pkgver" xf86-input-evdev libxshmfence libgl)
- # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
- # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
- provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
- groups=('xorg')
- conflicts=('nvidia-utils' 'glamor-egl' 'xf86-video-modesetting' "${pkgbase}-libre" "${pkgbase}-parabola")
- replaces=('nvidia-utils' 'glamor-egl' 'xf86-video-modesetting' "${pkgbase}-libre" "${pkgbase}-parabola")
- install=xorg-server.install
-
- cd "${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # Needed for non-mesa drivers, libgl will restore it
- mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
- "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
- rm -rf "${pkgdir}/var"
-
- rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
- rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
- rm -rf "${pkgdir}/usr/lib/pkgconfig"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share/aclocal"
- # this is now part of xorg-input-evdev
- rm -rf "${pkgdir}/usr/share/X11/xorg.conf.d/10-evdev.conf"
-}
diff --git a/libre/xorg-server/autoconfig-sis.patch b/libre/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/libre/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
- break;
- }
- break;
-- case 0x1039:
-- driverList[0] = "sis";
-- break;
-+ case 0x1039:
-+ switch (dev->device_id)
-+ {
-+ case 0x6350: case 0x6351:
-+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+ default:
-+ driverList[0] = "sis"; break;
-+ }
-+ break;
- case 0x126f:
- driverList[0] = "siliconmotion";
- break;
diff --git a/libre/xorg-server/xorg-server.install b/libre/xorg-server/xorg-server.install
deleted file mode 100644
index 46bf5a90a..000000000
--- a/libre/xorg-server/xorg-server.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 1.16.0-3) < 0 )); then
- post_install
- fi
-}
-
-post_install() {
- cat <<MSG
->>> xorg-server has now the ability to run without root rights with
- the help of systemd-logind. xserver will fail to run if not launched
- from the same virtual terminal as was used to log in.
- Without root rights, log files will be in ~/.local/share/xorg/ directory.
-
- Old behavior can be restored through Xorg.wrap config file.
- See Xorg.wrap man page (man xorg.wrap).
-MSG
-}
-
diff --git a/libre/xorg-server/xvfb-run b/libre/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/libre/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done. The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user. This is used only as a fallback in the event
-# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
- DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
- echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
- message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
- if [ -n "$*" ]; then
- message "usage error: $*"
- fi
- cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a --auto-servernum try to get a free server number, starting at
- --server-num
--e FILE --error-file=FILE file used to store xauth errors and Xvfb
- output (default: $ERRORFILE)
--f FILE --auth-file=FILE file used to store auth cookie
- (default: ./.Xauthority)
--h --help display this usage message and exit
--n NUM --server-num=NUM server number to use (default: $SERVERNUM)
--l --listen-tcp enable TCP port listening in the X server
--p PROTO --xauth-protocol=PROTO X authority protocol name to use
- (default: xauth command's default)
--s ARGS --server-args=ARGS arguments (other than server number and
- "-nolisten tcp") to pass to the Xvfb server
- (default: "$XVFBARGS")
--w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start
- before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
- # Sadly, the "local" keyword is not POSIX. Leave the next line commented in
- # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
- # anyway.
- #local i
-
- i=$SERVERNUM
- while [ -f /tmp/.X$i-lock ]; do
- i=$(($i + 1))
- done
- echo $i
-}
-
-# Clean up files
-clean_up() {
- if [ -e "$AUTHFILE" ]; then
- XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
- fi
- if [ -n "$XVFB_RUN_TMPDIR" ]; then
- if ! rm -r "$XVFB_RUN_TMPDIR"; then
- error "problem while cleaning up temporary directory"
- exit 5
- fi
- fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
- --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
- --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
- error "internal error; getopt exited with status $GETOPT_STATUS"
- exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
- case "$1" in
- -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
- -e|--error-file) ERRORFILE="$2"; shift ;;
- -f|--auth-file) AUTHFILE="$2"; shift ;;
- -h|--help) SHOWHELP="yes" ;;
- -n|--server-num) SERVERNUM="$2"; shift ;;
- -l|--listen-tcp) LISTENTCP="" ;;
- -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
- -s|--server-args) XVFBARGS="$2"; shift ;;
- -w|--wait) STARTWAIT="$2"; shift ;;
- --) shift; break ;;
- *) error "internal error; getopt permitted \"$1\" unexpectedly"
- exit 6
- ;;
- esac
- shift
-done
-
-if [ "$SHOWHELP" ]; then
- usage
- exit 0
-fi
-
-if [ -z "$*" ]; then
- usage "need a command to run" >&2
- exit 2
-fi
-
-if ! which xauth >/dev/null; then
- error "xauth command not found"
- exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
- XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
- AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
- 2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
- echo "Xvfb failed to start" >&2
- exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/libre/xorg-server/xvfb-run.1 b/libre/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/libre/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it. So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\ file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\ file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\ delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80: