diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2015-02-23 14:34:45 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2015-02-23 14:34:45 +0000 |
| commit | cc41e2f7abe9ed09b4425fa4056ecda6c6fd7c66 (patch) | |
| tree | 1c4955ff99c18a7d6e04ad6d1ac814e5710d0240 /x11-drivers | |
| parent | 7f1198aadee2fcc744e14fc36ba1381b5e1fab9b (diff) | |
| download | ports-cc41e2f7abe9ed09b4425fa4056ecda6c6fd7c66.tar.gz ports-cc41e2f7abe9ed09b4425fa4056ecda6c6fd7c66.zip | |
Move ATI driver to be specific to x86. This fixes the xorg build for arm
and sparc64.
PR: 196858
Submitted by: linimon
Reviewed by: sbruno
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=379680
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xorg-drivers/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 6f646100d273..9ad8926b1ac1 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -30,8 +30,7 @@ INPUT_DRIVERS= mouse \ void \ wacom -VIDEO_DRIVERS= ati \ - mach64 \ +VIDEO_DRIVERS= mach64 \ nv \ r128 \ vesa \ @@ -60,7 +59,6 @@ VIDEO_DRIVERS= ati \ OPTIONS_DEFAULT= MOUSE \ KEYBOARD \ - ATI \ MACH64 \ NV \ R128 \ @@ -73,8 +71,8 @@ ${a:tu}_DESC= Install ${a} ${type} driver . endfor .endfor -OPTIONS_DEFINE_i386= INTEL OPENCHROME -OPTIONS_DEFAULT_i386= INTEL OPENCHROME +OPTIONS_DEFINE_i386= ATI INTEL OPENCHROME +OPTIONS_DEFAULT_i386= ATI INTEL OPENCHROME OPTIONS_DEFINE_amd64:= ${OPTIONS_DEFINE_i386} OPTIONS_DEFAULT_amd64:= ${OPTIONS_DEFAULT_i386} @@ -85,6 +83,7 @@ OPTIONS_DEFAULT_sparc64=SUNFFB OPTIONS_DEFINE_ia64= OPENCHROME OPTIONS_DEFAULT_ia64= OPENCHROME +ATI_DESC= Install ati video driver INTEL_DESC= Install intel video driver OPENCHROME_DESC= Install openchrome video driver SUNFFB_DESC= Install sunffb video driver @@ -96,7 +95,7 @@ QUIRKS= keyboard:kbd # Manual add arch specific drivers so they be added to depend lines. .if ${ARCH}==i386 || ${ARCH}==amd64 -VIDEO_DRIVERS+= intel openchrome +VIDEO_DRIVERS+= ati intel openchrome .endif .if ${ARCH}==sparc64 |