Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
Date: Mon, 04 Sep 2017 20:00:49
Message-Id: 1504555205.48518239b234989db6c1ea769bc17bc5d71e1890.mattst88@gentoo
1 commit: 48518239b234989db6c1ea769bc17bc5d71e1890
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 4 18:16:02 2017 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 4 20:00:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48518239
7
8 x11-base/xorg-server: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5614
11
12 .../files/xorg-server-1.17-ia64-fix_inx_outx.patch | 59 ----------------------
13 1 file changed, 59 deletions(-)
14
15 diff --git a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch
16 deleted file mode 100644
17 index 84485c986aa..00000000000
18 --- a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch
19 +++ /dev/null
20 @@ -1,59 +0,0 @@
21 -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
22 -index 1653574..fe881ee 100644
23 ---- a/hw/xfree86/common/compiler.h
24 -+++ b/hw/xfree86/common/compiler.h
25 -@@ -286,6 +286,54 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
26 - #include <machine/pio.h>
27 - #endif /* __NetBSD__ */
28 -
29 -+#elif defined(linux) && defined(__ia64__)
30 -+/* for Linux on ia64, we use the LIBC _inx/_outx routines */
31 -+/* note that the appropriate setup via "ioperm" needs to be done */
32 -+/* *before* any inx/outx is done. */
33 -+
34 -+extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
35 -+extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
36 -+extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
37 -+extern _X_EXPORT unsigned int _inb(unsigned long port);
38 -+extern _X_EXPORT unsigned int _inw(unsigned long port);
39 -+extern _X_EXPORT unsigned int _inl(unsigned long port);
40 -+
41 -+static __inline__ void
42 -+outb(unsigned long port, unsigned char val)
43 -+{
44 -+ _outb(val, port);
45 -+}
46 -+
47 -+static __inline__ void
48 -+outw(unsigned long port, unsigned short val)
49 -+{
50 -+ _outw(val, port);
51 -+}
52 -+
53 -+static __inline__ void
54 -+outl(unsigned long port, unsigned int val)
55 -+{
56 -+ _outl(val, port);
57 -+}
58 -+
59 -+static __inline__ unsigned int
60 -+inb(unsigned long port)
61 -+{
62 -+ return _inb(port);
63 -+}
64 -+
65 -+static __inline__ unsigned int
66 -+inw(unsigned long port)
67 -+{
68 -+ return _inw(port);
69 -+}
70 -+
71 -+static __inline__ unsigned int
72 -+inl(unsigned long port)
73 -+{
74 -+ return _inl(port);
75 -+}
76 -+
77 - #elif defined(__amd64__)
78 -
79 - #include <inttypes.h>