xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++
debian/patches/08_xfree86_fix_ia64_inx_outx.diff | 66 -----------------------
debian/patches/series | 1
3 files changed, 7 insertions(+), 67 deletions(-)
New commits:
commit d3a8cda2f683dbc661ff9f4ae9c2d8bafb490264
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu May 12 18:22:07 2016 +0300
Drop 08_xfree86_fix_ia64_inx_outx.diff from the tree, it wasn't applied anyway since Dec'14.
diff --git a/debian/changelog b/debian/changelog
index ec0468a..e292425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.3-2) UNRELEASED; urgency=medium
+
+ * Drop 08_xfree86_fix_ia64_inx_outx.diff from the tree, it wasn't
+ applied anyway since Dec'14.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 12 May 2016 18:22:02 +0300
+
xorg-server (2:1.18.3-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff b/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
deleted file mode 100644
index 8c506aa..0000000
--- a/debian/patches/08_xfree86_fix_ia64_inx_outx.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephan Schreiber <info@fs-driver.org>
-Subject: xfree86: restore {in,out}{b,w,l} on linux/ia64
-
-Call the equivalent glibc functions.
-
-Debian bug #685750
-
-Index: xorg-server/hw/xfree86/common/compiler.h
-===================================================================
---- xorg-server.orig/hw/xfree86/common/compiler.h
-+++ xorg-server/hw/xfree86/common/compiler.h
-@@ -439,6 +439,54 @@ extern _X_EXPORT unsigned int inl(unsign
- #include <machine/pio.h>
- #endif /* __NetBSD__ */
-
-+#elif defined(linux) && defined(__ia64__)
-+/* for Linux on ia64, we use the LIBC _inx/_outx routines */
-+/* note that the appropriate setup via "ioperm" needs to be done */
-+/* *before* any inx/outx is done. */
-+
-+extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
-+extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
-+extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
-+extern _X_EXPORT unsigned int _inb(unsigned long port);
-+extern _X_EXPORT unsigned int _inw(unsigned long port);
-+extern _X_EXPORT unsigned int _inl(unsigned long port);
-+
-+static __inline__ void
-+outb(unsigned long port, unsigned char val)
-+{
-+ _outb(val, port);
-+}
-+
-+static __inline__ void
-+outw(unsigned long port, unsigned short val)
-+{
-+ _outw(val, port);
-+}
-+
-+static __inline__ void
-+outl(unsigned long port, unsigned int val)
-+{
-+ _outl(val, port);
-+}
-+
-+static __inline__ unsigned int
-+inb(unsigned long port)
-+{
-+ return _inb(port);
-+}
-+
-+static __inline__ unsigned int
-+inw(unsigned long port)
-+{
-+ return _inw(port);
-+}
-+
-+static __inline__ unsigned int
-+inl(unsigned long port)
-+{
-+ return _inl(port);
-+}
-+
- #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
-
- #include <inttypes.h>
diff --git a/debian/patches/series b/debian/patches/series
index ad64e66..fbdd595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
02_kbsd-input-devd.diff
03_static-nettle.diff
05_Revert-Unload-submodules.diff
-#08_xfree86_fix_ia64_inx_outx.diff
os-treat-ssh-as-a-non-local-client.diff
Reply to: