summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch (renamed from patches/xorg-server-1.9.3/remove_udev_if_disabled.diff)13
-rw-r--r--patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch (renamed from patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff)14
-rw-r--r--patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch (renamed from patches/xorg-server-1.9.3/remove_hal_if_disabled.diff)13
l---------patches/xorg-server-1.12.2/autogen.sh (renamed from patches/xorg-server-1.9.3/autogen.sh)0
-rw-r--r--patches/xorg-server-1.12.2/series6
-rw-r--r--patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff50
-rw-r--r--patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch31
-rw-r--r--patches/xorg-server-1.9.3/series5
-rw-r--r--rules/pre/xorg-dirs.make7
-rw-r--r--rules/xorg-server.in16
-rw-r--r--rules/xorg-server.make347
11 files changed, 104 insertions, 398 deletions
diff --git a/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff b/patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
index 0e3695841..edd606a00 100644
--- a/patches/xorg-server-1.9.3/remove_udev_if_disabled.diff
+++ b/patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
@@ -1,16 +1,17 @@
From: Juergen Beisert <jbe@pengutronix.de>
-Subject: Check for LIBUDEV only if udev support is enabled
+Date: Tue, 12 Jun 2012 16:14:22 +0200
+Subject: [PATCH] Check for LIBUDEV only if udev support is enabled
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: xorg-server-1.9.3/configure.ac
-===================================================================
---- xorg-server-1.9.3.orig/configure.ac
-+++ xorg-server-1.9.3/configure.ac
-@@ -828,8 +828,8 @@ if test "x$CONFIG_UDEV" = xyes &&
+diff --git a/configure.ac b/configure.ac
+index d7c59ed..92fdb70 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -818,8 +818,8 @@ if test "x$CONFIG_UDEV" = xyes &&
AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
fi
diff --git a/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff b/patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
index 4f6db7be0..a330ead6a 100644
--- a/patches/xorg-server-1.9.3/remove_dbus_if_disabled.diff
+++ b/patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
@@ -1,17 +1,17 @@
From: Juergen Beisert <jbe@pengutronix.de>
-Subject: Check for DBUS only if dbus support is enabled
+Date: Tue, 12 Jun 2012 16:14:22 +0200
+Subject: [PATCH] Check for DBUS only if dbus support is enabled
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: xorg-server-1.9.3/configure.ac
-===================================================================
---- xorg-server-1.9.3.orig/configure.ac
-+++ xorg-server-1.9.3/configure.ac
-@@ -845,8 +845,8 @@ fi
+diff --git a/configure.ac b/configure.ac
+index 92fdb70..524afea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -844,8 +844,8 @@ fi
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
dnl API.
diff --git a/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff b/patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
index 3a7dc5ceb..fd6aafadf 100644
--- a/patches/xorg-server-1.9.3/remove_hal_if_disabled.diff
+++ b/patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
@@ -1,16 +1,17 @@
From: Juergen Beisert <jbe@pengutronix.de>
-Subject: Check for HAL only if hal support is enabled
+Date: Tue, 12 Jun 2012 16:14:22 +0200
+Subject: [PATCH] Check for HAL only if hal support is enabled
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: xorg-server-1.9.3/configure.ac
-===================================================================
---- xorg-server-1.9.3.orig/configure.ac
-+++ xorg-server-1.9.3/configure.ac
-@@ -864,8 +864,8 @@ if test "x$CONFIG_DBUS_API" = xyes; then
+diff --git a/configure.ac b/configure.ac
+index 524afea..be21976 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -863,8 +863,8 @@ if test "x$CONFIG_DBUS_API" = xyes; then
fi
AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])
diff --git a/patches/xorg-server-1.9.3/autogen.sh b/patches/xorg-server-1.12.2/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/xorg-server-1.9.3/autogen.sh
+++ b/patches/xorg-server-1.12.2/autogen.sh
diff --git a/patches/xorg-server-1.12.2/series b/patches/xorg-server-1.12.2/series
new file mode 100644
index 000000000..cd61a7e6f
--- /dev/null
+++ b/patches/xorg-server-1.12.2/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
+0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
+0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
+# f1d5addf57a6b95a1c69f52b231f1b7a - git-ptx-patches magic
diff --git a/patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff b/patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff
deleted file mode 100644
index d240b6617..000000000
--- a/patches/xorg-server-1.9.3/07-xfree86-fix-build-with-xv-disabled.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From fe7575e929d65e8c798104ec2f72b879051694d3 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Mon, 8 Feb 2010 02:04:33 +0100
-Subject: [PATCH] xfree86: fix build with xv disabled
-
----
- hw/xfree86/modes/xf86Crtc.c | 2 ++
- hw/xfree86/modes/xf86Crtc.h | 2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
-===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:58:09.758394001 +1000
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:59:15.268394002 +1000
-@@ -3084,6 +3084,7 @@
- return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
- }
-
-+#ifdef XV
- /*
- * Return the crtc covering 'box'. If two crtcs cover a portion of
- * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3172,6 +3173,7 @@
-
- return ret;
- }
-+#endif
-
- xf86_crtc_notify_proc_ptr
- xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
-Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
-===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:58:09.778394001 +1000
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:59:15.268394002 +1000
-@@ -934,6 +934,7 @@
- extern _X_EXPORT void
- xf86_cursors_fini (ScreenPtr screen);
-
-+#ifdef XV
- /*
- * For overlay video, compute the relevant CRTC and
- * clip video to that.
-@@ -952,6 +953,7 @@
- RegionPtr reg,
- INT32 width,
- INT32 height);
-+#endif
-
- extern _X_EXPORT xf86_crtc_notify_proc_ptr
- xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
diff --git a/patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch b/patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
deleted file mode 100644
index 0d9845109..000000000
--- a/patches/xorg-server-1.9.3/loader-when-creating-sdksyms.c-only-include-shmint.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9312e7898b6863fb8d472b854a3b9d05e0cfdcbc Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 16 Jul 2010 15:18:02 +0200
-Subject: [PATCH] loader: when creating sdksyms.c only include shmint.h if MITSHM is enabled #29109
-
-When configured with --disable-mitshm the symbols declared in shmint.h
-do not exist. By guarding the include with '#ifdef MITSHM' these
-symbols are skipped when generating sdksyms.c with --disable-mitshm.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- hw/xfree86/loader/sdksyms.sh | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
-index 13c5ae5..bbda4fa 100755
---- a/hw/xfree86/loader/sdksyms.sh
-+++ b/hw/xfree86/loader/sdksyms.sh
-@@ -50,7 +50,9 @@ cat > sdksyms.c << EOF
- */
- #include "geext.h"
- #include "geint.h"
-+#ifdef MITSHM
- #include "shmint.h"
-+#endif
- #if XINERAMA
- # include "panoramiXsrv.h"
- # include "panoramiX.h"
---
-1.7.1
-
diff --git a/patches/xorg-server-1.9.3/series b/patches/xorg-server-1.9.3/series
deleted file mode 100644
index aa40d1db0..000000000
--- a/patches/xorg-server-1.9.3/series
+++ /dev/null
@@ -1,5 +0,0 @@
-07-xfree86-fix-build-with-xv-disabled.diff
-loader-when-creating-sdksyms.c-only-include-shmint.h.patch
-remove_udev_if_disabled.diff
-remove_dbus_if_disabled.diff
-remove_hal_if_disabled.diff
diff --git a/rules/pre/xorg-dirs.make b/rules/pre/xorg-dirs.make
index 8c8896e77..a7b7093ca 100644
--- a/rules/pre/xorg-dirs.make
+++ b/rules/pre/xorg-dirs.make
@@ -6,7 +6,7 @@ XORG_LIBDIR := $(XORG_PREFIX)/lib
XORG_FONTDIR := $(XORG_PREFIX)/share/fonts/X11
XORG_BINDIR := /usr/bin
-XORG_OPTIONS_TRANS =
+XORG_OPTIONS_TRANS = --disable-local-transport
ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX
XORG_OPTIONS_TRANS += --enable-unix-transport
else
@@ -21,4 +21,9 @@ endif
XORG_OPTIONS_TRANS += $(GLOBAL_IPV6_OPTION)
+XORG_OPTIONS_DOCS := \
+ --without-xmlto \
+ --without-fop \
+ --without-xsltproc
+
# vim: syntax=make
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 3a99813c0..845efceb0 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -42,6 +42,8 @@ menuconfig XORG_SERVER
select OPENSSL
select XORG_LIB_XKBFILE
+ select LIBDRM if XORG_SERVER_LIBDRM
+
# input hotplug with udev
select UDEV if XORG_SERVER_UDEV
select UDEV_LIBUDEV if XORG_SERVER_UDEV
@@ -139,6 +141,9 @@ if XORG_SERVER
# ----------------------------------------------------------------------------
+config XORG_SERVER_LIBDRM
+ bool
+
menu "xorg servers "
config XORG_SERVER_XORG
@@ -391,6 +396,7 @@ config XORG_SERVER_OPT_GLX_TLS
config XORG_SERVER_EXT_DRI
bool
+ select XORG_SERVER_LIBDRM
prompt "dri extension"
help
Enable support for the Direct Rendering Infrastructure to get 3D
@@ -401,6 +407,7 @@ config XORG_SERVER_EXT_DRI
config XORG_SERVER_EXT_DRI2
bool
+ select XORG_SERVER_LIBDRM
prompt "dri2 extension"
help
Enable support for the Direct Rendering Infrastructure 2 to get 3D
@@ -441,15 +448,6 @@ config XORG_SERVER_EXT_XCSECURITY
help
FIXME
-config XORG_SERVER_EXT_CALIBRATE
- bool
- depends on BROKEN
- # seems to need xcalibrate proto, but there is no release of
- # http://cgit.freedesktop.org/xorg/lib/libXCalibrate/ available
- prompt "calibrate"
- help
- FIXME
-
config XORG_SERVER_EXT_DBE
bool
prompt "dbe"
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 5a20e3d73..abcf3026a 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
#
# Paths and names
#
-XORG_SERVER_VERSION := 1.9.3
-XORG_SERVER_MD5 := 5bef6839a76d029204ab31aa2fcb5201
+XORG_SERVER_VERSION := 1.12.2
+XORG_SERVER_MD5 := 791f0323b886abb7954de7f042bb7dc6
XORG_SERVER := xorg-server-$(XORG_SERVER_VERSION)
XORG_SERVER_SUFFIX := tar.bz2
XORG_SERVER_URL := $(call ptx/mirror, XORG, individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX))
@@ -25,14 +25,6 @@ XORG_SERVER_SOURCE := $(SRCDIR)/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
XORG_SERVER_DIR := $(BUILDDIR)/$(XORG_SERVER)
# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(XORG_SERVER_SOURCE):
- @$(call targetinfo)
- @$(call get, XORG_SERVER)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -57,291 +49,80 @@ XORG_SERVER_ENV := $(CROSS_ENV) \
# use "=" here
XORG_SERVER_AUTOCONF = \
$(CROSS_AUTOCONF_USR) \
- $(XORG_OPTIONS_TRANS) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --enable-option-checking \
- --disable-maintainer-mode \
- --enable-dependency-tracking \
--disable-strict-compilation \
- --disable-debug \
- --disable-unit-tests \
- --disable-builddocs \
--disable-docs \
--disable-devel-docs \
+ --disable-unit-tests \
+ --disable-static \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-debug \
+ --disable-sparkle \
+ --disable-install-libxf86config \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_AIGLX)-aiglx \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_GLX_TLS)-glx-tls \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_STRING_REGISTRY)-registry \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_COMPOSITE)-composite \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_SHM)-mitshm \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XRES)-xres \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_RECORD)-record \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XV)-xv \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XVMC)-xvmc \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DGA)-dga \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_SCREENSAVER)-screensaver \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XDMCP)-xdmcp \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XDM_AUTH_1)-xdm-auth-1 \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_GLX)-glx \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DRI)-dri \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DRI2)-dri2 \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XINERAMA)-xinerama \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XF86VIDMODE)-xf86vidmode \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XACE)-xace \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XSELINUX)-xselinux \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_XCSECURITY)-xcsecurity \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_TSLIB)-tslib \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DBE)-dbe \
+ --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_EXT_DPMS)-dpms \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_UDEV)-config-udev \
+ --disable-config-dbus \
+ --disable-config-hal \
+ --disable-config-wscons
--disable-xfree86-utils \
+ --enable-xaa \
+ --enable-vgahw \
+ --enable-vbe \
+ --enable-int10-module \
+ --disable-windowswm \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_LIBDRM)-libdrm \
+ --enable-clientids \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XORG)-pciaccess \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XORG)-xorg \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_DMX)-dmx \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XVFB)-xvfb \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XNEST)-xnest \
--disable-xquartz \
- --disable-sparkle \
--disable-standalone-xpbproxy \
- --disable-local-transport \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XWIN)-xwin \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE)-kdrive \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XEPHYR)-xephyr \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XFAKE)-xfake \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_XFBDEV)-xfbdev \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_KBD)-kdrive-kbd \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_MOUSE)-drive-mouse \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_KDRIVE_EVDEV)-kdrive-evdev \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID)-install-setuid \
+ $(XORG_OPTIONS_TRANS) \
+ --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_SECURE_RPC)-secure-rpc \
--without-doxygen \
- --with-xkb-output=/tmp \
- --with-sha1=libcrypto \
+ $(XORG_OPTIONS_DOCS) \
--with-vendor-name=Ptxdist \
--with-vendor-name-short=PTX \
--with-vendor-web=http://www.pengutronix.de/software/ptxdist/index_en.html \
--with-os-name=Linux-$(KERNEL_HEADER_VERSION) \
--with-os-vendor=Ptxdist \
- --with-fontrootdir=$(XORG_FONTDIR)
-
-XORG_SERVER_AUTOCONF += \
- --disable-config-dbus \
- --disable-config-hal
-
-XORG_SERVER_AUTOCONF += \
- --with-fontrootdir=/usr/share/fonts/X11
-
-# FIXME
-# --enable-shared
-# --enable-static
-# --enable-install-libxf86config
-
-# FIXME new options
-
-ifdef PTXCONF_XORG_SERVER_UDEV
-XORG_SERVER_AUTOCONF += --enable-config-udev
-else
-XORG_SERVER_AUTOCONF += --disable-config-udev
-endif
-
-ifdef PTXCONF_XORG_SERVER_OPT_AIGLX
-XORG_SERVER_AUTOCONF += --enable-aiglx
-else
-XORG_SERVER_AUTOCONF += --disable-aiglx
-endif
-
-ifdef PTXCONF_XORG_SERVER_OPT_GLX_TLS
-XORG_SERVER_AUTOCONF += --enable-glx-tls
-else
-XORG_SERVER_AUTOCONF += --disable-glx-tls
-endif
-
-ifdef PTXCONF_XORG_SERVER_STRING_REGISTRY
-XORG_SERVER_AUTOCONF += --enable-registry
-else
-XORG_SERVER_AUTOCONF += --disable-registry
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_COMPOSITE
-XORG_SERVER_AUTOCONF += --enable-composite
-else
-XORG_SERVER_AUTOCONF += --disable-composite
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_SHM
-XORG_SERVER_AUTOCONF += --enable-mitshm
-else
-XORG_SERVER_AUTOCONF += --disable-mitshm
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XRES
-XORG_SERVER_AUTOCONF += --enable-xres
-else
-XORG_SERVER_AUTOCONF += --disable-xres
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_RECORD
-XORG_SERVER_AUTOCONF += --enable-record
-else
-XORG_SERVER_AUTOCONF += --disable-record
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XV
-XORG_SERVER_AUTOCONF += --enable-xv
-else
-XORG_SERVER_AUTOCONF += --disable-xv
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XVMC
-XORG_SERVER_AUTOCONF += --enable-xvmc
-else
-XORG_SERVER_AUTOCONF += --disable-xvmc
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_DGA
-XORG_SERVER_AUTOCONF += --enable-dga
-else
-XORG_SERVER_AUTOCONF += --disable-dga
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_SCREENSAVER
-XORG_SERVER_AUTOCONF += --enable-screensaver
-else
-XORG_SERVER_AUTOCONF += --disable-screensaver
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XDMCP
-XORG_SERVER_AUTOCONF += --enable-xdmcp
-else
-XORG_SERVER_AUTOCONF += --disable-xdmcp
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XDM_AUTH_1
-XORG_SERVER_AUTOCONF += --enable-xdm-auth-1
-else
-XORG_SERVER_AUTOCONF += --disable-xdm-auth-1
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_GLX
-XORG_SERVER_AUTOCONF += --enable-glx
-else
-XORG_SERVER_AUTOCONF += --disable-glx
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_DRI
-XORG_SERVER_AUTOCONF += --enable-dri
-else
-XORG_SERVER_AUTOCONF += --disable-dri
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_DRI2
-XORG_SERVER_AUTOCONF += --enable-dri2
-else
-XORG_SERVER_AUTOCONF += --disable-dri2
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XINERAMA
-XORG_SERVER_AUTOCONF += --enable-xinerama
-else
-XORG_SERVER_AUTOCONF += --disable-xinerama
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XF86VIDMODE
-XORG_SERVER_AUTOCONF += --enable-xf86vidmode
-else
-XORG_SERVER_AUTOCONF += --disable-xf86vidmode
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XACE
-XORG_SERVER_AUTOCONF += --enable-xace
-else
-XORG_SERVER_AUTOCONF += --disable-xace
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XSELINUX
-XORG_SERVER_AUTOCONF += --enable-xselinux
-else
-XORG_SERVER_AUTOCONF += --disable-xselinux
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_XCSECURITY
-XORG_SERVER_AUTOCONF += --enable-xcsecurity
-else
-XORG_SERVER_AUTOCONF += --disable-xcsecurity
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_CALIBRATE
-XORG_SERVER_AUTOCONF += --enable-xcalibrate
-else
-XORG_SERVER_AUTOCONF += --disable-xcalibrate
-endif
-
-ifdef PTXCONF_XORG_SERVER_TSLIB
-XORG_SERVER_AUTOCONF += --enable-tslib
-else
-XORG_SERVER_AUTOCONF += --disable-tslib
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_DBE
-XORG_SERVER_AUTOCONF += --enable-dbe
-else
-XORG_SERVER_AUTOCONF += --disable-dbe
-endif
-
-ifdef PTXCONF_XORG_LIB_X11_XF86BIGFONT
-XORG_SERVER_AUTOCONF += --enable-xf86bigfont
-else
-XORG_SERVER_AUTOCONF += --disable-xf86bigfont
-endif
-
-ifdef PTXCONF_XORG_SERVER_EXT_DPMS
-XORG_SERVER_AUTOCONF += --enable-dpms
-else
-XORG_SERVER_AUTOCONF += --disable-dpms
-endif
-
-ifdef PTXCONF_XORG_SERVER_XORG
-XORG_SERVER_AUTOCONF += --enable-xorg
-else
-XORG_SERVER_AUTOCONF += --disable-xorg
-endif
-
-ifdef PTXCONF_XORG_SERVER_DMX
-XORG_SERVER_AUTOCONF += --enable-dmx
-else
-XORG_SERVER_AUTOCONF += --disable-dmx
-endif
-
-ifdef PTXCONF_XORG_SERVER_XVFB
-XORG_SERVER_AUTOCONF += --enable-xvfb
-else
-XORG_SERVER_AUTOCONF += --disable-xvfb
-endif
-
-ifdef PTXCONF_XORG_SERVER_XNEST
-XORG_SERVER_AUTOCONF += --enable-xnest
-else
-XORG_SERVER_AUTOCONF += --disable-xnest
-endif
-
-ifdef PTXCONF_XORG_SERVER_XWIN
-XORG_SERVER_AUTOCONF += --enable-xwin
-else
-XORG_SERVER_AUTOCONF += --disable-xwin
-endif
-
-ifdef PTXCONF_XORG_SERVER_KDRIVE
-XORG_SERVER_AUTOCONF += --enable-kdrive
-else
-XORG_SERVER_AUTOCONF += --disable-kdrive
-endif
-
-ifdef PTXCONF_XORG_SERVER_XEPHYR
-XORG_SERVER_AUTOCONF += --enable-xephyr
-else
-XORG_SERVER_AUTOCONF += --disable-xephyr
-endif
-
-ifdef PTXCONF_XORG_SERVER_XFAKE
-XORG_SERVER_AUTOCONF += --enable-xfake
-else
-XORG_SERVER_AUTOCONF += --disable-xfake
-endif
-
-ifdef PTXCONF_XORG_SERVER_XFBDEV
-XORG_SERVER_AUTOCONF += --enable-xfbdev
-else
-XORG_SERVER_AUTOCONF += --disable-xfbdev
-endif
-
-ifdef PTXCONF_XORG_SERVER_KDRIVE_KBD
-XORG_SERVER_AUTOCONF += --enable-kdrive-kbd
-else
-XORG_SERVER_AUTOCONF += --disable-kdrive-kbd
-endif
-
-ifdef PTXCONF_XORG_SERVER_KDRIVE_MOUSE
-XORG_SERVER_AUTOCONF += --enable-kdrive-mouse
-else
-XORG_SERVER_AUTOCONF += --disable-kdrive-mouse
-endif
-
-ifdef PTXCONF_XORG_SERVER_KDRIVE_EVDEV
-XORG_SERVER_AUTOCONF += --enable-kdrive-evdev
-else
-XORG_SERVER_AUTOCONF += --disable-kdrive-evdev
-endif
-
-ifdef PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID
-XORG_SERVER_AUTOCONF += --enable-install-setuid
-else
-XORG_SERVER_AUTOCONF += --disable-install-setuid
-endif
-
-ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC
-XORG_SERVER_AUTOCONF += --enable-secure-rpc
-else
-XORG_SERVER_AUTOCONF += --disable-secure-rpc
-endif
+ --with-fontrootdir=$(XORG_FONTDIR) \
+ --with-xkb-output=/tmp \
+ --with-sha1=libcrypto
#
# FIXME rsc: what's the reason for this hack?
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 18:49:01 +0000