[Midnightbsd-cvs] mports [23983] trunk/x11-drivers/xf86-video-intel: update intel driver
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 28 08:50:58 EDT 2018
Revision: 23983
http://svnweb.midnightbsd.org/mports/?rev=23983
Author: laffer1
Date: 2018-08-28 08:50:57 -0400 (Tue, 28 Aug 2018)
Log Message:
-----------
update intel driver
Modified Paths:
--------------
trunk/x11-drivers/xf86-video-intel/Makefile
trunk/x11-drivers/xf86-video-intel/distinfo
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
trunk/x11-drivers/xf86-video-intel/pkg-descr
Added Paths:
-----------
trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
Modified: trunk/x11-drivers/xf86-video-intel/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-intel/Makefile 2018-08-28 12:50:00 UTC (rev 23982)
+++ trunk/x11-drivers/xf86-video-intel/Makefile 2018-08-28 12:50:57 UTC (rev 23983)
@@ -1,45 +1,45 @@
# $MidnightBSD$
PORTNAME= xf86-video-intel
-PORTVERSION= 2.21.15
-PORTREVISION= 8
+PORTVERSION= 2.99.917.20180512
CATEGORIES= x11-drivers
+MASTER_SITES= http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/
+DISTNAME= ${PORTNAME}-${COMMIT_ID}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Driver for Intel integrated graphics chipsets
+
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS= libxcb-util.so:x11/xcb-util \
+ libdrm.so:graphics/libdrm
+COMMIT_ID= 359477215092ac1b602ad1e2f17a28963d9224c2
+
+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
+OPTIONS_SINGLE= ACCEL
+OPTIONS_SINGLE_ACCEL= SNA UXA
+OPTIONS_DEFAULT= UXA
-.include <bsd.mport.options.mk>
+ACCEL_DESC= Default AccelMethod (if not specified in xorg.conf)
+SNA_DESC= SandyBridge's New Acceleration
+UXA_DESC= Unified Acceleration Architecture
-.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
-RUN_DEPENDS+= drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+CONFIGURE_ARGS+= --disable-udev
-post-patch:
- @${REINPLACE_CMD} -e 's|"i915kms"|"i915kms_port"|g' \
- ${WRKSRC}/src/intel_device.c
-.endif
+SNA_CONFIGURE_ON= --with-default-accel=sna
+UXA_CONFIGURE_ON= --with-default-accel=uxa
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-video-intel/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-intel/distinfo 2018-08-28 12:50:00 UTC (rev 23982)
+++ trunk/x11-drivers/xf86-video-intel/distinfo 2018-08-28 12:50:57 UTC (rev 23983)
@@ -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 = 1526115670
+SHA256 (xorg/driver/xf86-video-intel-359477215092ac1b602ad1e2f17a28963d9224c2.tar.bz2) = 38af5add513e4fa48042b2ff10b59e9a05398f3d4cf36c763b98f45077f8e232
+SIZE (xorg/driver/xf86-video-intel-359477215092ac1b602ad1e2f17a28963d9224c2.tar.bz2) = 1242076
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c 2018-08-28 12:50:57 UTC (rev 23983)
@@ -0,0 +1,20 @@
+--- 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 <stdio.h> /* for getline() */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+@@ -204,6 +207,7 @@ static inline struct intel_device *intel
+ }
+
+ static const char *kernel_module_names[] ={
++ "i915kms",
+ "i915",
+ NULL,
+ };
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
___________________________________________________________________
Added: svn:eol-style
## -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
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h 2018-08-28 12:50:57 UTC (rev 23983)
@@ -0,0 +1,36 @@
+--- 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 @@ 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 @@ 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))
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
___________________________________________________________________
Added: svn:eol-style
## -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
Modified: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c 2018-08-28 12:50:00 UTC (rev 23982)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c 2018-08-28 12:50:57 UTC (rev 23983)
@@ -1,87 +1,12 @@
---- src/sna/kgem.c.orig 2013-08-20 20:26:26 UTC
+--- src/sna/kgem.c.orig 2017-02-28 20:52:19 UTC
+++ src/sna/kgem.c
-@@ -25,6 +25,7 @@
- *
- */
-
-+#define _WITH_GETLINE
- #ifdef HAVE_CONFIG_H
+@@ -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));
++#define _WITH_GETLINE /* to expose getline() in stdio.h on FreeBSD */
++#include <stdio.h> /* for getline() */
++
+ #include "sna.h"
+ #include "sna_reg.h"
-@@ -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;
-
- list_for_each_entry(bo, buffers, request) {
- if (!bo->gpu_dirty)
-@@ -5613,7 +5619,7 @@ struct kgem_bo *kgem_create_buffer(struc
- uint32_t size, uint32_t flags,
- void **ret)
- {
-- struct kgem_buffer *bo;
-+ struct kgem_buffer *bo = NULL;
- unsigned offset, alloc;
- struct kgem_bo *old;
-
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c 2018-08-28 12:50:57 UTC (rev 23983)
@@ -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 <stdio.h> /* for getline() */
++
+ #include "sna.h"
+
+ #include <unistd.h>
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
___________________________________________________________________
Added: svn:eol-style
## -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
Modified: trunk/x11-drivers/xf86-video-intel/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-video-intel/pkg-descr 2018-08-28 12:50:00 UTC (rev 23982)
+++ trunk/x11-drivers/xf86-video-intel/pkg-descr 2018-08-28 12:50:57 UTC (rev 23983)
@@ -1,3 +1,16 @@
-Driver for Intel integrated graphics chipsets. It supports the i810,
-i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
-945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
+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:
+
+ 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/
More information about the Midnightbsd-cvs
mailing list