summaryrefslogtreecommitdiffstats
path: root/x11-drivers/xf86-video-intel/Makefile
diff options
context:
space:
mode:
authorzeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
committerzeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
commit30e10e1d3c1d2aba115571f87754d3a229fa9391 (patch)
tree2df88f8b6e2af92b78ac24eb382268b7c290efab /x11-drivers/xf86-video-intel/Makefile
parentda7a4c20a4d3dae187b71915971ffc8f2332f201 (diff)
downloadFreeBSD-ports-30e10e1d3c1d2aba115571f87754d3a229fa9391.zip
FreeBSD-ports-30e10e1d3c1d2aba115571f87754d3a229fa9391.tar.gz
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2] Approved by: portmgr (bdrewery), core (jhb) [0]
Diffstat (limited to 'x11-drivers/xf86-video-intel/Makefile')
-rw-r--r--x11-drivers/xf86-video-intel/Makefile24
1 files changed, 8 insertions, 16 deletions
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index f34c93f..708df7f 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -23,14 +23,11 @@ USE_XORG= glproto \
xrender \
xvmc
-MAN4= intel.4x
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
INTEL_VERSION= 2.21.15
-INTEL_REVISION= 0
+INTEL_REVISION= 1
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
MAKE_JOBS_UNSAFE=yes
@@ -39,10 +36,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \
${PATCHDIR}/extra-src_sna_kgem.c \
${PATCHDIR}/extra-clang \
${PATCHDIR}/extra-i915kms
-LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION= 2.7.1
-INTEL_REVISION= 5
+INTEL_REVISION= 6
PLIST_SUB+= OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
@@ -65,14 +62,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
${PATCHDIR}/extra-uxa_uxa-priv.h
.endif
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_NEW_XORG)
-pre-configure:
-.if !exists(${LOCALBASE}/lib/libkms.so)
- @${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
- @${FALSE}
-.endif
-.endif
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
OpenPOWER on IntegriCloud