diff options
author | David Heidelberger <david.heidelberger@ixit.cz> | 2014-10-03 14:01:07 +0200 |
---|---|---|
committer | David Heidelberger <david.heidelberger@ixit.cz> | 2014-10-03 14:01:07 +0200 |
commit | 723e9fb124997472a58e743df441e191f4b2ccac (patch) | |
tree | 3aaba9c1e23034030c333f520c6747a350948a8a /x11-base | |
parent | media-libs/mesa: add VA-API support and fix VDPAU dep on gallium (diff) | |
download | x11-723e9fb124997472a58e743df441e191f4b2ccac.tar.gz x11-723e9fb124997472a58e743df441e191f4b2ccac.tar.bz2 x11-723e9fb124997472a58e743df441e191f4b2ccac.zip |
x11-base/xorg-server: remove ia64 broken patch
Signed-off-by: David Heidelberger <david.heidelberger@ixit.cz>
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch | 60 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 1 |
2 files changed, 0 insertions, 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 24a5a02f..00000000 --- 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 e3269f1c..f7176654 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 ) |