svn commit: r382375 - in head/x11-drivers: . drm-kmod xf86-video-ati xf86-video-intel

[Jean-Sebastien Pedron]

Author: dumbbell (src committer)
Date: Fri Mar 27 08:33:27 2015
New Revision: 382375
URL: https://svnweb.freebsd.org/changeset/ports/382375
QAT: https://qat.redports.org/buildarchive/r382375/

Log:
  x11-drivers/drm-kmod: Port for the DRM kernel drivers for FreeBSD 9.3
  
  This port allows us to provide updated DRM kernel drivers on FreeBSD
  9.3. Kernel modules are suffixed with "_port" compared to the vanilla
  drivers (eg. i915kms.ko becomes i915kms_port.ko). The device-independent
  module, renamed as drm2_port.ko, is also included. However, Radeon
  firmwares are not: the vanilla ones are still being used.
  
  xf86-video-ati and xf86-video-intel depends on drm-kmod on FreeBSD 9.3.
  These ports are modified to automatically load the *_port kernel module.
  
  This initial version brings hardware context support to the i915 driver.
  This feature is required by Mesa 9.2+, which itself is required by
  xserver 1.15+.
  
  Differential Revision:	https://reviews.freebsd.org/D2149
  Reviewed by:	kwm
  Approved by:	kwm
  Tested by:	Florian Degner <f.degner at gmx.de>

Added:
  head/x11-drivers/drm-kmod/
  head/x11-drivers/drm-kmod/Makefile   (contents, props changed)
  head/x11-drivers/drm-kmod/distinfo   (contents, props changed)
  head/x11-drivers/drm-kmod/pkg-descr   (contents, props changed)
Modified:
  head/x11-drivers/Makefile
  head/x11-drivers/xf86-video-ati/Makefile
  head/x11-drivers/xf86-video-intel/Makefile

Modified: head/x11-drivers/Makefile
==============================================================================
--- head/x11-drivers/Makefile	Fri Mar 27 08:26:59 2015	(r382374)
+++ head/x11-drivers/Makefile	Fri Mar 27 08:33:27 2015	(r382375)
@@ -3,6 +3,7 @@
 
     COMMENT = X11 drivers
 
+    SUBDIR += drm-kmod
     SUBDIR += xf86-input-acecad
     SUBDIR += xf86-input-egalax
     SUBDIR += xf86-input-elographics

Added: head/x11-drivers/drm-kmod/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/drm-kmod/Makefile	Fri Mar 27 08:33:27 2015	(r382375)
@@ -0,0 +1,32 @@
+# Created by: Jean-Sebastien Pedron <dumbbell at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	drm-kmod
+DISTVERSION=	9.280208
+CATEGORIES=	x11-drivers
+MASTER_SITES=	LOCAL/dumbbell
+DISTNAME=	drm-${DISTVERSION}
+
+MAINTAINER=	x11 at FreeBSD.org
+COMMENT=	FreeBSD 9.3 Kernel DRM driver
+
+LICENSE=	MIT
+
+USES=		tar:xz kmod
+ONLY_FOR_ARCHS=	i386 amd64
+
+PLIST_FILES=	${KMODDIR}/drm2_port.ko \
+		${KMODDIR}/i915kms_port.ko \
+		${KMODDIR}/radeonkms_port.ko \
+
+.include <bsd.port.options.mk>
+
+.if (${OSVERSION} < 903000 || ${OSVERSION} > 1000000)
+IGNORE=		this port is only for 9.3 systems
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+MAKE_ARGS+=" HAVE_DEBUG=YES"
+.endif
+
+.include <bsd.port.mk>

Added: head/x11-drivers/drm-kmod/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/drm-kmod/distinfo	Fri Mar 27 08:33:27 2015	(r382375)
@@ -0,0 +1,2 @@
+SHA256 (drm-9.280208.tar.xz) = 27586b92a14b4a7596e838eaeb596ae82b53cb7807179a456bb4e5cad0c8c8b0
+SIZE (drm-9.280208.tar.xz) = 902972

Added: head/x11-drivers/drm-kmod/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/drm-kmod/pkg-descr	Fri Mar 27 08:33:27 2015	(r382375)
@@ -0,0 +1,3 @@
+The DRM kernel driver supports Intel and Radeon GPUs.
+
+WWW: http://www.freebsd.org/

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Fri Mar 27 08:26:59 2015	(r382374)
+++ head/x11-drivers/xf86-video-ati/Makefile	Fri Mar 27 08:33:27 2015	(r382375)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	7.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -22,4 +22,14 @@ ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS+=--disable-udev
 CONFIGURE_ARGS+=--disable-glamor
 
+.include <bsd.port.options.mk>
+
+.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
+RUN_DEPENDS+=	drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|"radeonkms"|"radeonkms_port"|g' \
+		${WRKSRC}/src/radeon_kms.c
+.endif
+
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-video-intel/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-intel/Makefile	Fri Mar 27 08:26:59 2015	(r382374)
+++ head/x11-drivers/xf86-video-intel/Makefile	Fri Mar 27 08:33:27 2015	(r382375)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	2.21.15
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -33,4 +33,14 @@ CONFIGURE_ARGS+=	--enable-sna
 CONFIGURE_ARGS+=	--disable-glamor
 INSTALL_TARGET=	install-strip
 
+.include <bsd.port.options.mk>
+
+.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
+RUN_DEPENDS+=	drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|"i915kms"|"i915kms_port"|g' \
+		${WRKSRC}/src/intel_device.c
+.endif
+
 .include <bsd.port.mk>