[gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/

[David Heidelberger]

commit:     723e9fb124997472a58e743df441e191f4b2ccac
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Oct  3 12:01:07 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Oct  3 12:01:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=723e9fb1

x11-base/xorg-server: remove ia64 broken patch

Signed-off-by: David Heidelberger <david.heidelberger <AT> ixit.cz>

---
 .../files/xorg-server-1.12-ia64-fix_inx_outx.patch | 60 ----------------------
 x11-base/xorg-server/xorg-server-9999.ebuild       |  1 -
 2 files changed, 61 deletions(-)

diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
deleted file mode 100644
index 24a5a02..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h
-*** xorg-server-1.12.3/hw/xfree86/common/compiler.h	2012-07-06 07:17:19.000000000 +0200
---- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h	2012-08-29 00:14:39.000000000 +0200
-***************
-*** 421,426 ****
---- 421,474 ----
-  #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/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e3269f1..f717665 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -128,7 +128,6 @@ REQUIRED_USE="!minimal? (
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 )