Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Feb 2017 14:17:59 +0000 (UTC)
From:      Matthew Rezny <rezny@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433863 - in head: Mk x11-drivers x11-drivers/xf86-input-acecad x11-drivers/xf86-input-egalax x11-drivers/xf86-input-elographics x11-drivers/xf86-input-evdev x11-drivers/xf86-input-evde...
Message-ID:  <201702111417.v1BEHxaP098524@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rezny
Date: Sat Feb 11 14:17:58 2017
New Revision: 433863
URL: https://svnweb.freebsd.org/changeset/ports/433863

Log:
  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

Added:
  head/x11-drivers/xf86-input-synaptics/files/
  head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c   (contents, props changed)
  head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h   (contents, props changed)
  head/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c   (contents, props changed)
  head/x11-drivers/xf86-video-ati/files/patch-git_f11531c   (contents, props changed)
  head/x11-drivers/xf86-video-geode/
  head/x11-drivers/xf86-video-geode/Makefile   (contents, props changed)
  head/x11-drivers/xf86-video-geode/distinfo   (contents, props changed)
  head/x11-drivers/xf86-video-geode/pkg-descr   (contents, props changed)
  head/x11-drivers/xf86-video-geode/pkg-plist   (contents, props changed)
  head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c   (contents, props changed)
  head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h   (contents, props changed)
  head/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c
     - copied, changed from r433862, head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c
  head/x11-drivers/xf86-video-neomagic/files/
  head/x11-drivers/xf86-video-neomagic/files/patch-src_neo__driver.c   (contents, props changed)
  head/x11-drivers/xf86-video-r128/files/
  head/x11-drivers/xf86-video-r128/files/patch-src_r128__dri.c   (contents, props changed)
  head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__driver.c   (contents, props changed)
  head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo__hardware.c   (contents, props changed)
  head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c   (contents, props changed)
  head/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c
     - copied, changed from r433862, head/x11-servers/xorg-server/files/extra-arch-sparc64
  head/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c
     - copied, changed from r433862, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
  head/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
     - copied, changed from r433862, head/x11-servers/xorg-server/files/extra-arch-powerpc
Deleted:
  head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
  head/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
  head/x11-drivers/xf86-video-intel/files/patch-clang
  head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c
  head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c
  head/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c
  head/x11-drivers/xf86-video-intel/files/patch-src_compat-api.h
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c
  head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
  head/x11-servers/xephyr/distinfo
  head/x11-servers/xorg-dmx/distinfo
  head/x11-servers/xorg-server/files/extra-arch-i386
  head/x11-servers/xorg-server/files/extra-arch-ia64
  head/x11-servers/xorg-server/files/extra-arch-powerpc
  head/x11-servers/xorg-server/files/extra-arch-sparc64
  head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
  head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
