Index: head/x11-drivers/xf86-video-intel/Makefile =================================================================== --- head/x11-drivers/xf86-video-intel/Makefile (revision 435511) +++ head/x11-drivers/xf86-video-intel/Makefile (revision 435512) @@ -1,32 +1,46 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= xf86-video-intel -PORTVERSION= 2.99.917.20170103 +PORTVERSION= 2.99.917.20170228 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 +LICENSE= MIT # various +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libxcb-util.so:x11/xcb-util \ libdrm.so:graphics/libdrm -COMMIT_ID= 028c946df0855728b2a34d1d588701dc6c5ad4c1 +COMMIT_ID= 78d7a09b0343829c81257024b164b0b3764392ac 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= pciaccess pixman x11 xcb xext xrender xv xvmc USES+= cpe autoreconf CPE_VENDOR= x -CONFIGURE_ARGS+= --with-default-accel=uxa +OPTIONS_SINGLE= ACCEL +OPTIONS_SINGLE_ACCEL= SNA UXA +OPTIONS_DEFAULT= UXA + +ACCEL_DESC= Default AccelMethod (if not specified in xorg.conf) +SNA_DESC= SandyBridge's New Acceleration +UXA_DESC= Unified Acceleration Architecture + +CONFIGURE_ARGS+= --disable-udev + +SNA_CONFIGURE_ON= --with-default-accel=sna +UXA_CONFIGURE_ON= --with-default-accel=uxa .include Index: head/x11-drivers/xf86-video-intel/distinfo =================================================================== --- head/x11-drivers/xf86-video-intel/distinfo (revision 435511) +++ head/x11-drivers/xf86-video-intel/distinfo (revision 435512) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484505738 -SHA256 (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 34d00a1c85f33c55a58bc072b59633d84e48776c771cec5e4d313664c3f56f7c -SIZE (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 1236389 +TIMESTAMP = 1488408514 +SHA256 (xorg/driver/xf86-video-intel-78d7a09b0343829c81257024b164b0b3764392ac.tar.bz2) = 00efe1ccff175de207ce46be7d73c249b8ba8ab3ee90284ad7f60a645dbee362 +SIZE (xorg/driver/xf86-video-intel-78d7a09b0343829c81257024b164b0b3764392ac.tar.bz2) = 1236509 Index: 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 (revision 435511) +++ head/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c (nonexistent) @@ -1,12 +0,0 @@ ---- 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 /* for getline() */ -+ - #include "sna.h" - - #include Property changes on: head/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:eolstyle ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-drivers/xf86-video-intel/files/patch-i915kms =================================================================== --- head/x11-drivers/xf86-video-intel/files/patch-i915kms (revision 435511) +++ head/x11-drivers/xf86-video-intel/files/patch-i915kms (nonexistent) @@ -1,10 +0,0 @@ ---- 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 @@ - } - - static const char *kernel_module_names[] ={ -+ "i915kms", - "i915", - NULL, - }; Property changes on: head/x11-drivers/xf86-video-intel/files/patch-i915kms ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c =================================================================== --- head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c (revision 435511) +++ head/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c (revision 435512) @@ -1,12 +1,20 @@ ---- 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 +--- src/intel_device.c.orig 2017-02-28 20:52:19 UTC ++++ src/intel_device.c @@ -28,6 +28,9 @@ #include "config.h" #endif +#define _WITH_GETLINE /* to expose getline() in stdio.h on FreeBSD */ +#include /* for getline() */ + #include #include #include +@@ -204,6 +207,7 @@ static inline struct intel_device *intel + } + + static const char *kernel_module_names[] ={ ++ "i915kms", + "i915", + NULL, + }; Index: head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h =================================================================== --- head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h (revision 435511) +++ head/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h (revision 435512) @@ -1,36 +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 @@ +--- src/intel_list.h.orig 2017-02-28 20:52:19 UTC ++++ src/intel_list.h +@@ -305,8 +305,6 @@ list_is_empty(const struct list *head) #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 @@ +@@ -325,12 +323,12 @@ list_is_empty(const struct list *head) * */ #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 @@ +@@ -342,7 +340,7 @@ list_is_empty(const struct list *head) * 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)) Index: head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c =================================================================== --- head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (revision 435511) +++ head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (revision 435512) @@ -1,12 +1,12 @@ ---- 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 +--- src/sna/kgem.c.orig 2017-02-28 20:52:19 UTC ++++ src/sna/kgem.c @@ -29,6 +29,9 @@ #include "config.h" #endif - + +#define _WITH_GETLINE /* to expose getline() in stdio.h on FreeBSD */ +#include /* for getline() */ + #include "sna.h" #include "sna_reg.h" - + Index: 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 (nonexistent) +++ head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c (revision 435512) @@ -0,0 +1,12 @@ +--- src/sna/sna_threads.c.orig 2017-02-28 20:52:19 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 /* for getline() */ ++ + #include "sna.h" + + #include Property changes on: head/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:eolstyle ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-video-intel/pkg-descr =================================================================== --- head/x11-drivers/xf86-video-intel/pkg-descr (revision 435511) +++ head/x11-drivers/xf86-video-intel/pkg-descr (revision 435512) @@ -1,10 +1,16 @@ -Driver for Intel(R) Integrated Graphics Chipsets: - i810, i810-dc100, i810e, i815, i830M, 845G, 854, 852GM/855GM, 865G, - 915G, E7221 (i915), 915GM, 945G, 945GM, 945GME, Pineview GM, - Pineview G, 965G, G35, 965Q, 946GZ, 965GM, 965GME/GLE, G33, Q35, Q33, - GM45, 4 Series, G45/G43, Q45/Q43, G41, B43 -Driver for Intel(R) HD Graphics: 2000-5000 -Driver for Intel(R) Iris(TM) Graphics: 5100 -Driver for Intel(R) Iris(TM) Pro Graphics: 5200 +The xf86-video-intel module is an open-source 2D graphics driver for +the X Window System as implemented by X.org. It supports a variety of +Intel graphics chipsets including: -WWW: http://www.intellinuxgraphics.com/ + i810/i810e/i810-dc100,i815, + i830M,845G,852GM,855GM,865G, + 915G/GM,945G/GM/GME,946GZ + G/GM/GME/Q965, + G/Q33,G/Q35,G41,G/Q43,G/GM/Q45 + PineView-M (Atom N400 series) + PineView-D (Atom D400/D500 series) + Intel(R) HD Graphics, + Intel(R) Iris(TM) Graphics, + Intel(R) Iris(TM) Pro Graphics. + +WWW: https://01.org/linuxgraphics/