diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-26 04:04:07 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-26 04:04:07 +0800 |
| commit | ad27d5255cdb7a2829df552a7769ecb0aaa414dc (patch) | |
| tree | 2b427f38b4c9890b1056898fe4884f90ed4aaa86 /x11-drivers | |
| parent | 8afe8fe8b1435f3017db76e50f1f481af031dfdd (diff) | |
| download | xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar.gz xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar.bz2 xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar.lz xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar.xz xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.tar.zst xorg-devel-ports-ad27d5255cdb7a2829df552a7769ecb0aaa414dc.zip | |
Merge r772:
Fix build with gcc. [1]
Add missing dependency on xorg-macros.
Obtained from: freedesktop.org git repo [1]
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@773 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'x11-drivers')
4 files changed, 92 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index 0187092..7a3ad0a 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -8,6 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org chips display driver XORG_CAT= driver +USE_XORG= xorg-macros MAN4= chips.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am new file mode 100644 index 0000000..2ec5982 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am @@ -0,0 +1,13 @@ +--- util/Makefile.am.orig 2013-03-25 20:49:28.885754151 +0100 ++++ util/Makefile.am 2013-03-25 20:50:10.467748226 +0100 +@@ -3,7 +3,7 @@ + noinst_PROGRAMS = dRegs mRegs modClock memClock + endif + +-dRegs_SOURCES = dRegs.c AsmMacros.h +-mRegs_SOURCES = mRegs.c AsmMacros.h +-modClock_SOURCES = modClock.c AsmMacros.h ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h + memClock_SOURCES = modClock.c AsmMacros.h diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in new file mode 100644 index 0000000..b8d9624 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in @@ -0,0 +1,15 @@ +--- util/Makefile.in.orig 2013-03-25 20:50:53.827746698 +0100 ++++ util/Makefile.in 2013-03-25 20:50:55.499747558 +0100 +@@ -238,9 +238,9 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-dRegs_SOURCES = dRegs.c AsmMacros.h +-mRegs_SOURCES = mRegs.c AsmMacros.h +-modClock_SOURCES = modClock.c AsmMacros.h ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h + memClock_SOURCES = modClock.c AsmMacros.h + all: all-am + 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 0000000..50db4d1 --- /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 |