debian/changelog | 3 ++-
debian/control | 2 +-
debian/rules | 11 +++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 50ddaffe30920254835c7bfcc152a3f9860d1c2a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 23 13:56:59 2007 +0200
Don't build Xfbdev on !linux.
Xfbdev is linux-only, so don't build it on other systems.
Additionally, don't build the kdrive-based servers that we don't ship.
diff --git a/debian/changelog b/debian/changelog
index 7af3b61..d76314e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,9 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
13949f997289068354e83bc83e50d97b8232efb1 to remove the type1 module: patch
05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in
debian/patches/series.
+ * Don't build kdrive-based servers we're not shipping.
- -- Christian Perrier <[EMAIL PROTECTED]> Sun, 23 Sep 2007 08:39:42 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 23 Sep 2007 13:55:28 +0200
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6ef2273..292823b 100644
--- a/debian/control
+++ b/debian/control
@@ -183,7 +183,7 @@ Description: nested X server
This package is built from the X.org xserver module.
Package: xserver-xfbdev
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips
mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients
Description: Linux framebuffer device tiny X server
diff --git a/debian/rules b/debian/rules
index 1959722..8395999 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,12 +22,19 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ build_xfbdev = --enable-xfbdev
+else
+ build_xfbdev = --disable-xfbdev
+endif
+
BUILD_XPRINT = false
ifeq ($(BUILD_XPRINT), true)
confflags += --enable-xprint
@@ -50,6 +57,10 @@ confflags += --disable-static \
--enable-vfb \
--enable-kdrive \
--enable-xephyr \
+ --disable-xsdl \
+ --disable-xfake \
+ $(build_xfbdev) \
+ --disable-kdrive-vesa \
--disable-lbx \
--enable-freetype \
--disable-xorgconfig \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
