summaryrefslogtreecommitdiff
path: root/Mk/bsd.xorg.mk
diff options
context:
space:
mode:
authorMatthew Rezny <rezny@FreeBSD.org>2017-02-11 14:17:58 +0000
committerMatthew Rezny <rezny@FreeBSD.org>2017-02-11 14:17:58 +0000
commit3f87b5cb51a9164076426ff318d5d77c12b0ced3 (patch)
treef850017ca906c1f973d599485b77a7dceb60e2fc /Mk/bsd.xorg.mk
parentUpdate Mesa to 13.0.4 (diff)
Xorg-servers update to 1.18.4 with driver updates and revision bumps.
Update xf86-video-ati to 7.8.0 Update xf86-video-intel to 2.99.917.20170103 Update xf86-input-synaptics to 1.9.0 Update xf86-input-evdev to 2.10.5 Update xf86-video-r128 to 6.10.2 Update xf86-video-rendition to 4.2.6 New port: xf86-video-geode PR: 214591,216269,214687,214593,214715,216276,216277,216278,216287, 216288,216292,216298,214560,216299,216300,216301,216302 Approved by: swills (mentor, portmgr) Differential Revision: https://reviews.freebsd.org/D9436
Notes
Notes: svn path=/head/; revision=433863
Diffstat (limited to 'Mk/bsd.xorg.mk')
-rw-r--r--Mk/bsd.xorg.mk17
1 files changed, 7 insertions, 10 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 295d7b9112a6..b29a35ac1107 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -59,15 +59,12 @@ USE_XORG+= xorg-macros
. if ${XORG_CAT} == "driver"
USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \
- inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
- presentproto glproto xineramaproto resourceproto scrnsaverproto
-# work around a llvm bug on i386, llvm bug #15806
-# reproduced with clang 3.2 (current release) and 3.1
-. if ${ARCH} == i386
-CFLAGS+= -fno-optimize-sibling-calls
-. endif
+ inputproto kbproto fontsproto videoproto dri2proto dri3proto \
+ xf86driproto presentproto glproto xineramaproto resourceproto \
+ scrnsaverproto
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
USES+= libtool
+INSTALL_TARGET= install-strip
. endif
. if ${XORG_CAT} == "font"
@@ -101,7 +98,7 @@ CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \
--with-fontrootdir=${LOCALBASE}/share/fonts
LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri
-USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
+USE_XORG+= fontutil:build
. endif
.endif
@@ -115,7 +112,7 @@ Xorg_Post_Include= bsd.xorg.mk
# Register all xorg .pc files here.
# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
-XORG_MODULES= bigreqsproto \
+XORG_MODULES= bigreqsproto \
compositeproto \
damageproto \
dmx \
@@ -239,7 +236,7 @@ xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPENDS}
xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:x11-toolkits/libXaw
xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw
xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps
-xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
+xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:x11/xcmiscproto
xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite
xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor