qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If building against Xserver 1.12, disable video drivers that have not

Browse Source 
yet been updated to the video ABI changes.
This  makes testing of xserrver 1.12 easier.
This commit is contained in:
matthieu 2012-06-02 15:58:19 +00:00
parent 1636c55b09
commit 9984b2394f
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
driver/Makefile
View File

@ -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=