Hi,
David Nusinow, le Wed 16 Aug 2006 22:10:44 +0000, a écrit :
> On Thu, Aug 17, 2006 at 12:45:17AM +0200, Michael Banck wrote:
> > tags 356300 +fixed-upstream
> > thanks
> >
> > Hi,
> >
> > this got applied upstream now (thanks, daniels), any chance this is
> > going into the Debian packages, *please*?
>
> Ok, once 1.1.1 hits unstable we can put it in.
Mmm, in the meanwhile, some Linux-isms have appeared, here is a patch
(which will probably partly be useful for kfreebsd too).
Samuel
--- xorg-server-1.1.1/configure.ac 2006-08-19 18:09:59.000000000 +0000
+++ xorg-server-1.1.1-hurd/configure.ac 2006-08-20 02:08:51.000000000 +0000
@@ -1456,7 +1456,15 @@
# $MIEXT_SHADOW_LIB $XPSTUBS_LIB"
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB
$RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB
$MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB
$OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
- KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
+ case $host_os in
+ *linux*)
+ KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
+ AM_CONDITIONAL(KDRIVELINUX, true)
+ ;;
+ *)
+ AM_CONDITIONAL(KDRIVELINUX, false)
+ ;;
+ esac
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS
$KDRIVE_STUB_LIB"
--- xorg-server-1.1.1/hw/kdrive/Makefile.am 2006-07-05 18:31:39.000000000
+0000
+++ xorg-server-1.1.1-hurd/hw/kdrive/Makefile.am 2006-08-20
02:09:42.000000000 +0000
@@ -15,9 +15,13 @@
XEPHYR_SUBDIRS = ephyr
endif
+if KDRIVELINUX
+LINUX_SUBDIRS = linux
+endif
+
SUBDIRS = \
src \
- linux \
+ $(LINUX_SUBDIRS) \
$(XSDL_SUBDIRS) \
$(FBDEV_SUBDIRS) \
$(VESA_SUBDIRS) \
--- xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c 2006-07-05
18:31:36.000000000 +0000
+++ xorg-server-1.1.1-hurd/GL/glx/indirect_dispatch_swap.c 2006-08-19
16:56:05.000000000 +0000
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
--- xorg-server-1.1.1/GL/glx/indirect_reqsize.c 2006-07-05 18:31:36.000000000
+0000
+++ xorg-server-1.1.1-hurd/GL/glx/indirect_reqsize.c 2006-08-19
16:57:48.000000000 +0000
@@ -31,7 +31,7 @@
#include "indirect_size.h"
#include "indirect_reqsize.h"
-#if defined(linux)
+#if defined(__linux__) || defined(__GNU__)
# include <byteswap.h>
# define SWAP_32(v) do { (v) = bswap_32(v); } while(0)
#else
--- xorg-server-1.1.1/GL/glx/indirect_util.c 2006-07-07 22:36:18.000000000
+0000
+++ xorg-server-1.1.1-hurd/GL/glx/indirect_util.c 2006-08-19
16:57:51.000000000 +0000
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#ifdef __linux__
+#if defined(__linux__) || defined(__GNU__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