Modified:
  head/Mk/bsd.xorg.mk
  head/x11-drivers/Makefile
  head/x11-drivers/xf86-input-acecad/Makefile
  head/x11-drivers/xf86-input-egalax/Makefile
  head/x11-drivers/xf86-input-elographics/Makefile
  head/x11-drivers/xf86-input-evdev/Makefile
  head/x11-drivers/xf86-input-evdev/distinfo
  head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c
  head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h
  head/x11-drivers/xf86-input-fpit/Makefile
  head/x11-drivers/xf86-input-hyperpen/Makefile
  head/x11-drivers/xf86-input-keyboard/Makefile
  head/x11-drivers/xf86-input-mouse/Makefile
  head/x11-drivers/xf86-input-mutouch/Makefile
  head/x11-drivers/xf86-input-penmount/Makefile
  head/x11-drivers/xf86-input-synaptics/Makefile
  head/x11-drivers/xf86-input-synaptics/distinfo
  head/x11-drivers/xf86-input-synaptics/pkg-plist
  head/x11-drivers/xf86-input-vmmouse/Makefile
  head/x11-drivers/xf86-input-void/Makefile
  head/x11-drivers/xf86-input-wacom/Makefile
  head/x11-drivers/xf86-video-amdgpu/Makefile
  head/x11-drivers/xf86-video-apm/Makefile
  head/x11-drivers/xf86-video-ark/Makefile
  head/x11-drivers/xf86-video-ati/Makefile
  head/x11-drivers/xf86-video-ati/distinfo
  head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
  head/x11-drivers/xf86-video-chips/Makefile
  head/x11-drivers/xf86-video-glint/Makefile
  head/x11-drivers/xf86-video-i128/Makefile
  head/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c
  head/x11-drivers/xf86-video-i740/Makefile
  head/x11-drivers/xf86-video-intel/Makefile
  head/x11-drivers/xf86-video-intel/distinfo
  head/x11-drivers/xf86-video-intel/files/patch-i915kms
  head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
  head/x11-drivers/xf86-video-intel/pkg-descr
  head/x11-drivers/xf86-video-mach64/Makefile
  head/x11-drivers/xf86-video-mga/Makefile
  head/x11-drivers/xf86-video-neomagic/Makefile
  head/x11-drivers/xf86-video-nv/Makefile
  head/x11-drivers/xf86-video-openchrome/Makefile
  head/x11-drivers/xf86-video-r128/Makefile
  head/x11-drivers/xf86-video-r128/distinfo
  head/x11-drivers/xf86-video-rendition/Makefile
  head/x11-drivers/xf86-video-rendition/distinfo
  head/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
  head/x11-drivers/xf86-video-s3/Makefile
  head/x11-drivers/xf86-video-s3virge/Makefile
  head/x11-drivers/xf86-video-savage/Makefile
  head/x11-drivers/xf86-video-scfb/Makefile
  head/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c
  head/x11-drivers/xf86-video-siliconmotion/Makefile
  head/x11-drivers/xf86-video-sunffb/Makefile
  head/x11-drivers/xf86-video-tdfx/Makefile
  head/x11-drivers/xf86-video-trident/Makefile
  head/x11-drivers/xf86-video-tseng/Makefile
  head/x11-drivers/xf86-video-vesa/Makefile
  head/x11-drivers/xf86-video-vmware/Makefile
  head/x11-drivers/xf86-video-voodoo/Makefile
  head/x11-drivers/xf86-video-voodoo/files/patch-src_voodoo.h
  head/x11-drivers/xorg-drivers/Makefile
  head/x11-servers/xephyr/Makefile
  head/x11-servers/xorg-dmx/Makefile
  head/x11-servers/xorg-nestserver/Makefile
  head/x11-servers/xorg-server/Makefile
  head/x11-servers/xorg-server/distinfo
  head/x11-servers/xorg-server/files/patch-config_config-backends.h
  head/x11-servers/xorg-server/files/patch-config_config.c
  head/x11-servers/xorg-server/files/patch-config_devd.c
  head/x11-servers/xorg-server/files/patch-configure
  head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c
  head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c
  head/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c
  head/x11-servers/xorg-server/files/patch-xkb_Makefile.in
  head/x11-servers/xorg-server/pkg-plist
  head/x11-servers/xorg-vfbserver/Makefile

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/Mk/bsd.xorg.mk	Sat Feb 11 14:17:58 2017	(r433863)
@@ -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=${LOCAL
 					--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_DEPEN
 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

Modified: head/x11-drivers/Makefile
==============================================================================
--- head/x11-drivers/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -26,6 +26,7 @@
     SUBDIR += xf86-video-chips
     SUBDIR += xf86-video-cirrus
     SUBDIR += xf86-video-dummy
+    SUBDIR += xf86-video-geode
     SUBDIR += xf86-video-glint
     SUBDIR += xf86-video-i128
     SUBDIR += xf86-video-i740

Modified: head/x11-drivers/xf86-input-acecad/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-acecad/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-acecad/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-acecad
 PORTVERSION=	1.5.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-egalax/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-egalax/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-egalax/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-input-egalax
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	glebius@FreeBSD.org
@@ -12,16 +12,10 @@ COMMENT=	eGalax touch screen input drive
 USE_GITHUB=	yes
 GH_ACCOUNT=	glebius
 GH_TAGNAME=	7f1e4ac
-DIST_SUBDIR=	xorg/driver
 
 LICENSE=	BSD2CLAUSE
 
-GNU_CONFIGURE=	yes
-USES=		autoreconf libtool pkgconfig
-USE_XORG=	xorg-server xproto xi inputproto xf86driproto glproto \
-		randrproto renderproto resourceproto scrnsaverproto \
-		xorg-macros presentproto
-CONFIGURE_ENV=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-INSTALL_TARGET=	install-strip
+USES=		autoreconf
+XORG_CAT=	driver
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-input-elographics/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-elographics/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-elographics/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-elographics
 PORTVERSION=	1.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-evdev/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-evdev/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-evdev/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-evdev
-PORTVERSION=	2.10.4
+PORTVERSION=	2.10.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -18,6 +18,5 @@ RUN_DEPENDS=	webcamd>=3.1.0.1:multimedia
 XORG_CAT=	driver
 USES=		pathfix
 CONFIGURE_ENV=	UDEV_CFLAGS=" " UDEV_LIBS=" "
-INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-input-evdev/distinfo
==============================================================================
--- head/x11-drivers/xf86-input-evdev/distinfo	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-evdev/distinfo	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479415100
-SHA256 (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2
-SIZE (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = 404465
+TIMESTAMP = 1484717140
+SHA256 (xorg/driver/xf86-input-evdev-2.10.5.tar.bz2) = 9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d
+SIZE (xorg/driver/xf86-input-evdev-2.10.5.tar.bz2) = 405956

Modified: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c
==============================================================================
--- head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,6 +1,6 @@
---- src/evdev.c.orig	2015-03-27 01:35:50 UTC
+--- src/evdev.c.orig	2017-01-03 01:26:00 UTC
 +++ src/evdev.c
-@@ -37,9 +37,13 @@
+@@ -38,9 +38,13 @@
  #include <X11/keysym.h>
  #include <X11/extensions/XI.h>
  
@@ -14,7 +14,7 @@
  #include <unistd.h>
  #include <errno.h>
  #include <fcntl.h>
-@@ -222,6 +226,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
+@@ -226,6 +230,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
  static BOOL
  EvdevDeviceIsVirtual(const char* devicenode)
  {
@@ -22,7 +22,7 @@
      struct udev *udev = NULL;
      struct udev_device *device = NULL;
      struct stat st;
-@@ -252,6 +257,9 @@ out:
+@@ -256,6 +261,9 @@ out:
      udev_device_unref(device);
      udev_unref(udev);
      return rc;
@@ -31,8 +31,8 @@
 +#endif
  }
  
- #ifndef HAVE_SMOOTH_SCROLLING
-@@ -1086,11 +1094,13 @@ EvdevReadInput(InputInfoPtr pInfo)
+ 
+@@ -1062,11 +1070,13 @@ EvdevReadInput(InputInfoPtr pInfo)
      do {
          rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
          if (rc < 0) {
@@ -47,8 +47,8 @@
 +            }
              break;
          } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
- #ifdef MULTITOUCH
-@@ -1470,10 +1480,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
+             if (pEvdev->mtdev)
+@@ -1476,10 +1486,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
              continue;
  
          abs = libevdev_get_abs_info(pEvdev->dev, axis);

Modified: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h
==============================================================================
--- head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,4 +1,4 @@
---- src/evdev.h.orig	2015-03-27 01:35:50 UTC
+--- src/evdev.h.orig	2016-11-21 04:59:44 UTC
 +++ src/evdev.h
 @@ -36,7 +36,15 @@
  #define EVDEV_H

Modified: head/x11-drivers/xf86-input-fpit/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-fpit/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-fpit/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-fpit
 PORTVERSION=	1.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-hyperpen/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-hyperpen/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-hyperpen/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-hyperpen
 PORTVERSION=	1.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-keyboard/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-keyboard/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-keyboard/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-keyboard
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-mouse/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-mouse/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-mouse/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,6 +13,5 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 XORG_CAT=	driver
 USES=		pathfix
-INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-input-mutouch/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-mutouch/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-mutouch/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-mutouch
 PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-penmount/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-penmount/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-penmount/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-penmount
 PORTVERSION=	1.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-synaptics/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-synaptics/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-synaptics/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,17 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org synaptics input driver
 
-CONFLICTS=	synaptics-[0-9]*
+LICESNE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
+OPTIONS_DEFINE=	EVDEV
+EVDEV_DESC=	Use evdev for input events (requires kernel support)
+
+EVDEV_CONFIGURE_ENV=	BUILD_EVENTCOMM=yes
+EVDEV_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
+EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev
+
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-input-synaptics/distinfo
==============================================================================
--- head/x11-drivers/xf86-input-synaptics/distinfo	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-synaptics/distinfo	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80
-SIZE (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 484261
+TIMESTAMP = 1479490184
+SHA256 (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a
+SIZE (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = 501814

Added: head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,18 @@
+--- src/eventcomm.c.orig	2016-09-30 07:09:32 UTC
++++ src/eventcomm.c
+@@ -421,10 +421,15 @@ event_get_abs(struct libevdev *evdev, in
+     /* We dont trust a zero fuzz as it probably is just a lazy value */
+     if (fuzz && abs->fuzz > 0)
+         *fuzz = abs->fuzz;
++#ifdef __linux__
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
+     if (res)
+         *res = abs->resolution;
+ #endif
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
++    if (res)
++        *res = abs->resolution;
++#endif
+
+     return 0;
+ }

Added: head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,18 @@
+--- src/eventcomm.h.orig	2015-11-24 23:47:05 UTC
++++ src/eventcomm.h
+@@ -30,7 +30,15 @@
+ #include <xorg-server.h>
+ 
+ #include <linux/input.h>
++#ifdef __linux__
+ #include <linux/version.h>
++#else
++#undef BUS_NONE
++#undef BUS_PCI
++#undef BUS_SBUS
++#undef BUS_PLATFORM
++#undef BUS_last
++#endif
+ #include <xf86Xinput.h>
+ #include "synproto.h"
+ 

Added: head/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,31 @@
+--- src/synaptics.c.orig	2016-09-30 07:09:32 UTC
++++ src/synaptics.c
+@@ -2599,7 +2599,7 @@ HandleScrolling(SynapticsPrivate * priv,
+ 
+         priv->scroll.delta_y += priv->scroll.coast_speed_y * dtime * abs(para->scroll_dist_vert);
+         delay = MIN(delay, POLL_MS);
+-        if (abs(priv->scroll.coast_speed_y) < ddy) {
++        if (fabs(priv->scroll.coast_speed_y) < ddy) {
+             priv->scroll.coast_speed_y = 0;
+             priv->scroll.packets_this_scroll = 0;
+         }
+@@ -2614,7 +2614,7 @@ HandleScrolling(SynapticsPrivate * priv,
+         double ddx = para->coasting_friction * dtime;
+         priv->scroll.delta_x += priv->scroll.coast_speed_x * dtime * abs(para->scroll_dist_horiz);
+         delay = MIN(delay, POLL_MS);
+-        if (abs(priv->scroll.coast_speed_x) < ddx) {
++        if (fabs(priv->scroll.coast_speed_x) < ddx) {
+             priv->scroll.coast_speed_x = 0;
+             priv->scroll.packets_this_scroll = 0;
+         }
+@@ -2670,8 +2670,8 @@ clickpad_guess_clickfingers(SynapticsPri
+              * really, this should be dependent on the touchpad size. Also,
+              * you'll need to find a touchpad that doesn't lie about it's
+              * size. Good luck. */
+-            if (abs(x1 - x2) < (priv->maxx - priv->minx) * .3 &&
+-                abs(y1 - y2) < (priv->maxy - priv->miny) * .3) {
++            if (fabs(x1 - x2) < (priv->maxx - priv->minx) * .3 &&
++                fabs(y1 - y2) < (priv->maxy - priv->miny) * .3) {
+                 close_point |= (1 << j);
+                 close_point |= (1 << i);
+             }

Modified: head/x11-drivers/xf86-input-synaptics/pkg-plist
==============================================================================
--- head/x11-drivers/xf86-input-synaptics/pkg-plist	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-synaptics/pkg-plist	Sat Feb 11 14:17:58 2017	(r433863)
@@ -6,4 +6,4 @@ libdata/pkgconfig/xorg-synaptics.pc
 man/man1/synclient.1.gz
 man/man1/syndaemon.1.gz
 man/man4/synaptics.4x.gz
-share/X11/xorg.conf.d/50-synaptics.conf
+share/X11/xorg.conf.d/70-synaptics.conf

Modified: head/x11-drivers/xf86-input-vmmouse/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-vmmouse/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-vmmouse/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-input-vmmouse
 PORTVERSION=	13.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-void/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-void/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-void/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-void
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-input-wacom/Makefile
==============================================================================
--- head/x11-drivers/xf86-input-wacom/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-input-wacom/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-wacom
 PORTVERSION=	0.34.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 MASTER_SITES=	SF/linuxwacom/${PORTNAME}
 
@@ -13,8 +14,8 @@ LICENSE=	GPLv2+
 BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 RUN_DEPENDS=	webcamd>=3.1.0.1:multimedia/webcamd
 
-USES=		tar:bzip2 pathfix pkgconfig libtool
-USE_XORG=	x11 xinerama xrandr
+USES=		pathfix
+USE_XORG=	x11 xext xinerama xrandr
 XORG_CAT=	driver
 LDFLAGS+=	-Wl,--as-needed # Xext
 USE_RC_SUBR=	wacom
@@ -23,7 +24,6 @@ CONFIGURE_ENV=	UDEV_CFLAGS=" " UDEV_LIBS
 CONFIGURE_ARGS=	--without-systemd-unit-dir \
 		--without-udev-rules-dir \
 		--without-doxygen
-INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DEBUG TEST
 

Modified: head/x11-drivers/xf86-video-amdgpu/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-amdgpu/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-amdgpu/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -4,6 +4,7 @@
 
 PORTNAME=	xf86-video-amdgpu
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -16,16 +17,16 @@ LIB_DEPENDS=	libdrm_amdgpu.so:graphics/l
 
 USE_GL=		gbm
 XORG_CAT=	driver
-INSTALL_TARGET=	install-strip
 # No amdgpu kernel driver on non-x86 and PC98.
 ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86
 
 CONFIGURE_ARGS+=--disable-udev
 
 .include <bsd.port.options.mk>
 
 .if (${OSVERSION} < 1200019)
-IGNORE=		not support on 11.x or older, no kernel support
+IGNORE=		not supported on 11.x or older, no kernel support
 .endif
 
 PLIST_FILES=	lib/xorg/modules/drivers/amdgpu_drv.so \

Modified: head/x11-drivers/xf86-video-apm/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-apm/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-apm/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-apm
 PORTVERSION=	1.2.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-video-ark/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ark/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-ark/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ark
 PORTVERSION=	0.7.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-ati/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,25 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	7.5.0
+PORTVERSION=	7.8.0
 PORTEPOCH=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ati display driver
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
+		libdrm_radeon.so:graphics/libdrm
+
 USE_GL=		gl
 XORG_CAT=	driver
-USE_XORG=	xf86driproto \
-		xineramaproto \
-		xf86miscproto \
-		glproto \
-		presentproto
-INSTALL_TARGET=	install-strip
+USE_XORG=	pciaccess
+
 # No Radeon kernel driver on non-x86 and PC98.
 ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86
 
 CONFIGURE_ARGS+=--disable-udev
-CONFIGURE_ARGS+=--disable-glamor
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-video-ati/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-ati/distinfo	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-ati/distinfo	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484479584
-SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
-SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756
+TIMESTAMP = 1479393377
+SHA256 (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa
+SIZE (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 845702

Added: head/x11-drivers/xf86-video-ati/files/patch-git_f11531c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-ati/files/patch-git_f11531c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,48 @@
+From f11531c99fcd6473f58b4d10efaf3efd84304d8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
+Date: Mon, 21 Nov 2016 18:15:05 +0900
+Subject: Enable glamor by default with >= R600 and Xorg >= 1.18.3
+
+glamor should now perform at least as well as EXA in general, and this
+allows DRI3 to be enabled by default for >= R600.
+
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/man/radeon.man b/man/radeon.man
+index 6af7a92..8990ae2 100644
+--- man/radeon.man
++++ man/radeon.man
+@@ -293,7 +293,7 @@ Chooses between available acceleration architectures.  Valid values are
+ .B glamor
+ (for R300 or higher). The default is
+ .B glamor
+-as of TAHITI, otherwise
++with R600 or newer (with Xorg >= 1.18.3, otherwise with TAHITI or newer), otherwise
+ .B EXA.
+ 
+ .PP
+diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
+index b66848f..590c9f0 100644
+--- src/radeon_glamor.c
++++ src/radeon_glamor.c
+@@ -84,8 +84,15 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
+ 		return FALSE;
+ 
+ 	s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
+-	if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI)
+-		return FALSE;
++	if (!s) {
++		if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) {
++			if (info->ChipFamily < CHIP_FAMILY_R600)
++				return FALSE;
++		} else {
++			if (info->ChipFamily < CHIP_FAMILY_TAHITI)
++				return FALSE;
++		}
++	}
+ 
+ 	if (s && strcasecmp(s, "glamor") != 0) {
+ 		if (info->ChipFamily >= CHIP_FAMILY_TAHITI)
+-- 
+cgit v0.10.2
+

Modified: head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
==============================================================================
--- head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,5 +1,5 @@
---- src/radeon_kms.c.orig	2014-10-02 05:31:27.000000000 +0200
-+++ src/radeon_kms.c	2014-10-23 18:56:18.359108170 +0200
+--- src/radeon_kms.c.orig	2016-11-17 02:23:37 UTC
++++ src/radeon_kms.c
 @@ -30,6 +30,8 @@
  
  #include <errno.h>
@@ -8,36 +8,18 @@
 +#include <sys/linker.h>
  /* Driver data structures */
  #include "radeon.h"
- #include "radeon_reg.h"
-@@ -280,7 +282,7 @@
- radeon_dirty_update(ScreenPtr screen)
- {
- 	RegionPtr region;
--	PixmapDirtyUpdatePtr ent;
-+	PixmapDirtyUpdatePtr ent = NULL;
+ #include "radeon_drm_queue.h"
+@@ -1405,6 +1407,15 @@ static int radeon_get_drm_master_fd(Scrn
+     XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
+                 dev->domain, dev->bus, dev->dev, dev->func);
  
- 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
- 		return;
-@@ -589,7 +591,7 @@
- #endif
-     struct pci_device *dev = info->PciInfo;
-     char *busid;
--    int fd;
-+    int fd, err;
- 
- #ifdef XF86_PDEV_SERVER_FD
-     if (pRADEONEnt->platform_dev) {
-@@ -608,6 +610,15 @@
- 		      dev->domain, dev->bus, dev->dev, dev->func);
- #endif
- 
-+    err = kldload("radeonkms");
-+    if (err == -1 && errno != EEXIST) {
++    fd = kldload("radeonkms");
++    if (fd == -1 && errno != EEXIST) {
 +	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 +		   "[drm] Failed to load kernel module for %s: %s\n",
 +		   busid, strerror(errno));
 +	free(busid);
-+	return -1;
++	return fd;
 +    }
 +
      fd = drmOpen(NULL, busid);

Modified: head/x11-drivers/xf86-video-chips/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-chips/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-chips/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-chips
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Added: head/x11-drivers/xf86-video-geode/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-geode/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	xf86-video-geode
+PORTVERSION=	2.11.19
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org geode display driver
+
+XORG_CAT=	driver
+
+ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHES_REASON=	Geode processors are 32bit x86 only
+
+.include <bsd.port.mk>

Added: head/x11-drivers/xf86-video-geode/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-geode/distinfo	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1482059035
+SHA256 (xorg/driver/xf86-video-geode-2.11.19.tar.bz2) = c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e
+SIZE (xorg/driver/xf86-video-geode-2.11.19.tar.bz2) = 668151

Added: head/x11-drivers/xf86-video-geode/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-geode/pkg-descr	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-geode driver.
+
+WWW: http://www.x.org

Added: head/x11-drivers/xf86-video-geode/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-geode/pkg-plist	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1 @@
+lib/xorg/modules/drivers/geode_drv.so

Modified: head/x11-drivers/xf86-video-glint/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-glint/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-glint/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-glint
 PORTVERSION=	1.2.9
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-video-i128/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-i128/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-i128/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-i128
 PORTVERSION=	1.3.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c
==============================================================================
--- head/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,6 +1,8 @@
+# two upstream clean-up commits plus a string const fix
+#
 --- src/i128_driver.c.orig	2012-07-17 05:21:15 UTC
 +++ src/i128_driver.c
-@@ -50,8 +50,6 @@
+@@ -50,12 +50,9 @@
  /* All drivers initialising the SW cursor need this */
  #include "mipointer.h"
  
@@ -9,7 +11,20 @@
  #include "micmap.h"
  
  #include "xf86DDC.h"
-@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+@@ -586,7 +583,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags
+ 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
+     } else {
+         int from = X_DEFAULT;
+-        char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD);
++        const char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD);
+         pI128->NoAccel = FALSE;
+         if (!xf86NameCmp(s, "EXA")) {
+             pI128->exa = TRUE;
+@@ -1557,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
          return FALSE;
      }
      

Modified: head/x11-drivers/xf86-video-i740/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-i740/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-i740/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org

Modified: head/x11-drivers/xf86-video-intel/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-intel/Makefile	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-intel/Makefile	Sat Feb 11 14:17:58 2017	(r433863)
@@ -2,35 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-intel
-PORTVERSION=	2.21.15
-PORTREVISION=	9
+PORTVERSION=	2.99.917.20170103
 CATEGORIES=	x11-drivers
+MASTER_SITES=	http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/
+DISTNAME=	${PORTNAME}-${COMMIT_ID}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
-LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
+		libdrm.so:graphics/libdrm
+
+COMMIT_ID=	028c946df0855728b2a34d1d588701dc6c5ad4c1
 
 ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	Intel integrated GPU only exists in Intel x86 processors/chipsets
+
 USE_GL=		gl
 
 USE_LDCONFIG=	yes
 XORG_CAT=	driver
-USE_XORG=	glproto \
-		pixman \
-		x11 \
-		xext \
-		xf86driproto \
-		xineramaproto \
-		xrender \
-		xvmc
+USE_XORG=	pciaccess pixman x11 xcb xext xrender xv xvmc
 
-USES+=		cpe
+USES+=		cpe autoreconf
 CPE_VENDOR=	x
 
-CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
-CONFIGURE_ARGS+=	--enable-sna
-CONFIGURE_ARGS+=	--disable-glamor
-INSTALL_TARGET=	install-strip
+CONFIGURE_ARGS+=	--with-default-accel=uxa
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-video-intel/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-intel/distinfo	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-intel/distinfo	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,4 +1,3 @@
-SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
-SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
-SIZE (xorg/driver/xf86-video-intel-2.21.15.tar.bz2) = 1977431
+TIMESTAMP = 1484505738
+SHA256 (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 34d00a1c85f33c55a58bc072b59633d84e48776c771cec5e4d313664c3f56f7c
+SIZE (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 1236389

Modified: head/x11-drivers/xf86-video-intel/files/patch-i915kms
==============================================================================
--- head/x11-drivers/xf86-video-intel/files/patch-i915kms	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-intel/files/patch-i915kms	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,13 +1,10 @@
---- src/intel_device.c.orig	2013-06-30 16:03:51.000000000 +0200
-+++ src/intel_device.c	2013-07-02 14:08:34.903060688 +0200
-@@ -94,8 +94,8 @@
- 			 pci->domain, pci->bus, pci->dev, pci->func);
+--- src/intel_device.c.orig	2016-02-16 09:25:09.124344000 +0100
++++ src/intel_device.c	2016-02-16 09:22:49.541922000 +0100
+@@ -204,6 +207,7 @@
+ }
  
- 		ret = drmCheckModesettingSupported(id);
--		if (ret) {
--			if (xf86LoadKernelModule("i915"))
-+		if (ret || 1) {
-+			if (xf86LoadKernelModule("i915kms"))
- 				ret = drmCheckModesettingSupported(id);
- 			if (ret)
- 				return -1;
+ static const char *kernel_module_names[] ={
++	"i915kms",
+ 	"i915",
+ 	NULL,
+ };

Added: head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,12 @@
+--- src/intel_device.c.orig	2014-12-21 20:36:40.268102983 +0100
++++ src/intel_device.c	2014-12-21 20:36:01.358104504 +0100
+@@ -28,6 +28,9 @@
+ #include "config.h"
+ #endif
+ 
++#define _WITH_GETLINE	/* to expose getline() in stdio.h on FreeBSD */
++#include <stdio.h>	/* for getline() */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>

Added: head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h	Sat Feb 11 14:17:58 2017	(r433863)
@@ -0,0 +1,36 @@
+--- src/intel_list.h.orig	2015-12-10 23:29:35.000000000 +0100
++++ src/intel_list.h	2016-10-24 10:22:57.280379000 +0200
+@@ -305,8 +305,6 @@
+ #define list_last_entry(ptr, type, member) \
+     list_entry((ptr)->prev, type, member)
+ 
+-#define __container_of(ptr, sample, member)				\
+-    (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample)))
+ /**
+  * Loop through the list given by head and set pos to struct in the list.
+  *
+@@ -325,12 +323,12 @@
+  *
+  */
+ #define list_for_each_entry(pos, head, member)				\
+-    for (pos = __container_of((head)->next, pos, member);		\
++    for (pos = NULL, pos = __container_of((head)->next, pos, member);	\
+ 	 &pos->member != (head);					\
+ 	 pos = __container_of(pos->member.next, pos, member))
+ 
+-#define list_for_each_entry_reverse(pos, head, member)				\
+-    for (pos = __container_of((head)->prev, pos, member);		\
++#define list_for_each_entry_reverse(pos, head, member)			\
++    for (pos = NULL, pos = __container_of((head)->prev, pos, member);	\
+ 	 &pos->member != (head);					\
+ 	 pos = __container_of(pos->member.prev, pos, member))
+ 
+@@ -342,7 +340,7 @@
+  * See list_for_each_entry for more details.
+  */
+ #define list_for_each_entry_safe(pos, tmp, head, member)		\
+-    for (pos = __container_of((head)->next, pos, member),		\
++    for (pos = NULL, pos = __container_of((head)->next, pos, member),	\
+ 	 tmp = __container_of(pos->member.next, pos, member);		\
+ 	 &pos->member != (head);					\
+ 	 pos = tmp, tmp = __container_of(pos->member.next, tmp, member))

Copied and modified: head/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c (from r433862, head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c)
==============================================================================
--- head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c	Sat Feb 11 13:31:59 2017	(r433862, copy source)
+++ head/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,14 +1,12 @@
---- src/sna/sna_threads.c.orig	2013-02-02 00:03:44.000000000 +0000
-+++ src/sna/sna_threads.c	2013-02-02 00:04:39.000000000 +0000
-@@ -94,7 +94,11 @@
- 		size_t len = 0;
- 		char *line = NULL;
- 		uint32_t processors = 0, cores = 0;
-+#ifdef __GLIBC__
- 		while (getline(&line, &len, file) != -1) {
-+#else
-+		while ((line = fgetln(file, &len)) != (char *) NULL) {
-+#endif
- 			int id;
- 			if (sscanf(line, "physical id : %d", &id) == 1) {
- 				if (id >= 32)
+--- src/sna/sna_threads.c.orig	2016-11-18 16:32:46 UTC
++++ src/sna/sna_threads.c
+@@ -29,6 +29,9 @@
+ #include "config.h"
+ #endif
+
++#define _WITH_GETLINE	/* to expose getline() in stdio.h on FreeBSD */
++#include <stdio.h>	/* for getline() */
++
+ #include "sna.h"
+
+ #include <unistd.h>

Modified: head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
==============================================================================
--- head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c	Sat Feb 11 13:31:59 2017	(r433862)
+++ head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c	Sat Feb 11 14:17:58 2017	(r433863)
@@ -1,87 +1,12 @@
---- src/sna/kgem.c.orig	2013-08-20 20:26:26 UTC
-+++ src/sna/kgem.c
-@@ -25,6 +25,7 @@
-  *
-  */
- 
-+#define _WITH_GETLINE
- #ifdef HAVE_CONFIG_H
+--- src/sna/kgem.c.orig	2014-12-09 17:08:21.000000000 +0100
++++ src/sna/kgem.c	2015-11-19 00:06:27.883010000 +0100
+@@ -29,6 +29,9 @@
  #include "config.h"
  #endif
-@@ -1873,7 +1874,8 @@ static void kgem_bo_move_to_snoop(struct
- static struct kgem_bo *
- search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
- {
--	struct kgem_bo *bo, *first = NULL;
-+	struct kgem_bo *bo = NULL;
-+	struct kgem_bo *first = NULL;
- 
- 	DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags));
- 
-@@ -2087,7 +2089,8 @@ static bool kgem_retire__buffers(struct 
- 
- static bool kgem_retire__flushing(struct kgem *kgem)
- {
--	struct kgem_bo *bo, *next;
-+	struct kgem_bo *bo = NULL;
-+	struct kgem_bo *next;
- 	bool retired = false;
- 
- 	list_for_each_entry_safe(bo, next, &kgem->flushing, request) {
-@@ -2292,7 +2295,8 @@ bool __kgem_ring_is_idle(struct kgem *kg
- static void kgem_commit(struct kgem *kgem)
- {
- 	struct kgem_request *rq = kgem->next_request;
--	struct kgem_bo *bo, *next;
-+	struct kgem_bo *bo = NULL;
-+	struct kgem_bo *next;
- 
- 	list_for_each_entry_safe(bo, next, &rq->buffers, request) {
- 		assert(next->request.prev == &bo->request);
-@@ -2373,7 +2377,8 @@ static void kgem_close_inactive(struct k
- 
- static void kgem_finish_buffers(struct kgem *kgem)
- {
--	struct kgem_buffer *bo, *next;
-+	struct kgem_buffer *bo = NULL;
-+	struct kgem_buffer *next;
- 
- 	list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) {
- 		DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%s\n",
-@@ -3254,7 +3259,8 @@ void kgem_cleanup_cache(struct kgem *kge
- static struct kgem_bo *
- search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags)
- {
--	struct kgem_bo *bo, *first = NULL;
-+	struct kgem_bo *bo = NULL;
-+	struct kgem_bo *first = NULL;
- 	bool use_active = (flags & CREATE_INACTIVE) == 0;
- 	struct list *cache;
- 
-@@ -3867,7 +3873,7 @@ struct kgem_bo *kgem_create_2d(struct kg
- 			       uint32_t flags)
- {
- 	struct list *cache;
--	struct kgem_bo *bo;
-+	struct kgem_bo *bo = NULL;
- 	uint32_t pitch, tiled_height, size;
- 	uint32_t handle;
- 	int i, bucket, retry;
-@@ -5337,7 +5343,7 @@ void kgem_bo_sync__gtt(struct kgem *kgem
- void kgem_clear_dirty(struct kgem *kgem)
- {
- 	struct list * const buffers = &kgem->next_request->buffers;
--	struct kgem_bo *bo;
-+	struct kgem_bo *bo = NULL;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702111417.v1BEHxaP098524>