xorg-server: Changes to 'debian-experimental'
debian/changelog | 9 +++++++++
debian/rules | 17 +++++++++++++++++
2 files changed, 26 insertions(+)
New commits:
commit 86c1c140a80018181aa1fec45a63323def0100d5
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 22:14:20 2015 +0200
Fix typo in changelog
diff --git a/debian/changelog b/debian/changelog
index 7c465b3..d40249f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg-server (2:1.17.1-2) experimental; urgency=medium
- * Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
+ * Disable libdrm support on hurd and in the kfreebsd udeb build, so we don't
try building the modesetting driver without libdrm. We should probably
revisit this later and ship modesetting_drv.so in d-i, but this should do
for now.
commit 6a5211b8744a55e5ade7c0ad7826b4de31c78fc6
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 22:13:49 2015 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 3ea0e66..7c465b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.17.1-2) UNRELEASED; urgency=medium
+xorg-server (2:1.17.1-2) experimental; urgency=medium
* Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
try building the modesetting driver without libdrm. We should probably
revisit this later and ship modesetting_drv.so in d-i, but this should do
for now.
- -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2015 21:39:19 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2015 22:04:01 +0200
xorg-server (2:1.17.1-1) experimental; urgency=medium
commit cbf49e0f21ba8b663d8b5432310b9ccdd6695089
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 4 21:42:49 2015 +0200
Disable libdrm support on hurd and in the udev build
Otherwise we try building the modesetting driver without libdrm.
We should probably revisit this later and ship modesetting_drv.so in
d-i, but this should do for now.
diff --git a/debian/changelog b/debian/changelog
index d1a4d51..3ea0e66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.1-2) UNRELEASED; urgency=medium
+
+ * Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
+ try building the modesetting driver without libdrm. We should probably
+ revisit this later and ship modesetting_drv.so in d-i, but this should do
+ for now.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 May 2015 21:39:19 +0200
+
xorg-server (2:1.17.1-1) experimental; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/rules b/debian/rules
index 080fd7e..09a824f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,21 @@ 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)))
@@ -141,6 +156,7 @@ confflags_main = \
--enable-xdm-auth-1 \
--enable-glx \
$(dri) \
+ $(libdrm_main) \
--enable-present \
--enable-xinerama \
--enable-xf86vidmode \
@@ -173,6 +189,7 @@ confflags_udeb = \
--disable-glx \
--disable-dri \
--disable-dri2 \
+ $(libdrm_udeb) \
--disable-xinerama \
--disable-xf86vidmode \
--disable-xace \
Reply to: