X Strike Force X.Org X11 SVN commit: r3530 - in trunk/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-09-27 21:01:09 -0400 (Wed, 27 Sep 2006)
New Revision: 3530
Added:
trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
trunk/xserver/xorg-server/debian/patches/series
Log:
* Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and
Michael Banck. Closes: #356300
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-09-28 00:57:09 UTC (rev 3529)
+++ trunk/xserver/xorg-server/debian/changelog 2006-09-28 01:01:09 UTC (rev 3530)
@@ -15,8 +15,10 @@
* Add kFreeBSD support patch (23). Thanks to Robert Millan, Petr Salinger,
Daniel Stone, and Michael Banck for input and patch writing.
Closes: #363517
+ * Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and
+ Michael Banck. Closes: #356300
- -- David Nusinow <dnusinow@debian.org> Wed, 27 Sep 2006 20:54:38 -0400
+ -- David Nusinow <dnusinow@debian.org> Wed, 27 Sep 2006 21:00:32 -0400
xorg-server (2:1.1.1-8) unstable; urgency=low
Modified: trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-09-28 00:57:09 UTC (rev 3529)
+++ trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-09-28 01:01:09 UTC (rev 3530)
@@ -1,7 +1,7 @@
Index: xorg-server/configure
===================================================================
---- xorg-server.orig/configure 2006-09-27 20:18:10.000000000 -0400
-+++ xorg-server/configure 2006-09-27 20:54:26.000000000 -0400
+--- xorg-server.orig/configure 2006-09-27 20:54:33.000000000 -0400
++++ xorg-server/configure 2006-09-27 20:58:22.000000000 -0400
@@ -26162,11 +26162,14 @@
KDRIVE_HW=no
case $host_os in
@@ -84,7 +84,7 @@
Index: xorg-server/debian/patches/20_kbsd.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/debian/patches/20_kbsd.patch 2006-09-27 20:54:26.000000000 -0400
++++ xorg-server/debian/patches/20_kbsd.patch 2006-09-27 20:58:22.000000000 -0400
@@ -0,0 +1,126 @@
+Index: xorg-server-1.1.1/configure.ac
+===================================================================
@@ -212,22 +212,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/agpio.h>
+ #endif
-Index: xorg-server/debian/patches/series
-===================================================================
---- xorg-server.orig/debian/patches/series 2006-09-27 20:54:24.000000000 -0400
-+++ xorg-server/debian/patches/series 2006-09-27 20:54:26.000000000 -0400
-@@ -17,6 +17,7 @@
- 17_ignoreabi.diff
- 18_execinfo_only_for_backtrace.patch
- 19_configurable_misc_utils.patch
-+20_kbsd.patch
- 20_mesa_6.5.1.diff
- 21_glx_align_fixes.patch
- 22_xkb_cycle_3layouts.diff
Index: xorg-server/debian/xserver-xorg-core.install
===================================================================
---- xorg-server.orig/debian/xserver-xorg-core.install 2006-09-18 17:25:52.000000000 -0400
-+++ xorg-server/debian/xserver-xorg-core.install 2006-09-27 20:54:26.000000000 -0400
+--- xorg-server.orig/debian/xserver-xorg-core.install 2006-09-27 20:54:33.000000000 -0400
++++ xorg-server/debian/xserver-xorg-core.install 2006-09-27 20:58:22.000000000 -0400
@@ -2,6 +2,7 @@
usr/lib/xorg/modules/extensions/*.so
usr/lib/xorg/modules/fonts/*
Added: trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff (rev 0)
+++ trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff 2006-09-28 01:01:09 UTC (rev 3530)
@@ -0,0 +1,79 @@
+Index: xorg-server/configure.ac
+===================================================================
+--- xorg-server.orig/configure.ac 2006-09-27 20:58:22.000000000 -0400
++++ xorg-server/configure.ac 2006-09-27 20:58:36.000000000 -0400
+@@ -1470,7 +1470,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"
+
+Index: xorg-server/hw/kdrive/Makefile.am
+===================================================================
+--- xorg-server.orig/hw/kdrive/Makefile.am 2006-09-18 17:26:22.000000000 -0400
++++ xorg-server/hw/kdrive/Makefile.am 2006-09-27 20:58:36.000000000 -0400
+@@ -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) \
+Index: xorg-server/GL/glx/indirect_dispatch_swap.c
+===================================================================
+--- xorg-server.orig/GL/glx/indirect_dispatch_swap.c 2006-09-18 17:27:44.000000000 -0400
++++ xorg-server/GL/glx/indirect_dispatch_swap.c 2006-09-27 20:58:36.000000000 -0400
+@@ -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>
+Index: xorg-server/GL/glx/indirect_reqsize.c
+===================================================================
+--- xorg-server.orig/GL/glx/indirect_reqsize.c 2006-09-18 17:27:44.000000000 -0400
++++ xorg-server/GL/glx/indirect_reqsize.c 2006-09-27 20:58:36.000000000 -0400
+@@ -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
+Index: xorg-server/GL/glx/indirect_util.c
+===================================================================
+--- xorg-server.orig/GL/glx/indirect_util.c 2006-09-18 17:27:44.000000000 -0400
++++ xorg-server/GL/glx/indirect_util.c 2006-09-27 20:58:36.000000000 -0400
+@@ -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>
Modified: trunk/xserver/xorg-server/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2006-09-28 00:57:09 UTC (rev 3529)
+++ trunk/xserver/xorg-server/debian/patches/series 2006-09-28 01:01:09 UTC (rev 3530)
@@ -21,3 +21,4 @@
21_glx_align_fixes.patch
22_xkb_cycle_3layouts.diff
23_kfreebsd_support.diff
+24_hurd_support.diff
Reply to: