diff options
| author | flz <flz@FreeBSD.org> | 2007-10-09 19:30:14 +0000 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2007-10-09 19:30:14 +0000 |
| commit | 26935e20d0a05a21fe37997ccd557f513196964f (patch) | |
| tree | 7a318ffd5592a99fdbaea99956af9892aa0fba5d /x11-drivers | |
| parent | 9a0b2d276cc0536b2fd6c2e441a2d26d8cbf5bf2 (diff) | |
| download | FreeBSD-ports-26935e20d0a05a21fe37997ccd557f513196964f.zip FreeBSD-ports-26935e20d0a05a21fe37997ccd557f513196964f.tar.gz | |
- Don't add sunffb video driver to VIDEO_OFF on !sparc64 as it
breaks the build when XORG_COMPLETE is set. [1]
- Add VIDEO_EXCL, a list of mutually exclusive video drivers.
- Add openchrome to VIDEO_OFF.
Reported by: brian [1]
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xorg-drivers/Makefile | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 6b6478b..d33e242 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -28,6 +28,11 @@ VIDEO_ON= ati \ i810 \ nv \ vesa vga via + +.if ${ARCH} == "sparc64" +VIDEO_ON+= sunffb +.endif + VIDEO_OFF= apm ark \ chips cirrus cyrix \ dummy \ @@ -36,16 +41,13 @@ VIDEO_OFF= apm ark \ i128 i740 imstt intel \ mga \ neomagic newport nsc \ + openchrome \ rendition \ s3 s3virge savage siliconmotion sis \ tdfx tga trident tseng \ vmware voodoo -.if ${ARCH} == "sparc64" -VIDEO_ON+= sunffb -.else -VIDEO_OFF+= sunffb -.endif +VIDEO_EXCL= i810:intel via:openchrome INPUT_ON= mouse \ keyboard @@ -62,16 +64,20 @@ INPUT_OFF= acecad \ tek4957 \ vmmouse void -QUIRKS= keyboard:kbd jamstudio:js_x +QUIRKS= keyboard:kbd jamstudio:js_x openchrome:via .if defined(XORG_COMPLETE) . for type in input video ${type:U}_ON:= ${${type:U}_ON} ${${type:U}_OFF} ${type:U}_OFF= # nil +. for i in ${${type:U}_EXCL} +B= ${i:C/.*://} +${type:U}_ON:= ${${type:U}_ON:C/${B}//} +${type:U}_OFF:= ${${type:U}_OFF} ${B} +. endfor . endfor .endif - .for default in on off . for type in input video . for i in ${${type:U}_${default:U}} @@ -82,8 +88,16 @@ OPTIONS+= ${i:U} "Install ${i} ${type} driver" ${default} .include <bsd.port.pre.mk> -.if defined(WITH_INTEL) && !defined(WITHOUT_I810) -IGNORE= You can't choose both i810 and intel drivers as they are conflicting +.for i in ${VIDEO_EXCL} +A= ${i:C/:.*//} +B= ${i:C/.*://} +. if defined(WITH_${B:U}) && !defined(WITHOUT_${A:U}) +DRV_CONFLICTS+= ${i} +. endif +.endfor + +.if defined(DRV_CONFLICTS) +IGNORE= can't be installed because of conflicting drivers (${DRV_CONFLICTS}) .endif .for default in on off |
