diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
| commit | 92ea0d614b10bd99ce43a611721c7c4003cd79a5 (patch) | |
| tree | cf13f962932aab3646f0af684b2923c4e0f0825b /x11-drivers/xf86-video-chips/files/patch-util_iopl.h | |
| parent | - Unbreak build when devel/libsysinfo is installed (diff) | |
The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production:
Xorg 7.7
Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities
Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.
PR: ports/177942
Exp-run by: miwi
Approved by: portmgr (miwi)
Thanks to all who helped testing!
Notes
Notes:
svn path=/head/; revision=319055
Diffstat (limited to 'x11-drivers/xf86-video-chips/files/patch-util_iopl.h')
| -rw-r--r-- | x11-drivers/xf86-video-chips/files/patch-util_iopl.h | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h new file mode 100644 index 000000000000..50db4d1a3700 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h @@ -0,0 +1,63 @@ +--- util/iopl.h.orig 2013-03-25 20:48:15.486758154 +0100 ++++ util/iopl.h 2013-03-25 20:47:56.000000000 +0100 +@@ -0,0 +1,60 @@ ++#ifdef __NetBSD__ ++# include <sys/types.h> ++# include <machine/pio.h> ++# include <machine/sysarch.h> ++#else ++# if defined(__linux__) ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc ++ * # include <sys/io.h> ++ */ ++int iopl(int level); ++# endif ++# if defined(SVR4) && defined(i386) ++# include <sys/types.h> ++# ifdef NCR ++ /* broken NCR <sys/sysi86.h> */ ++# define __STDC ++# include <sys/sysi86.h> ++# undef __STDC ++# else ++# include <sys/sysi86.h> ++# endif ++# ifdef SVR4 ++# if !defined(sun) ++# include <sys/seg.h> ++# endif ++# endif ++# include <sys/v86.h> ++# if defined(sun) ++# include <sys/psw.h> ++# endif ++# endif ++# include "AsmMacros.h" ++#endif /* NetBSD */ ++ ++#include <unistd.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++#ifdef __NetBSD__ ++# define SET_IOPL() i386_iopl(3) ++# define RESET_IOPL() i386_iopl(0) ++#else ++# if defined(SVR4) && defined(i386) ++# ifndef SI86IOPL ++# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) ++# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) ++# else ++# define SET_IOPL() sysi86(SI86IOPL,3) ++# define RESET_IOPL() sysi86(SI86IOPL,0) ++# endif ++# else ++# ifdef linux ++# define SET_IOPL() iopl(3) ++# define RESET_IOPL() iopl(0) ++# else ++# define SET_IOPL() (void)0 ++# define RESET_IOPL() (void)0 ++# endif ++# endif ++#endif |