[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-unstable'



 debian/changelog |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c981d8e1255e202cd6f267e4a860e0fcbe0f75fc
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Mar 21 11:06:04 2010 +0100

    Add bug closer

diff --git a/debian/changelog b/debian/changelog
index b2f1b77..fe9b157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
     thanks Samuel Thibault.
 
   [ Timo Aaltonen ]
-  * New upstream release.
+  * New upstream release, closes: #574354.
 
  -- Brice Goglin <bgoglin@debian.org>  Tue, 16 Mar 2010 08:06:29 +0100
 

commit f7861554a792367884e735748eb9ceae7851654d
Author: Brice Goglin <bgoglin@debian.org>
Date:   Mon Mar 15 13:32:17 2010 +0100

    Add 06_dont_trap_access_to_timer_and_keyboard.diff

diff --git a/debian/changelog b/debian/changelog
index 8d12681..2327eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
       closes: #564200.
   * Refresh patches.
   * Fix typo in xvfb-run.1, thanks Joey Hess, closes: #527490.
+  * Add 06_dont_trap_access_to_timer_and_keyboard.diff,
+    thanks Samuel Thibault.
 
   [ Cyril Brulebois ]
   * Add udeb needed for the graphical installer: xserver-xorg-core-udeb.
diff --git a/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
new file mode 100644
index 0000000..23d8dc7
--- /dev/null
+++ b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
@@ -0,0 +1,22 @@
+[PATCH] Do not trap access to timer and keyboard
+
+Some VESA BIOSes need to access to them.
+
+Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+---
+ hw/xfree86/os-support/hurd/hurd_video.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
+index 4a99db3..e049ceb 100644
+--- a/hw/xfree86/os-support/hurd/hurd_video.c
++++ b/hw/xfree86/os-support/hurd/hurd_video.c
+@@ -124,8 +124,6 @@ xf86EnableIO()
+ 	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
+ 	return FALSE;
+     }
+-    ioperm(0x40,4,0); /* trap access to the timer chip */
+-    ioperm(0x60,4,0); /* trap access to the keyboard controller */
+     return TRUE;
+ }
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index 29afbca..59f2548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
 03_fedora_glx_versioning.diff
 04_fedora_glx14-swrast.diff
 05_only_call_gamma_set_if_nonnull.diff
+06_dont_trap_access_to_timer_and_keyboard.diff
 #13_debian_add_xkbpath_env_variable.diff
 11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
 12-Add-libudev-input-hotplug-backend.diff


Reply to: