Bug#363517: xorg-server and kfreebsd
found 363517 1:1.0.2-5
found 363517 2:1.1.1-4
thanks
I tried to build xorg-server 1.1.1-4 on kfreebsd-i386,
there are needed following patches
- previous 13_kfreebsd-gnu.diff,
- byteswap patch bellow (submitted upstream as https://bugs.freedesktop.org/show_bug.cgi?id=8039),
- again sync man pages suffixes with linux (aclocal.m4), changed in 1:1.1.1-2 only for linux
- attached changes to debian packaging - it looks like kdrive is (still) linux only,
files in usr/lib/xorg/modules/freebsd/*.so are needed for us
With those patches applied (and regenerated configure),
it builds fine for 1.1.1-4.
Petr
--- aclocal.m4~ 2006-08-28 13:12:09.000000000 +0200
+++ aclocal.m4 2006-08-28 13:12:09.000000000 +0200
@@ -6654,13 +6654,13 @@
if test x$APP_MAN_SUFFIX = x ; then
case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
+# gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
*) APP_MAN_SUFFIX=1 ;;
esac
fi
if test x$APP_MAN_DIR = x ; then
case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
+# gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
*) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
esac
fi
@@ -6684,7 +6684,7 @@
fi
if test x$FILE_MAN_DIR = x ; then
case $host_os in
- gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
+# gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
*) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
esac
fi
https://bugs.freedesktop.org/show_bug.cgi?id=8039
--- GL/glx/indirect_dispatch_swap.c~
+++ GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#ifdef __linux__
+#if defined (__linux__) || defined (__GLIBC__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
--- GL/glx/indirect_util.c~
+++ GL/glx/indirect_util.c
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#ifdef __linux__
+#if defined (__linux__) || defined (__GLIBC__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -u xorg-server-1.1.1/debian/control xorg-server-1.1.1/debian/control
--- xorg-server-1.1.1/debian/control 2006-08-28 11:47:20.000000000 +0200
+++ xorg-server-1.1.1/debian/control 2006-08-28 13:40:31.000000000 +0200
@@ -132,7 +132,7 @@
:pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: xserver-xephyr
-Architecture: any
+Architecture: i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients
Description: Next Generation Nested X Server
diff -u xorg-server-1.1.1/debian/rules xorg-server-1.1.1/debian/rules
--- xorg-server-1.1.1/debian/rules 2006-08-28 11:47:20.000000000 +0200
+++ xorg-server-1.1.1/debian/rules 2006-08-28 13:41:15.000000000 +0200
@@ -22,6 +22,8 @@
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
@@ -45,8 +47,6 @@
--enable-xtrap \
--enable-dmx \
--enable-vfb \
- --enable-kdrive \
- --enable-xephyr \
--disable-lbx \
--disable-xprint \
--disable-xorgconfig \
@@ -54,6 +54,10 @@
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ confflags += --enable-kdrive --enable-xephyr
+endif
+
build: patch build-stamp
build-stamp:
dh_testdir
@@ -102,22 +106,22 @@
dh_installdocs
dh_installchangelogs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install -s --sourcedir=debian/tmp --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/serverabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverabiver
- dh_link
- dh_strip --exclude=usr/lib/xorg/modules
+ dh_link -s
+ dh_strip -s --exclude=usr/lib/xorg/modules
find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so" | \
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_compress -s
+ dh_fixperms -s
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
# Build architecture-independent files here.
binary-indep: build install
diff -u xorg-server-1.1.1/debian/xserver-xorg-core.install xorg-server-1.1.1/debian/xserver-xorg-core.install
--- xorg-server-1.1.1/debian/xserver-xorg-core.install 2006-08-28 11:47:20.000000000 +0200
+++ xorg-server-1.1.1/debian/xserver-xorg-core.install 2006-08-28 13:36:25.000000000 +0200
@@ -2,6 +2,7 @@
usr/lib/xorg/modules/extensions/*.so
usr/lib/xorg/modules/fonts/*
usr/lib/xorg/modules/linux/*.so
+usr/lib/xorg/modules/freebsd/*.so
usr/lib/xorg/modules/multimedia/*.so
usr/bin/Xorg
usr/share/man/man1/Xserver.1
Reply to: