debian/changelog | 8 ++
debian/rules | 171 -----------------------------------------------------
debian/rules.flags | 155 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 165 insertions(+), 169 deletions(-)
New commits:
commit b688ff31bd9e655cf49a18e426e7732041e82005
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 19:43:04 2017 +0200
Move rules to rules.flags
diff --git a/debian/changelog b/debian/changelog
index e8d9ef5..1401e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.19.4-2) UNRELEASED; urgency=medium
- * rules: Try to simplify a bit flags handling.
+ * rules: Try to simplify a bit flags handling and move them
+ to rules.flags.
* rules: Remove --disable-silent-rules, dh passes that for us.
-- Emilio Pozuelo Monfort <po...@debian.org> Tue, 10 Oct 2017 18:55:26 +0200
diff --git a/debian/rules b/debian/rules
index 7fd6570..585b869 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,160 +1,8 @@
#!/usr/bin/make -f
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-# disable-static is so we don't get libfoo.a for modules. now if only we could
-# kill the .las.
-confflags += \
- --libdir=\$${prefix}/lib \
- --libexecdir=\$${libdir}/xorg \
- --disable-static \
- --without-dtrace \
- --disable-strict-compilation \
- --disable-debug \
- --with-int10=x86emu \
- --with-os-vendor="$(VENDOR)" \
- --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/var/lib/xkb \
- --with-shared-memory-dir=/dev/shm \
- --enable-mitshm \
- --enable-xres \
- --disable-xcsecurity \
- --disable-tslib \
- --enable-dbe \
- --disable-xf86bigfont \
- --enable-dpms \
- --enable-xorg \
- --disable-linux-acpi \
- --disable-linux-apm \
- --disable-xquartz \
- --disable-xwin \
- --disable-xfake \
- --disable-xfbdev \
- --disable-install-setuid
-
-confflags_main = \
-
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins"
\
- --enable-composite \
- --enable-record \
- --enable-xv \
- --enable-xvmc \
- --enable-dga \
- --enable-screensaver \
- --enable-xdmcp \
- --enable-xdm-auth-1 \
- --enable-glx \
- --enable-present \
- --enable-xinerama \
- --enable-xf86vidmode \
- --enable-xace \
- --enable-xfree86-utils \
- --enable-suid-wrapper \
- --enable-dmx \
- --enable-xvfb \
- --enable-xnest \
- --enable-kdrive \
- --enable-xephyr \
- --with-sha1=libgcrypt \
- --enable-xcsecurity \
- $(void)
-
-confflags_udeb = \
- --with-default-font-path="built-ins" \
- --disable-composite \
- --disable-record \
- --disable-xv \
- --disable-xvmc \
- --enable-dga \
- --disable-screensaver \
- --disable-xdmcp \
- --disable-xdm-auth-1 \
- --disable-glx \
- --disable-dri \
- --disable-dri2 \
- --disable-glamor \
- --disable-xinerama \
- --disable-xf86vidmode \
- --disable-xace \
- --disable-xselinux \
- --disable-xfree86-utils \
- --disable-xwayland \
- --disable-systemd-logind \
- --without-systemd-daemon \
- --disable-suid-wrapper \
- --disable-dmx \
- --disable-xvfb \
- --disable-xnest \
- --disable-kdrive \
- --disable-xephyr \
- --with-sha1=libnettle \
- $(void)
-
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- confflags_main += \
- --enable-dri3 \
- --enable-xselinux \
- --enable-xwayland \
- --enable-systemd-logind \
- --with-systemd-daemon
-else
- confflags_main += \
- --disable-dri3 \
- --disable-xselinux \
- --disable-xwayland \
- --disable-systemd-logind \
- --without-systemd-daemon
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
- confflags_main += --disable-dri --disable-dri2
- confflags_main += --disable-glamor
- confflags += --disable-xshmfence
-else
- confflags_main += --enable-dri --enable-dri2
- confflags_main += --enable-glamor
- confflags += --enable-xshmfence
-endif
-
-confflags += --disable-config-hal
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- confflags += --enable-config-udev
-else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- confflags += --disable-config-udev --enable-config-devd
- libs = $(shell pkg-config --libs libbsd-overlay)
- cppflags = $(shell pkg-config --cflags libbsd-overlay)
-else # hurd
- confflags += --disable-config-udev
-endif
-
-# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
-# even in udeb
-# kfreebsd: libdrm for dri in main build
-# hurd: no libdrm
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- confflags_main += --enable-libdrm
- confflags_udeb += --enable-libdrm
-else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- confflags_main += --enable-libdrm
- confflags_udeb += --disable-libdrm
-else # hurd
- confflags_main += --disable-libdrm
- confflags_udeb += --disable-libdrm
-endif
+include debian/rules.flags
-vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie"
DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic"
DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags
--export=configure) LIBS="$(libs)"
-
-ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
- confflags += --disable-unit-tests
-else
- confflags += --enable-unit-tests
-endif
-
-VENDOR = $(shell lsb_release -i -s)
-SUPPORT = https://www.debian.org/support
-
-SOURCE_NAME := xorg-server
-SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
%:
dh $@ --with quilt,autoreconf --parallel
diff --git a/debian/rules.flags b/debian/rules.flags
new file mode 100755
index 0000000..2850da6
--- /dev/null
+++ b/debian/rules.flags
@@ -0,0 +1,155 @@
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+VENDOR = $(shell lsb_release -i -s)
+SUPPORT = https://www.debian.org/support
+
+SOURCE_NAME := xorg-server
+SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
+
+# disable-static is so we don't get libfoo.a for modules. now if only we could
+# kill the .las.
+confflags += \
+ --libdir=\$${prefix}/lib \
+ --libexecdir=\$${libdir}/xorg \
+ --disable-static \
+ --without-dtrace \
+ --disable-strict-compilation \
+ --disable-debug \
+ --with-int10=x86emu \
+ --with-os-vendor="$(VENDOR)" \
+ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \
+ --with-xkb-path=/usr/share/X11/xkb \
+ --with-xkb-output=/var/lib/xkb \
+ --with-shared-memory-dir=/dev/shm \
+ --enable-mitshm \
+ --enable-xres \
+ --disable-xcsecurity \
+ --disable-tslib \
+ --enable-dbe \
+ --disable-xf86bigfont \
+ --enable-dpms \
+ --enable-xorg \
+ --disable-linux-acpi \
+ --disable-linux-apm \
+ --disable-xquartz \
+ --disable-xwin \
+ --disable-xfake \
+ --disable-xfbdev \
+ --disable-install-setuid
+
+confflags_main = \
+
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins"
\
+ --enable-composite \
+ --enable-record \
+ --enable-xv \
+ --enable-xvmc \
+ --enable-dga \
+ --enable-screensaver \
+ --enable-xdmcp \
+ --enable-xdm-auth-1 \
+ --enable-glx \
+ --enable-present \
+ --enable-xinerama \
+ --enable-xf86vidmode \
+ --enable-xace \
+ --enable-xfree86-utils \
+ --enable-suid-wrapper \
+ --enable-dmx \
+ --enable-xvfb \
+ --enable-xnest \
+ --enable-kdrive \
+ --enable-xephyr \
+ --with-sha1=libgcrypt \
+ --enable-xcsecurity \
+ $(void)
+
+confflags_udeb = \
+ --with-default-font-path="built-ins" \
+ --disable-composite \
+ --disable-record \
+ --disable-xv \
+ --disable-xvmc \
+ --enable-dga \
+ --disable-screensaver \
+ --disable-xdmcp \
+ --disable-xdm-auth-1 \
+ --disable-glx \
+ --disable-dri \
+ --disable-dri2 \
+ --disable-glamor \
+ --disable-xinerama \
+ --disable-xf86vidmode \
+ --disable-xace \
+ --disable-xselinux \
+ --disable-xfree86-utils \
+ --disable-xwayland \
+ --disable-systemd-logind \
+ --without-systemd-daemon \
+ --disable-suid-wrapper \
+ --disable-dmx \
+ --disable-xvfb \
+ --disable-xnest \
+ --disable-kdrive \
+ --disable-xephyr \
+ --with-sha1=libnettle \
+ $(void)
+
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags_main += \
+ --enable-dri3 \
+ --enable-xselinux \
+ --enable-xwayland \
+ --enable-systemd-logind \
+ --with-systemd-daemon
+else
+ confflags_main += \
+ --disable-dri3 \
+ --disable-xselinux \
+ --disable-xwayland \
+ --disable-systemd-logind \
+ --without-systemd-daemon
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ confflags_main += --disable-dri --disable-dri2
+ confflags_main += --disable-glamor
+ confflags += --disable-xshmfence
+else
+ confflags_main += --enable-dri --enable-dri2
+ confflags_main += --enable-glamor
+ confflags += --enable-xshmfence
+endif
+
+confflags += --disable-config-hal
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags += --enable-config-udev
+else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ confflags += --disable-config-udev --enable-config-devd
+ libs = $(shell pkg-config --libs libbsd-overlay)
+ cppflags = $(shell pkg-config --cflags libbsd-overlay)
+else # hurd
+ confflags += --disable-config-udev
+endif
+
+# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
+# even in udeb
+# kfreebsd: libdrm for dri in main build
+# hurd: no libdrm
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags_main += --enable-libdrm
+ confflags_udeb += --enable-libdrm
+else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ confflags_main += --enable-libdrm
+ confflags_udeb += --disable-libdrm
+else # hurd
+ confflags_main += --disable-libdrm
+ confflags_udeb += --disable-libdrm
+endif
+
+ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ confflags += --disable-unit-tests
+else
+ confflags += --enable-unit-tests
+endif
+
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie"
DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic"
DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags
--export=configure) LIBS="$(libs)"
commit b8b99a32a5a93187d0ee83d248f43fbb36255769
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 19:37:24 2017 +0200
Move --lib(exec)dir to common flags
diff --git a/debian/rules b/debian/rules
index 31ba8cd..7fd6570 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture
-qDEB_HOST_ARCH_OS)
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
+ --libdir=\$${prefix}/lib \
+ --libexecdir=\$${libdir}/xorg \
--disable-static \
--without-dtrace \
--disable-strict-compilation \
@@ -169,14 +171,10 @@ build-source-stamp:
override_dh_auto_configure:
dh_auto_configure --builddirectory=debian/build/main -- \
- --libdir=\$${prefix}/lib \
- --libexecdir=\$${libdir}/xorg \
$(confflags) \
$(confflags_main) \
$(vars)
dh_auto_configure --builddirectory=debian/build/udeb -- \
- --libdir=\$${prefix}/lib \
- --libexecdir=\$${libdir}/xorg \
$(confflags) \
$(confflags_udeb) \
$(vars)
commit 65d4d5a4c419e999d57241ce2ab3ac8c40493d80
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 19:06:32 2017 +0200
Merge dri3 flags with other (non-)linux ones
diff --git a/debian/rules b/debian/rules
index 0397966..31ba8cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,12 +90,14 @@ confflags_udeb = \
ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_main += \
+ --enable-dri3 \
--enable-xselinux \
--enable-xwayland \
--enable-systemd-logind \
--with-systemd-daemon
else
confflags_main += \
+ --disable-dri3 \
--disable-xselinux \
--disable-xwayland \
--disable-systemd-logind \
@@ -112,12 +114,6 @@ else
confflags += --enable-xshmfence
endif
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- confflags_main += --enable-dri3
-else
- confflags_main += --disable-dri3
-endif
-
confflags += --disable-config-hal
ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags += --enable-config-udev
commit 80ab8f534e3f217527767d9e2f1aa251ad66310a
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 18:57:11 2017 +0200
Let dh pass --disable-silent-rules
diff --git a/debian/changelog b/debian/changelog
index c547250..e8d9ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.19.4-2) UNRELEASED; urgency=medium
* rules: Try to simplify a bit flags handling.
+ * rules: Remove --disable-silent-rules, dh passes that for us.
-- Emilio Pozuelo Monfort <po...@debian.org> Tue, 10 Oct 2017 18:55:26 +0200
diff --git a/debian/rules b/debian/rules
index aaf15cf..0397966 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture
-qDEB_HOST_ARCH_OS)
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
- --disable-silent-rules \
--disable-static \
--without-dtrace \
--disable-strict-compilation \
commit b68c3b6aa823b228dcf02ff485b5a037560bdf19
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 18:56:36 2017 +0200
Drop useless spaces
diff --git a/debian/rules b/debian/rules
index e65810a..aaf15cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,32 +5,32 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture
-qDEB_HOST_ARCH_OS)
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
- --disable-silent-rules \
- --disable-static \
- --without-dtrace \
- --disable-strict-compilation \
- --disable-debug \
- --with-int10=x86emu \
- --with-os-vendor="$(VENDOR)" \
- --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(SUPPORT))" \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/var/lib/xkb \
- --with-shared-memory-dir=/dev/shm \
- --enable-mitshm \
- --enable-xres \
- --disable-xcsecurity \
- --disable-tslib \
- --enable-dbe \
- --disable-xf86bigfont \
- --enable-dpms \
- --enable-xorg \
- --disable-linux-acpi \
- --disable-linux-apm \
- --disable-xquartz \
- --disable-xwin \
- --disable-xfake \
- --disable-xfbdev \
- --disable-install-setuid
+ --disable-silent-rules \
+ --disable-static \
+ --without-dtrace \
+ --disable-strict-compilation \
+ --disable-debug \
+ --with-int10=x86emu \
+ --with-os-vendor="$(VENDOR)" \
+ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \
+ --with-xkb-path=/usr/share/X11/xkb \
+ --with-xkb-output=/var/lib/xkb \
+ --with-shared-memory-dir=/dev/shm \
+ --enable-mitshm \
+ --enable-xres \
+ --disable-xcsecurity \
+ --disable-tslib \
+ --enable-dbe \
+ --disable-xf86bigfont \
+ --enable-dpms \
+ --enable-xorg \
+ --disable-linux-acpi \
+ --disable-linux-apm \
+ --disable-xquartz \
+ --disable-xwin \
+ --disable-xfake \
+ --disable-xfbdev \
+ --disable-install-setuid
confflags_main = \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins"
\
commit d4d9be87fe4e39678e74162aaba9c7f81e9c04e0
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 10 18:55:57 2017 +0200
Simplify flags handling
diff --git a/debian/changelog b/debian/changelog
index 96d27f9..c547250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.19.4-2) UNRELEASED; urgency=medium
+
+ * rules: Try to simplify a bit flags handling.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Tue, 10 Oct 2017 18:55:26 +0200
+
xorg-server (2:1.19.4-1) unstable; urgency=medium
[ Sven Joachim ]
diff --git a/debian/rules b/debian/rules
index f4aae09..e65810a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,74 +2,6 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- selinux = --enable-xselinux
- wayland = --enable-xwayland
- logind = --enable-systemd-logind
- systemd-daemon = --with-systemd-daemon
-else
- selinux = --disable-xselinux
- wayland = --disable-xwayland
- logind = --disable-systemd-logind
- systemd-daemon = --without-systemd-daemon
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
- dri = --disable-dri --disable-dri2
- dri += --disable-glamor
- xshmfence = --disable-xshmfence
-else
- dri = --enable-dri --enable-dri2
- dri += --enable-glamor
- xshmfence = --enable-xshmfence
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- dri += --enable-dri3
-else
- dri += --disable-dri3
-endif
-
-config_backend = --disable-config-hal
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- config_backend += --enable-config-udev
-else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- config_backend += --disable-config-udev --enable-config-devd
- libs = $(shell pkg-config --libs libbsd-overlay)
- cppflags = $(shell pkg-config --cflags libbsd-overlay)
-else # hurd
- config_backend += --disable-config-udev
-endif
-
-# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
-# even in udeb
-# kfreebsd: libdrm for dri in main build
-# hurd: no libdrm
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- libdrm_main = --enable-libdrm
- libdrm_udeb = --enable-libdrm
-else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- libdrm_main = --enable-libdrm
- libdrm_udeb = --disable-libdrm
-else # hurd
- libdrm_main = --disable-libdrm
- libdrm_udeb = --disable-libdrm
-endif
-
-vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie"
DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic"
DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags
--export=configure) LIBS="$(libs)"
-
-ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
- config_tests = --disable-unit-tests
-else
- config_tests = --enable-unit-tests
-endif
-
-VENDOR = $(shell lsb_release -i -s)
-SUPPORT = https://www.debian.org/support
-
-SOURCE_NAME := xorg-server
-SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
-
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
@@ -78,7 +10,6 @@ confflags += \
--without-dtrace \
--disable-strict-compilation \
--disable-debug \
- $(config_tests) \
--with-int10=x86emu \
--with-os-vendor="$(VENDOR)" \
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION)
($(SUPPORT))" \
@@ -92,8 +23,6 @@ confflags += \
--enable-dbe \
--disable-xf86bigfont \
--enable-dpms \
- $(xshmfence) \
- $(config_backend) \
--enable-xorg \
--disable-linux-acpi \
--disable-linux-apm \
@@ -114,17 +43,11 @@ confflags_main = \
--enable-xdmcp \
--enable-xdm-auth-1 \
--enable-glx \
- $(dri) \
- $(libdrm_main) \
--enable-present \
--enable-xinerama \
--enable-xf86vidmode \
--enable-xace \
- $(selinux) \
--enable-xfree86-utils \
- $(wayland) \
- $(logind) \
- $(systemd-daemon) \
--enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
@@ -149,7 +72,6 @@ confflags_udeb = \
--disable-dri \
--disable-dri2 \
--disable-glamor \
- $(libdrm_udeb) \
--disable-xinerama \
--disable-xf86vidmode \
--disable-xace \
@@ -167,6 +89,76 @@ confflags_udeb = \
--with-sha1=libnettle \
$(void)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags_main += \
+ --enable-xselinux \
+ --enable-xwayland \
+ --enable-systemd-logind \
+ --with-systemd-daemon
+else
+ confflags_main += \
+ --disable-xselinux \
+ --disable-xwayland \
+ --disable-systemd-logind \
+ --without-systemd-daemon
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+ confflags_main += --disable-dri --disable-dri2
+ confflags_main += --disable-glamor
+ confflags += --disable-xshmfence
+else
+ confflags_main += --enable-dri --enable-dri2
+ confflags_main += --enable-glamor
+ confflags += --enable-xshmfence
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags_main += --enable-dri3
+else
+ confflags_main += --disable-dri3
+endif
+
+confflags += --disable-config-hal
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags += --enable-config-udev
+else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ confflags += --disable-config-udev --enable-config-devd
+ libs = $(shell pkg-config --libs libbsd-overlay)
+ cppflags = $(shell pkg-config --cflags libbsd-overlay)
+else # hurd
+ confflags += --disable-config-udev
+endif
+
+# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
+# even in udeb
+# kfreebsd: libdrm for dri in main build
+# hurd: no libdrm
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ confflags_main += --enable-libdrm
+ confflags_udeb += --enable-libdrm
+else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ confflags_main += --enable-libdrm
+ confflags_udeb += --disable-libdrm
+else # hurd
+ confflags_main += --disable-libdrm
+ confflags_udeb += --disable-libdrm
+endif
+
+vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie"
DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic"
DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags
--export=configure) LIBS="$(libs)"
+
+ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ confflags += --disable-unit-tests
+else
+ confflags += --enable-unit-tests
+endif
+
+VENDOR = $(shell lsb_release -i -s)
+SUPPORT = https://www.debian.org/support
+
+SOURCE_NAME := xorg-server
+SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
+
%:
dh $@ --with quilt,autoreconf --parallel
