diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-02 15:58:20 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-02 15:58:20 +0000 |
| commit | c4dc0e5b8bd5233f7a279d8acc3c3ef29cf6ddc1 (patch) | |
| tree | ec6425314d2060073bd173a4a70436017069418c /driver | |
| parent | f7c27d5cd7b996286636266e6c25954268832455 (diff) | |
If building against Xserver 1.12, disable video drivers that have not
yet been updated to the video ABI changes.
This makes testing of xserrver 1.12 easier.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Makefile | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/driver/Makefile b/driver/Makefile index cc001ef37..dc19eabaf 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -1,4 +1,11 @@ -# $OpenBSD: Makefile,v 1.48 2012/03/12 21:22:30 matthieu Exp $ +# $OpenBSD: Makefile,v 1.49 2012/06/02 15:58:19 matthieu Exp $ + +# Check for Xserver 1.12 or later +USING_XSERVER_112 != if pkg-config --atleast-version 1.10 xorg-server; then \ + echo 1; \ + else \ + echo 0; \ + fi INPUT_DRV_DEFAULT= \ xf86-input-keyboard \ @@ -50,17 +57,21 @@ INPUT_DRV= ${INPUT_DRV_DEFAULT} VIDEO_DRV_alpha= VIDEO_DRV_amd64= \ - xf86-video-apm xf86-video-ark xf86-video-ati xf86-video-chips \ + xf86-video-apm xf86-video-ark xf86-video-ati \ xf86-video-cirrus xf86-video-dummy xf86-video-glint \ xf86-video-i128 xf86-video-intel xf86-video-mach64 \ xf86-video-mga xf86-video-neomagic \ xf86-video-nv xf86-video-openchrome xf86-video-r128 \ - xf86-video-radeonold xf86-video-rendition xf86-video-s3 \ + xf86-video-radeonold xf86-video-s3 \ xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion \ xf86-video-sis xf86-video-tdfx xf86-video-trident \ - xf86-video-tseng xf86-video-vesa xf86-video-vmware \ + xf86-video-vesa xf86-video-vmware \ xf86-video-wsudl +.if !$(USING_XSERVER_112) +VIDEO_DRV_amd64 += xf86-video-chips xf86-video-rendition xf86-video-tseng +.endif + VIDEO_DRV_armish= \ xf86-video-wsfb xf86-video-wsudl @@ -73,8 +84,11 @@ VIDEO_DRV_hppa= \ VIDEO_DRV_i386= \ ${VIDEO_DRV_amd64} \ xf86-video-geode \ - xf86-video-i740 \ + xf86-video-i740 + +.if !$(USING_XSERVER_112) xf86-video-voodoo +.endif VIDEO_DRV_landisk= |