X Strike Force X.Org X11 SVN commit: r3922 - trunk/xserver/xorg-server/debian/patches
Author: julien
Date: 2006-10-31 12:01:51 -0500 (Tue, 31 Oct 2006)
New Revision: 3922
Modified:
trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff
trunk/xserver/xorg-server/debian/patches/34_xorg.conf_man_typos.patch
Log:
Remove hunk from patch 23_kfreebsd_support.diff applying to configure
Modified: trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-10-31 16:57:46 UTC (rev 3921)
+++ trunk/xserver/xorg-server/debian/patches/23_kfreebsd_support.diff 2006-10-31 17:01:51 UTC (rev 3922)
@@ -1,585 +1,7 @@
-Index: xorg-server/configure
-===================================================================
---- xorg-server.orig/configure
-+++ xorg-server/configure
-@@ -883,6 +883,7 @@
- FBDEVHW_FALSE
- FREEBSD_KLDLOAD_TRUE
- FREEBSD_KLDLOAD_FALSE
-+GLX_ARCH_DEFINES
- ALPHA_VIDEO_TRUE
- ALPHA_VIDEO_FALSE
- ARM_VIDEO_TRUE
-@@ -987,6 +988,8 @@
- XPRINT_FALSE
- XINPUT_TRUE
- XINPUT_FALSE
-+MISCUTILS_TRUE
-+MISCUTILS_FALSE
- XDMCP_CFLAGS
- XDMCP_LIBS
- XDMCP_TRUE
-@@ -997,6 +1000,7 @@
- USE_RGB_BUILTIN_FALSE
- COMPILEDDEFAULTFONTPATH
- RGB_DB
-+SERVERCONFIGdir
- DRI_DRIVER_PATH
- VENDOR_STRING
- VENDOR_STRING_SHORT
-@@ -1147,6 +1151,8 @@
- XWIN_XV_FALSE
- KDRIVE_TRUE
- KDRIVE_FALSE
-+KDRIVELINUX_TRUE
-+KDRIVELINUX_FALSE
- XEPHYR_CFLAGS
- XEPHYR_LIBS
- KDRIVE_INCS
-@@ -1907,6 +1913,7 @@
- --disable-xf86bigfont Build XF86 Big Font extension (default: enabled)
- --disable-dpms Build DPMS extension (default: enabled)
- --disable-xinput Build XInput Extension (default: enabled)
-+ --enable-misc-utils Build misc utilities (default: enabled)
- --enable-xorg Build Xorg server (default: auto)
- --enable-dmx Build DMX server (default: auto)
- --enable-xvfb Build Xvfb server (default: yes)
-@@ -1971,6 +1978,8 @@
- --with-xkb-output=PATH Path to XKB output dir (default:
- ${datadir}/X11/xkb/compiled)
- --with-rgb-path=PATH Path to RGB database (default: ${datadir}/X11/rgb)
-+ --with-serverconfig-path=PATH
-+ Path to server config (default: ${libdir}/xserver)
- --with-dri-driver-path=PATH
- Path to DRI drivers (default: ${libdir}/dri)
- --with-freetype-config=PROG
-@@ -5103,7 +5112,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5106 "configure"' > conftest.$ac_ext
-+ echo '#line 5115 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8357,11 +8366,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8360: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8369: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8364: \$? = $ac_status" >&5
-+ echo "$as_me:8373: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8625,11 +8634,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8628: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8637: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8632: \$? = $ac_status" >&5
-+ echo "$as_me:8641: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8729,11 +8738,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8732: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8741: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8736: \$? = $ac_status" >&5
-+ echo "$as_me:8745: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -11170,7 +11179,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11173 "configure"
-+#line 11182 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11270,7 +11279,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11273 "configure"
-+#line 11282 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -13638,11 +13647,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13641: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13650: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13645: \$? = $ac_status" >&5
-+ echo "$as_me:13654: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -13742,11 +13751,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13745: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13754: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13749: \$? = $ac_status" >&5
-+ echo "$as_me:13758: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -15303,11 +15312,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15306: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15315: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15310: \$? = $ac_status" >&5
-+ echo "$as_me:15319: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15407,11 +15416,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15410: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15419: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15414: \$? = $ac_status" >&5
-+ echo "$as_me:15423: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -17626,11 +17635,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17629: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17638: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17633: \$? = $ac_status" >&5
-+ echo "$as_me:17642: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17894,11 +17903,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17897: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17906: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17901: \$? = $ac_status" >&5
-+ echo "$as_me:17910: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -17998,11 +18007,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18001: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18010: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18005: \$? = $ac_status" >&5
-+ echo "$as_me:18014: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -26046,6 +26055,7 @@
- _ACEOF
- ;;
- esac
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
- ;;
- arm*)
- ARM_VIDEO=yes
-@@ -26081,6 +26091,7 @@
- xorg_loader_sparcmuldiv="yes"
- SPARC64_VIDEO=yes
- BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- ;;
- x86_64*|amd64*)
- use_x86_asm="yes"
-@@ -26104,11 +26115,19 @@
- SYS_LIBS=-lamd64
- ;;
- esac
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+ ;;
-+ ia64*)
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
-+ ;;
-+ s390*)
-+ GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
- ;;
- esac
-
-
-
-+
- if test "x$ALPHA_VIDEO" = xyes; then
- ALPHA_VIDEO_TRUE=
- ALPHA_VIDEO_FALSE='#'
-@@ -26162,11 +26181,14 @@
- KDRIVE_HW=no
- case $host_os in
- *freebsd*)
--
-+ case $host_os in
-+ kfreebsd*-gnu) ;;
-+ *)
- cat >>confdefs.h <<\_ACEOF
- #define CSRG_BASED 1
- _ACEOF
--
-+ ;;
-+ esac
-
- cat >>confdefs.h <<\_ACEOF
- #define PCCONS_SUPPORT 1
-@@ -26486,6 +26508,14 @@
- fi
-
-
-+# Check whether --with-serverconfig-path was given.
-+if test "${with_serverconfig_path+set}" = set; then
-+ withval=$with_serverconfig_path; SERVERCONFIG="$withval"
-+else
-+ SERVERCONFIG="${libdir}/xserver"
-+fi
-+
-+
- # Check whether --with-dri-driver-path was given.
- if test "${with_dri_driver_path+set}" = set; then
- withval=$with_dri_driver_path; DRI_DRIVER_PATH="$withval"
-@@ -26716,6 +26746,13 @@
- XINPUT=yes
- fi
-
-+# Check whether --enable-misc-utils was given.
-+if test "${enable_misc_utils+set}" = set; then
-+ enableval=$enable_misc_utils; MISCUTILS=$enableval
-+else
-+ MISCUTILS=yes
-+fi
-+
-
- # Check whether --enable-xorg was given.
- if test "${enable_xorg+set}" = set; then
-@@ -29418,6 +29455,17 @@
- fi
-
-
-+
-+if test "x$MISCUTILS" = xyes; then
-+ MISCUTILS_TRUE=
-+ MISCUTILS_FALSE='#'
-+else
-+ MISCUTILS_TRUE='#'
-+ MISCUTILS_FALSE=
-+fi
-+
-+
-+
- cat >>confdefs.h <<\_ACEOF
- #define SHAPE 1
- _ACEOF
-@@ -29833,6 +29881,22 @@
- exec_prefix_NONE=
- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-+ eval ac_define_dir="\"$SERVERCONFIG\""
-+ SERVERCONFIGdir="$ac_define_dir"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SERVERCONFIGdir "$ac_define_dir"
-+_ACEOF
-+
-+ test "$prefix_NONE" && prefix=NONE
-+ test "$exec_prefix_NONE" && exec_prefix=NONE
-+
-+
-+ prefix_NONE=
-+ exec_prefix_NONE=
-+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
- eval ac_define_dir="\"$DRI_DRIVER_PATH\""
- DRI_DRIVER_PATH="$ac_define_dir"
-
-@@ -32165,7 +32229,7 @@
- ;;
- esac
- ;;
-- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
- XORG_OS="freebsd"
- XORG_OS_SUBDIR="bsd"
- XORG_OS_KBD="BSD"
-@@ -32430,7 +32494,7 @@
- ;;
- powerpc*)
- case $host_os in
-- linux*|freebsd*|netbsd*|openbsd*)
-+ linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu)
- ;;
- *)
- xorg_bus_ppcpci="yes"
-@@ -32443,7 +32507,7 @@
- ;;
- x86_64*|amd64*)
- case $host_os in
-- freebsd*)
-+ freebsd*|kfreebsd*-gnu)
- # FreeBSD uses the system pci interface
- ;;
- *)
-@@ -33841,11 +33905,15 @@
- done
-
- if test "$ac_cv_header_sys_vm86_h" = yes; then
--
-+ case $host_os in
-+ kfreebsd*-gnu) kdrivevesa=no ;;
-+ *)
- cat >>confdefs.h <<\_ACEOF
- #define KDRIVEVESA 1
- _ACEOF
-
-+ kdrivevesa=yes;;
-+ esac
- fi
-
-
-@@ -34040,7 +34108,33 @@
- # $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'
-+
-+
-+if true; then
-+ KDRIVELINUX_TRUE=
-+ KDRIVELINUX_FALSE='#'
-+else
-+ KDRIVELINUX_TRUE='#'
-+ KDRIVELINUX_FALSE=
-+fi
-+
-+ ;;
-+ *)
-+
-+
-+if false; then
-+ KDRIVELINUX_TRUE=
-+ KDRIVELINUX_FALSE='#'
-+else
-+ KDRIVELINUX_TRUE='#'
-+ KDRIVELINUX_FALSE=
-+fi
-+
-+ ;;
-+ 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"
-
-@@ -34315,7 +34409,7 @@
-
-
-
--if test x"$ac_cv_header_sys_vm86_h" = xyes; then
-+if test x"$kdrivevesa" = xyes; then
- KDRIVEVESA_TRUE=
- KDRIVEVESA_FALSE='#'
- else
-@@ -34460,7 +34554,7 @@
- cygwin*) ;;
- solaris*) ;;
- darwin*) ;;
-- *bsd*) ;;
-+ freebsd*|netbsd*|openbsd*) ;;
- *)
-
- cat >>confdefs.h <<\_ACEOF
-@@ -35537,6 +35631,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${MISCUTILS_TRUE}" && test -z "${MISCUTILS_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"MISCUTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MISCUTILS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${XDMCP_TRUE}" && test -z "${XDMCP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"XDMCP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -35817,6 +35918,20 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"KDRIVELINUX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"KDRIVELINUX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"TSLIB\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -36761,6 +36876,7 @@
- FBDEVHW_FALSE!$FBDEVHW_FALSE$ac_delim
- FREEBSD_KLDLOAD_TRUE!$FREEBSD_KLDLOAD_TRUE$ac_delim
- FREEBSD_KLDLOAD_FALSE!$FREEBSD_KLDLOAD_FALSE$ac_delim
-+GLX_ARCH_DEFINES!$GLX_ARCH_DEFINES$ac_delim
- ALPHA_VIDEO_TRUE!$ALPHA_VIDEO_TRUE$ac_delim
- ALPHA_VIDEO_FALSE!$ALPHA_VIDEO_FALSE$ac_delim
- ARM_VIDEO_TRUE!$ARM_VIDEO_TRUE$ac_delim
-@@ -36825,7 +36941,6 @@
- AIGLX_TRUE!$AIGLX_TRUE$ac_delim
- AIGLX_FALSE!$AIGLX_FALSE$ac_delim
- GLX_DEFINES!$GLX_DEFINES$ac_delim
--LBXUTIL_TEST_CFLAGS!$LBXUTIL_TEST_CFLAGS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36867,6 +36982,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+LBXUTIL_TEST_CFLAGS!$LBXUTIL_TEST_CFLAGS$ac_delim
- LBXUTIL_TEST_LIBS!$LBXUTIL_TEST_LIBS$ac_delim
- LBX_TRUE!$LBX_TRUE$ac_delim
- LBX_FALSE!$LBX_FALSE$ac_delim
-@@ -36906,6 +37022,8 @@
- XPRINT_FALSE!$XPRINT_FALSE$ac_delim
- XINPUT_TRUE!$XINPUT_TRUE$ac_delim
- XINPUT_FALSE!$XINPUT_FALSE$ac_delim
-+MISCUTILS_TRUE!$MISCUTILS_TRUE$ac_delim
-+MISCUTILS_FALSE!$MISCUTILS_FALSE$ac_delim
- XDMCP_CFLAGS!$XDMCP_CFLAGS$ac_delim
- XDMCP_LIBS!$XDMCP_LIBS$ac_delim
- XDMCP_TRUE!$XDMCP_TRUE$ac_delim
-@@ -36916,6 +37034,7 @@
- USE_RGB_BUILTIN_FALSE!$USE_RGB_BUILTIN_FALSE$ac_delim
- COMPILEDDEFAULTFONTPATH!$COMPILEDDEFAULTFONTPATH$ac_delim
- RGB_DB!$RGB_DB$ac_delim
-+SERVERCONFIGdir!$SERVERCONFIGdir$ac_delim
- DRI_DRIVER_PATH!$DRI_DRIVER_PATH$ac_delim
- VENDOR_STRING!$VENDOR_STRING$ac_delim
- VENDOR_STRING_SHORT!$VENDOR_STRING_SHORT$ac_delim
-@@ -36960,10 +37079,6 @@
- XNEST_TRUE!$XNEST_TRUE$ac_delim
- XNEST_FALSE!$XNEST_FALSE$ac_delim
- XNEST_LIBS!$XNEST_LIBS$ac_delim
--XGLMODULES_CFLAGS!$XGLMODULES_CFLAGS$ac_delim
--XGLMODULES_LIBS!$XGLMODULES_LIBS$ac_delim
--XGL_TRUE!$XGL_TRUE$ac_delim
--XGL_FALSE!$XGL_FALSE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37005,6 +37120,10 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+XGLMODULES_CFLAGS!$XGLMODULES_CFLAGS$ac_delim
-+XGLMODULES_LIBS!$XGLMODULES_LIBS$ac_delim
-+XGL_TRUE!$XGL_TRUE$ac_delim
-+XGL_FALSE!$XGL_FALSE$ac_delim
- XGL_LIBS!$XGL_LIBS$ac_delim
- xglmoduledir!$xglmoduledir$ac_delim
- XGL_MODULE_PATH!$XGL_MODULE_PATH$ac_delim
-@@ -37098,10 +37217,6 @@
- XWIN_GLX_WINDOWS_TRUE!$XWIN_GLX_WINDOWS_TRUE$ac_delim
- XWIN_GLX_WINDOWS_FALSE!$XWIN_GLX_WINDOWS_FALSE$ac_delim
- XWIN_NATIVEGDI_TRUE!$XWIN_NATIVEGDI_TRUE$ac_delim
--XWIN_NATIVEGDI_FALSE!$XWIN_NATIVEGDI_FALSE$ac_delim
--XWIN_PRIMARYFB_TRUE!$XWIN_PRIMARYFB_TRUE$ac_delim
--XWIN_PRIMARYFB_FALSE!$XWIN_PRIMARYFB_FALSE$ac_delim
--XWIN_RANDR_TRUE!$XWIN_RANDR_TRUE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37143,11 +37258,17 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+XWIN_NATIVEGDI_FALSE!$XWIN_NATIVEGDI_FALSE$ac_delim
-+XWIN_PRIMARYFB_TRUE!$XWIN_PRIMARYFB_TRUE$ac_delim
-+XWIN_PRIMARYFB_FALSE!$XWIN_PRIMARYFB_FALSE$ac_delim
-+XWIN_RANDR_TRUE!$XWIN_RANDR_TRUE$ac_delim
- XWIN_RANDR_FALSE!$XWIN_RANDR_FALSE$ac_delim
- XWIN_XV_TRUE!$XWIN_XV_TRUE$ac_delim
- XWIN_XV_FALSE!$XWIN_XV_FALSE$ac_delim
- KDRIVE_TRUE!$KDRIVE_TRUE$ac_delim
- KDRIVE_FALSE!$KDRIVE_FALSE$ac_delim
-+KDRIVELINUX_TRUE!$KDRIVELINUX_TRUE$ac_delim
-+KDRIVELINUX_FALSE!$KDRIVELINUX_FALSE$ac_delim
- XEPHYR_CFLAGS!$XEPHYR_CFLAGS$ac_delim
- XEPHYR_LIBS!$XEPHYR_LIBS$ac_delim
- KDRIVE_INCS!$KDRIVE_INCS$ac_delim
-@@ -37214,7 +37335,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
+--- xorg-server.orig/configure.ac 2006-10-31 17:44:02.000000000 +0100
++++ xorg-server/configure.ac 2006-10-31 17:47:06.000000000 +0100
@@ -256,7 +256,10 @@
dnl it would be nice to autodetect these *CONS_SUPPORTs
case $host_os in
@@ -652,8 +74,8 @@
AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source])
Index: xorg-server/hw/kdrive/linux/agp.c
===================================================================
---- xorg-server.orig/hw/kdrive/linux/agp.c
-+++ xorg-server/hw/kdrive/linux/agp.c
+--- xorg-server.orig/hw/kdrive/linux/agp.c 2006-10-31 17:42:39.000000000 +0100
++++ xorg-server/hw/kdrive/linux/agp.c 2006-10-31 17:44:02.000000000 +0100
@@ -65,7 +65,7 @@
#include <linux/agpgart.h>
@@ -665,8 +87,8 @@
#endif
Index: xorg-server/hw/xfree86/os-support/bus/Pci.h
===================================================================
---- xorg-server.orig/hw/xfree86/os-support/bus/Pci.h
-+++ xorg-server/hw/xfree86/os-support/bus/Pci.h
+--- xorg-server.orig/hw/xfree86/os-support/bus/Pci.h 2006-10-31 17:42:39.000000000 +0100
++++ xorg-server/hw/xfree86/os-support/bus/Pci.h 2006-10-31 17:47:05.000000000 +0100
@@ -332,7 +332,7 @@
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif
Modified: trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff 2006-10-31 16:57:46 UTC (rev 3921)
+++ trunk/xserver/xorg-server/debian/patches/24_hurd_support.diff 2006-10-31 17:01:51 UTC (rev 3922)
@@ -1,8 +1,19 @@
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 @@
+--- xorg-server.orig/configure.ac 2006-10-31 17:25:45.000000000 +0100
++++ xorg-server/configure.ac 2006-10-31 17:27:54.000000000 +0100
+@@ -1177,6 +1177,10 @@
+ XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
+ fi
+ ;;
++ gnu*)
++ XORG_OS="gnu"
++ XORG_OS_SUBDIR="hurd"
++ ;;
+ *)
+ XORG_OS="unknown"
+ XORG_OS_SUBDIR="unknown"
+@@ -1477,7 +1481,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'
@@ -19,10 +30,18 @@
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"
+@@ -1706,6 +1718,7 @@
+ hw/xfree86/os-support/solaris/Makefile
+ hw/xfree86/os-support/sysv/Makefile
+ hw/xfree86/os-support/usl/Makefile
++hw/xfree86/os-support/hurd/Makefile
+ hw/xfree86/parser/Makefile
+ hw/xfree86/rac/Makefile
+ hw/xfree86/ramdac/Makefile
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
+--- xorg-server.orig/hw/kdrive/Makefile.am 2006-10-28 16:58:28.000000000 +0200
++++ xorg-server/hw/kdrive/Makefile.am 2006-10-31 17:25:45.000000000 +0100
@@ -15,9 +15,13 @@
XEPHYR_SUBDIRS = ephyr
endif
@@ -40,8 +59,8 @@
$(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
+--- xorg-server.orig/GL/glx/indirect_dispatch_swap.c 2006-10-28 16:58:28.000000000 +0200
++++ xorg-server/GL/glx/indirect_dispatch_swap.c 2006-10-31 17:25:45.000000000 +0100
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
@@ -53,8 +72,8 @@
#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
+--- xorg-server.orig/GL/glx/indirect_reqsize.c 2006-10-28 16:58:28.000000000 +0200
++++ xorg-server/GL/glx/indirect_reqsize.c 2006-10-31 17:25:45.000000000 +0100
@@ -31,7 +31,7 @@
#include "indirect_size.h"
#include "indirect_reqsize.h"
@@ -66,8 +85,8 @@
#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
+--- xorg-server.orig/GL/glx/indirect_util.c 2006-10-28 16:58:28.000000000 +0200
++++ xorg-server/GL/glx/indirect_util.c 2006-10-31 17:25:45.000000000 +0100
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
@@ -77,3 +96,1054 @@
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
+Index: xorg-server/hw/xfree86/os-support/Makefile.am
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/Makefile.am 2006-10-31 17:26:58.000000000 +0100
++++ xorg-server/hw/xfree86/os-support/Makefile.am 2006-10-31 17:27:54.000000000 +0100
+@@ -3,7 +3,7 @@
+ endif
+
+ SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+-DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl
++DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl hurd
+
+ sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \
+ assyntax.h xf86OSKbd.h xf86OSmouse.h
+Index: xorg-server/hw/xfree86/os-support/hurd/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/Makefile.am 2006-10-31 17:27:54.000000000 +0100
+@@ -0,0 +1,18 @@
++noinst_LTLIBRARIES = libhurd.la
++
++libhurd_la_SOURCES = hurd_init.c hurd_io.c hurd_mmap.c hurd_kbd.c \
++ hurd_mouse.c hurd_video.c \
++ $(srcdir)/../shared/VTsw_noop.c \
++ $(srcdir)/../shared/posix_tty.c \
++ $(srcdir)/../shared/libc_wrapper.c \
++ $(srcdir)/../shared/stdResource.c \
++ $(srcdir)/../shared/stdPci.c \
++ $(srcdir)/../shared/sigiostubs.c \
++ $(srcdir)/../shared/pm_noop.c \
++ $(srcdir)/../shared/kmod_noop.c \
++ $(srcdir)/../shared/agp_noop.c \
++ $(srcdir)/../shared/at_scancode.c
++
++AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
++
++INCLUDES = $(XORG_INCS)
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_init.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_init.c 2006-10-31 17:33:02.000000000 +0100
+@@ -0,0 +1,90 @@
++/*
++ * Copyright 1997,1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_init.c,v 1.1 1998/08/16 10:25:48 dawes Exp $ */
++
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++
++#include "input.h"
++#include "scrnintstr.h"
++
++#include "compiler.h"
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++
++#include <stdio.h>
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/file.h>
++#include <assert.h>
++#include <mach.h>
++
++int
++xf86ProcessArgument( int argc,char **argv, int i )
++{
++ return 0;
++}
++void
++xf86UseMsg()
++{
++ return;
++}
++
++
++void
++xf86OpenConsole()
++{
++ if( serverGeneration == 1 )
++ {
++ kern_return_t err;
++ mach_port_t device;
++ int fd;
++ err = get_privileged_ports( NULL, &device );
++ if( err )
++ {
++ errno = err;
++ FatalError( "xf86KbdInit can't get_privileged_ports. (%s)\n" , strerror(errno) );
++ }
++ mach_port_deallocate (mach_task_self (), device);
++
++ if( ( fd = open( "/dev/kbd" , O_RDONLY|O_NONBLOCK ) ) < 0 )
++ {
++ fprintf( stderr , "Cannot open keyboard (%s)\n",strerror(errno) );
++ exit(1);
++ }
++ xf86Info.consoleFd = fd;
++ }
++ return;
++}
++
++void
++xf86CloseConsole()
++{
++ close( xf86Info.consoleFd );
++ return;
++}
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_io.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_io.c 2006-10-31 17:34:08.000000000 +0100
+@@ -0,0 +1,131 @@
++/*
++ * Copyright 1997,1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c,v 1.8 2002/10/11 01:40:35 dawes Exp $ */
++
++#define NEED_EVENTS
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++#include <X11/Xproto.h>
++#include "inputstr.h"
++#include "scrnintstr.h"
++#include "mipointer.h"
++
++#include "compiler.h"
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++
++#include <stdio.h>
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/file.h>
++#include <assert.h>
++#include <mach.h>
++#include <sys/ioctl.h>
++
++typedef unsigned short kev_type; /* kd event type */
++typedef unsigned char Scancode;
++
++struct mouse_motion {
++ short mm_deltaX; /* units? */
++ short mm_deltaY;
++};
++
++typedef struct {
++ kev_type type; /* see below */
++ struct timeval time; /* timestamp */
++ union { /* value associated with event */
++ boolean_t up; /* MOUSE_LEFT .. MOUSE_RIGHT */
++ Scancode sc; /* KEYBD_EVENT */
++ struct mouse_motion mmotion; /* MOUSE_MOTION */
++ } value;
++} kd_event;
++
++/*
++ * kd_event ID's.
++ */
++#define MOUSE_LEFT 1 /* mouse left button up/down */
++#define MOUSE_MIDDLE 2
++#define MOUSE_RIGHT 3
++#define MOUSE_MOTION 4 /* mouse motion */
++#define KEYBD_EVENT 5 /* key up/down */
++
++/***********************************************************************
++ * Keyboard
++ **********************************************************************/
++void
++xf86SoundKbdBell(int loudness,int pitch,int duration)
++{
++ return;
++}
++
++void
++xf86SetKbdLeds(int leds)
++{
++ return;
++}
++
++int
++xf86GetKbdLeds()
++{
++ return 0;
++}
++
++void
++xf86SetKbdRepeat(char rad)
++{
++ return;
++}
++
++void
++xf86KbdInit()
++{
++ return;
++}
++int
++xf86KbdOn()
++{
++ int data = 1;
++ if( ioctl( xf86Info.consoleFd, _IOW('k', 1, int),&data) < 0)
++ FatalError("Cannot set event mode on keyboard (%s)\n",strerror(errno));
++ return xf86Info.consoleFd;
++}
++int
++xf86KbdOff()
++{
++ int data = 2;
++ if( ioctl( xf86Info.consoleFd, _IOW('k', 1, int),&data) < 0)
++ FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
++}
++
++void
++xf86KbdEvents()
++{
++ kd_event ke;
++ while( read(xf86Info.consoleFd, &ke, sizeof(ke)) == sizeof(ke) )
++ xf86PostKbdEvent(ke.value.sc);
++}
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_kbd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_kbd.c 2006-10-31 17:33:33.000000000 +0100
+@@ -0,0 +1,176 @@
++/*
++ * Copyright 1997,1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c,v 1.8 2002/10/11 01:40:35 dawes Exp $ */
++
++#define NEED_EVENTS
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++
++#include "compiler.h"
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++
++#include "xf86Xinput.h"
++#include "xf86OSKbd.h"
++#include "atKeynames.h"
++#include "xf86Keymap.h"
++
++#include <stdio.h>
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/file.h>
++#include <assert.h>
++#include <mach.h>
++#include <sys/ioctl.h>
++
++typedef unsigned short kev_type; /* kd event type */
++typedef unsigned char Scancode;
++
++struct mouse_motion {
++ short mm_deltaX; /* units? */
++ short mm_deltaY;
++};
++
++typedef struct {
++ kev_type type; /* see below */
++ struct timeval time; /* timestamp */
++ union { /* value associated with event */
++ boolean_t up; /* MOUSE_LEFT .. MOUSE_RIGHT */
++ Scancode sc; /* KEYBD_EVENT */
++ struct mouse_motion mmotion; /* MOUSE_MOTION */
++ } value;
++} kd_event;
++
++/*
++ * kd_event ID's.
++ */
++#define MOUSE_LEFT 1 /* mouse left button up/down */
++#define MOUSE_MIDDLE 2
++#define MOUSE_RIGHT 3
++#define MOUSE_MOTION 4 /* mouse motion */
++#define KEYBD_EVENT 5 /* key up/down */
++
++/***********************************************************************
++ * Keyboard
++ **********************************************************************/
++static void
++SoundKbdBell(InputInfoPtr pInfo, int loudness,int pitch,int duration)
++{
++ return;
++}
++
++static void
++SetKbdLeds(InputInfoPtr pInfo, int leds)
++{
++ return;
++}
++
++static int
++GetKbdLeds(InputInfoPtr pInfo)
++{
++ return 0;
++}
++
++static void
++SetKbdRepeat(InputInfoPtr pInfo, char rad)
++{
++ return;
++}
++
++static void
++KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
++{
++ pKeySyms->map = map;
++ pKeySyms->mapWidth = GLYPHS_PER_KEY;
++ pKeySyms->minKeyCode = MIN_KEYCODE;
++ pKeySyms->maxKeyCode = MAX_KEYCODE;
++ return;
++}
++
++static int
++KbdOn(InputInfoPtr pInfo, int what)
++{
++ int data = 1;
++ if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
++ FatalError("Cannot set event mode on keyboard (%s)\n",strerror(errno));
++ return Success;
++}
++static int
++KbdOff(InputInfoPtr pInfo, int what)
++{
++ int data = 2;
++ if( ioctl( pInfo->fd, _IOW('k', 1, int),&data) < 0)
++ FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
++ return Success;
++}
++
++static int
++KbdInit(InputInfoPtr pInfo, int what)
++{
++ return Success;
++}
++
++static void
++ReadInput(InputInfoPtr pInfo)
++{
++ KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
++ kd_event ke;
++ while( read(pInfo->fd, &ke, sizeof(ke)) == sizeof(ke) )
++ pKbd->PostEvent(pInfo, ke.value.sc & 0x7f, ke.value.sc & 0x80 ? FALSE : TRUE);
++}
++
++static Bool
++OpenKeyboard(InputInfoPtr pInfo)
++{
++ pInfo->fd = xf86Info.consoleFd;
++ return TRUE;
++}
++
++Bool
++xf86OSKbdPreInit(InputInfoPtr pInfo)
++{
++ KbdDevPtr pKbd = pInfo->private;
++
++ pKbd->KbdInit = KbdInit;
++ pKbd->KbdOn = KbdOn;
++ pKbd->KbdOff = KbdOff;
++ pKbd->Bell = SoundKbdBell;
++ pKbd->SetLeds = SetKbdLeds;
++ pKbd->GetLeds = GetKbdLeds;
++ pKbd->SetKbdRepeat = SetKbdRepeat;
++ pKbd->KbdGetMapping = KbdGetMapping;
++ pKbd->SpecialKey = NULL;
++ pKbd->RemapScanCode = ATScancode;
++ pKbd->GetSpecialKey = NULL;
++ pKbd->OpenKeyboard = OpenKeyboard;
++ pKbd->vtSwitchSupported = FALSE;
++ pKbd->CustomKeycodes = FALSE;
++ pKbd->private = NULL;
++ pInfo->read_input = ReadInput;
++ return TRUE;
++}
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c 2006-10-31 17:30:32.000000000 +0100
+@@ -0,0 +1,96 @@
++/*
++ * Copyright 1997 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86$ */
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include<mach.h>
++#include<device/device.h>
++#include<mach/machine/mach_i386.h>
++
++#include <X11/X.h>
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++
++#define BIOS_SIZE 0x20000
++
++int
++xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len)
++{
++ mach_port_t device,iopl_dev;
++ memory_object_t iopl_mem;
++ vm_address_t addr = (vm_address_t)0; /* serach starting address */
++ kern_return_t err;
++
++
++ err = get_privileged_ports (NULL, &device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno));
++ }
++ err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
++ mach_port_deallocate (mach_task_self (), device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno));
++ }
++ err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&iopl_mem,0);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86ReadBIOS() can't device_map. (%s)\n",strerror(errno));
++ }
++ err = vm_map(mach_task_self(),
++ &addr,
++ BIOS_SIZE,
++ 0,
++ TRUE,
++ iopl_mem,
++ Base,
++ FALSE,
++ VM_PROT_READ|VM_PROT_WRITE,
++ VM_PROT_READ|VM_PROT_WRITE,
++ VM_INHERIT_SHARE);
++ mach_port_deallocate(mach_task_self(),iopl_mem);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86ReadBIOS() can't vm_map. (%s)\n",strerror(errno));
++ }
++
++ memcpy(Buf,(void*)((int)addr + Offset), Len);
++
++ err = vm_deallocate(mach_task_self(), addr, BIOS_SIZE);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86ReadBIOS() can't vm_deallocate. (%s)\n",strerror(errno));
++ }
++
++ return Len;
++}
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_mouse.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_mouse.c 2006-10-31 17:32:34.000000000 +0100
+@@ -0,0 +1,301 @@
++/*
++ * Copyright 1997,1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_mouse.c,v 1.7 2000/02/10 22:33:44 dawes Exp $ */
++
++#define NEED_EVENTS
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++#include <X11/Xproto.h>
++#include "inputstr.h"
++#include "scrnintstr.h"
++#include "mipointer.h"
++
++#include "xf86.h"
++#include "xf86Xinput.h"
++#include "xf86OSmouse.h"
++#include "xf86_OSlib.h"
++#include "xisb.h"
++
++#include <stdio.h>
++#include <errno.h>
++#include <sys/time.h>
++#include <sys/file.h>
++#include <assert.h>
++#include <mach.h>
++#include <sys/ioctl.h>
++
++typedef unsigned short kev_type; /* kd event type */
++typedef unsigned char Scancode;
++
++struct mouse_motion {
++ short mm_deltaX; /* units? */
++ short mm_deltaY;
++};
++
++typedef struct {
++ kev_type type; /* see below */
++ struct timeval time; /* timestamp */
++ union { /* value associated with event */
++ boolean_t up; /* MOUSE_LEFT .. MOUSE_RIGHT */
++ Scancode sc; /* KEYBD_EVENT */
++ struct mouse_motion mmotion; /* MOUSE_MOTION */
++ } value;
++} kd_event;
++
++/*
++ * kd_event ID's.
++ */
++#define MOUSE_LEFT 1 /* mouse left button up/down */
++#define MOUSE_MIDDLE 2
++#define MOUSE_RIGHT 3
++#define MOUSE_MOTION 4 /* mouse motion */
++#define KEYBD_EVENT 5 /* key up/down */
++
++#define NUMEVENTS 64
++
++/*
++ * OsMouseProc --
++ * Handle the initialization, etc. of a mouse
++ */
++static int
++OsMouseProc(DeviceIntPtr pPointer, int what)
++{
++ InputInfoPtr pInfo;
++ MouseDevPtr pMse;
++ unsigned char map[MSE_MAXBUTTONS + 1];
++ int nbuttons;
++
++ pInfo = pPointer->public.devicePrivate;
++ pMse = pInfo->private;
++ pMse->device = pPointer;
++
++ switch (what) {
++ case DEVICE_INIT:
++ pPointer->public.on = FALSE;
++
++ for (nbuttons = 0; nbuttons < MSE_MAXBUTTONS; ++nbuttons)
++ map[nbuttons + 1] = nbuttons + 1;
++
++ InitPointerDeviceStruct((DevicePtr)pPointer,
++ map,
++ min(pMse->buttons, MSE_MAXBUTTONS),
++ miPointerGetMotionEvents,
++ pMse->Ctrl,
++ miPointerGetMotionBufferSize());
++
++ /* X valuator */
++ xf86InitValuatorAxisStruct(pPointer, 0, 0, -1, 1, 0, 1);
++ xf86InitValuatorDefaults(pPointer, 0);
++ /* Y valuator */
++ xf86InitValuatorAxisStruct(pPointer, 1, 0, -1, 1, 0, 1);
++ xf86InitValuatorDefaults(pPointer, 1);
++ xf86MotionHistoryAllocate(pInfo);
++ break;
++
++ case DEVICE_ON:
++ pInfo->fd = xf86OpenSerial(pInfo->options);
++ if (pInfo->fd == -1)
++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
++ else {
++ pMse->buffer = XisbNew(pInfo->fd,
++ NUMEVENTS * sizeof(kd_event));
++ if (!pMse->buffer) {
++ xfree(pMse);
++ xf86CloseSerial(pInfo->fd);
++ pInfo->fd = -1;
++ } else {
++ xf86FlushInput(pInfo->fd);
++ AddEnabledDevice(pInfo->fd);
++ }
++ }
++ pMse->lastButtons = 0;
++ pMse->lastMappedButtons = 0;
++ pMse->emulateState = 0;
++ pPointer->public.on = TRUE;
++ break;
++
++ case DEVICE_OFF:
++ case DEVICE_CLOSE:
++ if (pInfo->fd != -1) {
++ RemoveEnabledDevice(pInfo->fd);
++ if (pMse->buffer) {
++ XisbFree(pMse->buffer);
++ pMse->buffer = NULL;
++ }
++ xf86CloseSerial(pInfo->fd);
++ pInfo->fd = -1;
++ }
++ pPointer->public.on = FALSE;
++ usleep(300000);
++ break;
++ }
++ return Success;
++}
++
++/*
++ * OsMouseReadInput --
++ * Get some events from our queue. Process all outstanding events now.
++ */
++static void
++OsMouseReadInput(InputInfoPtr pInfo)
++{
++ MouseDevPtr pMse;
++ static kd_event eventList[NUMEVENTS];
++ int n, c;
++ kd_event *event = eventList;
++ unsigned char *pBuf;
++
++ pMse = pInfo->private;
++
++ XisbBlockDuration(pMse->buffer, -1);
++ pBuf = (unsigned char *)eventList;
++ n = 0;
++ while ((c = XisbRead(pMse->buffer)) >= 0 && n < sizeof(eventList))
++ pBuf[n++] = (unsigned char)c;
++
++ if (n == 0)
++ return;
++
++ n /= sizeof(kd_event);
++ while( n-- ) {
++ int buttons = pMse->lastButtons;
++ int dx = 0, dy = 0;
++ switch (event->type) {
++ case MOUSE_RIGHT:
++ buttons = buttons & 6 |(event->value.up ? 0 : 1);
++ break;
++ case MOUSE_MIDDLE:
++ buttons = buttons & 5 |(event->value.up ? 0 : 2);
++ break;
++ case MOUSE_LEFT:
++ buttons = buttons & 3 |(event->value.up ? 0 : 4) ;
++ break;
++ case MOUSE_MOTION:
++ dx = event->value.mmotion.mm_deltaX;
++ dy = - event->value.mmotion.mm_deltaY;
++ break;
++ default:
++ ErrorF("Bad mouse event (%d)\n",event->type);
++ continue;
++ }
++ pMse->PostEvent(pInfo, buttons, dx, dy, 0, 0);
++ ++event;
++ }
++ return;
++}
++
++static Bool
++OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
++{
++ MouseDevPtr pMse;
++
++ /* This is called when the protocol is "OSMouse". */
++
++ pMse = pInfo->private;
++ pMse->protocol = protocol;
++ xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
++
++ /* Collect the options, and process the common options. */
++ xf86CollectInputOptions(pInfo, NULL, NULL);
++ xf86ProcessCommonOptions(pInfo, pInfo->options);
++
++ /* Check if the device can be opened. */
++ pInfo->fd = xf86OpenSerial(pInfo->options);
++ if (pInfo->fd == -1) {
++ if (xf86GetAllowMouseOpenFail())
++ xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
++ else {
++ xf86Msg(X_ERROR, "%s: cannot open input device\n", pInfo->name);
++ xfree(pMse);
++ return FALSE;
++ }
++ }
++ xf86CloseSerial(pInfo->fd);
++ pInfo->fd = -1;
++
++ /* Process common mouse options (like Emulate3Buttons, etc). */
++ pMse->CommonOptions(pInfo);
++
++ /* Setup the local procs. */
++ pInfo->device_control = OsMouseProc;
++ pInfo->read_input = OsMouseReadInput;
++
++ pInfo->flags |= XI86_CONFIGURED;
++ return TRUE;
++}
++
++static int
++SupportedInterfaces(void)
++{
++ /* XXX Need to check this. */
++ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
++}
++
++static const char *internalNames[] = {
++ "OSMouse",
++ NULL
++};
++
++static const char **
++BuiltinNames(void)
++{
++ return internalNames;
++}
++
++static Bool
++CheckProtocol(const char *protocol)
++{
++ int i;
++
++ for (i = 0; internalNames[i]; i++)
++ if (xf86NameCmp(protocol, internalNames[i]) == 0)
++ return TRUE;
++ return FALSE;
++}
++
++/* XXX Is this appropriate? If not, this function should be removed. */
++static const char *
++DefaultProtocol(void)
++{
++ return "OSMouse";
++}
++
++OSMouseInfoPtr
++xf86OSMouseInit(int flags)
++{
++ OSMouseInfoPtr p;
++
++ p = xcalloc(sizeof(OSMouseInfoRec), 1);
++ if (!p)
++ return NULL;
++ p->SupportedInterfaces = SupportedInterfaces;
++ p->BuiltinNames = BuiltinNames;
++ p->DefaultProtocol = DefaultProtocol;
++ p->CheckProtocol = CheckProtocol;
++ p->PreInit = OsMousePreInit;
++ return p;
++}
++
+Index: xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xorg-server/hw/xfree86/os-support/hurd/hurd_video.c 2006-10-31 17:31:44.000000000 +0100
+@@ -0,0 +1,191 @@
++/*
++ * Copyright 1997, 1998 by UCHIYAMA Yasushi
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of UCHIYAMA Yasushi not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. UCHIYAMA Yasushi makes no representations
++ * about the suitability of this software for any purpose. It is provided
++ * "as is" without express or implied warranty.
++ *
++ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_video.c,v 1.3 1999/04/29 12:24:52 dawes Exp $ */
++
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <mach.h>
++#include <device/device.h>
++#include <mach/machine/mach_i386.h>
++
++#include <X11/X.h>
++#include "input.h"
++#include "scrnintstr.h"
++
++#include "xf86.h"
++#include "xf86Priv.h"
++#include "xf86_OSlib.h"
++#include "xf86OSpriv.h"
++
++/**************************************************************************
++ * Video Memory Mapping section
++ ***************************************************************************/
++pointer
++xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
++{
++ mach_port_t device,iopl_dev;
++ memory_object_t iopl_mem;
++ kern_return_t err;
++ vm_address_t addr=(vm_address_t)0;
++
++ err = get_privileged_ports (NULL, &device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno));
++ }
++ err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
++ mach_port_deallocate (mach_task_self(), device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno));
++ }
++
++ err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&iopl_mem,0);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86MapVidMem() can't device_map. (%s)\n",strerror(errno));
++ }
++ err = vm_map(mach_task_self(),
++ &addr,
++ Size,
++ 0, /* mask */
++ TRUE, /* anywhere */
++ iopl_mem,
++ (vm_offset_t)Base,
++ FALSE, /* copy on write */
++ VM_PROT_READ|VM_PROT_WRITE,
++ VM_PROT_READ|VM_PROT_WRITE,
++ VM_INHERIT_SHARE);
++ mach_port_deallocate(mach_task_self(),iopl_mem);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86MapVidMem() can't vm_map.(iopl_mem) (%s)\n",strerror(errno));
++ }
++ mach_port_deallocate(mach_task_self(),iopl_dev);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86MapVidMem() can't mach_port_deallocate.(iopl_dev) (%s)\n",strerror(errno));
++ }
++ return (pointer)addr;
++}
++
++void
++xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
++{
++ kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);
++ if( err )
++ {
++ errno = err;
++ ErrorF("xf86UnMapVidMem: can't dealloc framebuffer space (%s)\n",strerror(errno));
++ }
++ return;
++}
++
++Bool
++xf86LinearVidMem()
++{
++ return(TRUE);
++}
++
++/**************************************************************************
++ * I/O Permissions section
++ ***************************************************************************/
++mach_port_t io_port;
++
++Bool
++xf86EnableIO()
++{
++ mach_port_t device;
++ kern_return_t err;
++
++ err = get_privileged_ports(NULL, &device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86EnableIO() can't get_privileged_ports. (%s)\n",strerror(errno));
++ }
++ err = device_open(device,D_READ|D_WRITE,"io",&io_port);
++ mach_port_deallocate(mach_task_self(), device);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86EnableIO() can't device_open. (%s)\n",strerror(errno));
++ }
++
++ err = i386_io_port_add(mach_thread_self (), io_port);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86EnableIO() can't i386_io_port_add.(io_port) (%s)\n",strerror(errno));
++ }
++ return TRUE;
++}
++
++void
++xf86DisableIO()
++{
++ kern_return_t err;
++
++ err = i386_io_port_remove(mach_thread_self (), io_port);
++ if( err )
++ {
++ errno = err;
++ FatalError("xf86DisableIO() can't i386_io_port_remove.(io_port) (%s)\n",strerror(errno));
++ }
++ mach_port_deallocate(mach_task_self(), io_port);
++ return;
++}
++
++/**************************************************************************
++ * Interrupt Handling section
++ **************************************************************************/
++Bool
++xf86DisableInterrupts()
++{
++ return TRUE;
++}
++void
++xf86EnableInterrupts()
++{
++ return;
++}
++
++void
++xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
++ unsigned long Size)
++{
++}
++
++Bool
++xf86CheckMTRR(int s)
++{
++ return FALSE;
++}
++
Modified: trunk/xserver/xorg-server/debian/patches/34_xorg.conf_man_typos.patch
===================================================================
--- trunk/xserver/xorg-server/debian/patches/34_xorg.conf_man_typos.patch 2006-10-31 16:57:46 UTC (rev 3921)
+++ trunk/xserver/xorg-server/debian/patches/34_xorg.conf_man_typos.patch 2006-10-31 17:01:51 UTC (rev 3922)
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-10-21 23:40:42.000000000 +1000
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-10-21 23:41:04.000000000 +1000
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-10-31 17:44:02.000000000 +0100
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-10-31 17:44:03.000000000 +0100
@@ -1185,7 +1185,7 @@
.B Modes
section called
Reply to: