Index: x11-drivers/xf86-video-intel/Makefile =================================================================== --- x11-drivers/xf86-video-intel/Makefile (revision 427425) +++ x11-drivers/xf86-video-intel/Makefile (working copy) @@ -2,15 +2,20 @@ # $FreeBSD$ PORTNAME= xf86-video-intel -PORTVERSION= 2.21.15 -PORTREVISION= 9 +PORTVERSION= 2.99.917.20161118 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 \ + libpciaccess.so:devel/libpciaccess \ + libdrm.so:graphics/libdrm +COMMIT_ID= bde946054efbc1c7ae1483b84c3b4fa3c2c7e2ec + ONLY_FOR_ARCHS= amd64 i386 USE_GL= gl @@ -19,18 +24,19 @@ USE_XORG= glproto \ pixman \ x11 \ + xcb \ xext \ xf86driproto \ xineramaproto \ xrender \ + presentproto \ + 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 +CONFIGURE_ARGS+= --disable-dri3 INSTALL_TARGET= install-strip .include Index: x11-drivers/xf86-video-intel/distinfo =================================================================== --- x11-drivers/xf86-video-intel/distinfo (revision 427425) +++ x11-drivers/xf86-video-intel/distinfo (working copy) @@ -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 = 1480353885 +SHA256 (xorg/driver/xf86-video-intel-bde946054efbc1c7ae1483b84c3b4fa3c2c7e2ec.tar.bz2) = 61ed3a34db76a13ab8af3d5af89a6e40dcb56762e48e00e1070efa80c5d67968 +SIZE (xorg/driver/xf86-video-intel-bde946054efbc1c7ae1483b84c3b4fa3c2c7e2ec.tar.bz2) = 1236393 Index: x11-drivers/xf86-video-intel/files/patch-clang =================================================================== --- x11-drivers/xf86-video-intel/files/patch-clang (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-clang (nonexistent) @@ -1,63 +0,0 @@ ---- src/sna/sna_cpu.c.orig 2013-08-14 12:04:40.231041285 +0200 -+++ src/sna/sna_cpu.c 2013-08-14 12:05:51.237030719 +0200 -@@ -41,6 +41,7 @@ - { - unsigned max = __get_cpuid_max(BASIC_CPUID, NULL); - unsigned int eax, ebx, ecx, edx; -+ eax = ebx = ecx = edx = 0; - unsigned features = 0; - unsigned extra = 0; - ---- src/sna/sna_damage.c.orig 2013-08-14 12:06:26.381036854 +0200 -+++ src/sna/sna_damage.c 2013-08-14 12:07:23.684023065 +0200 -@@ -410,7 +410,7 @@ - int n, nboxes; - BoxPtr boxes, free_boxes = NULL; - pixman_region16_t *region = &damage->region; -- struct sna_damage_box *iter; -+ struct sna_damage_box *iter = NULL; - - assert(damage->mode != DAMAGE_ALL); - assert(damage->dirty); -@@ -1709,7 +1709,7 @@ - { - int n, nboxes; - BoxPtr boxes; -- struct sna_damage_box *iter; -+ struct sna_damage_box *iter = NULL; - - RegionCopy(r, &damage->region); - if (!damage->dirty) ---- src/uxa/intel_batchbuffer.c.orig 2013-08-14 12:08:14.323028320 +0200 -+++ src/uxa/intel_batchbuffer.c 2013-08-14 12:08:37.202016923 +0200 -@@ -141,7 +141,7 @@ - static void intel_batch_do_flush(ScrnInfoPtr scrn) - { - intel_screen_private *intel = intel_get_screen_private(scrn); -- struct intel_pixmap *priv; -+ struct intel_pixmap *priv = NULL; - - list_for_each_entry(priv, &intel->batch_pixmaps, batch) - priv->dirty = 0; ---- src/uxa/intel_display.c.orig 2013-08-14 12:09:25.802015629 +0200 -+++ src/uxa/intel_display.c 2013-08-14 12:09:51.034009844 +0200 -@@ -1753,7 +1753,7 @@ - static drmModeEncoderPtr - intel_get_kencoder(struct intel_mode *mode, int num) - { -- struct intel_output *iterator; -+ struct intel_output *iterator = NULL; - int id = mode->mode_res->encoders[num]; - - list_for_each_entry(iterator, &mode->outputs, link) ---- src/uxa/uxa-accel.c.orig 2013-08-14 12:02:11.898048975 +0200 -+++ src/uxa/uxa-accel.c 2013-08-14 12:03:39.336042139 +0200 -@@ -944,7 +944,7 @@ - - if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - int ok = 0; -- RegionPtr region; -+ RegionPtr region = NULL; - - if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) { - if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) { Property changes on: x11-drivers/xf86-video-intel/files/patch-clang ___________________________________________________________________ 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: x11-drivers/xf86-video-intel/files/patch-i915kms =================================================================== --- x11-drivers/xf86-video-intel/files/patch-i915kms (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-i915kms (working copy) @@ -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, + }; Index: x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c (nonexistent) @@ -1,81 +0,0 @@ ---- src/sna/sna_accel.c.orig 2013-08-20 20:26:26 UTC -+++ src/sna/sna_accel.c -@@ -3797,6 +3797,7 @@ static bool must_check sna_gc_move_to_cp - sgc->priv = gc->pCompositeClip; - gc->pCompositeClip = region; - -+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0) - if (gc->clientClipType == CT_PIXMAP) { - PixmapPtr clip = gc->clientClip; - gc->clientClip = region_from_bitmap(gc->pScreen, clip); -@@ -3804,7 +3805,9 @@ static bool must_check sna_gc_move_to_cp - gc->clientClipType = gc->clientClip ? CT_REGION : CT_NONE; - changes |= GCClipMask; - } else -+#else - changes &= ~GCClipMask; -+#endif - - if (changes || drawable->serialNumber != sgc->serial) { - gc->serialNumber = sgc->serial; -@@ -5562,6 +5565,15 @@ static inline bool box_equal(const BoxRe - return *(const uint64_t *)a == *(const uint64_t *)b; - } - -+static inline bool has_clip(GCPtr gc) -+{ -+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0) -+ return gc->clientClipType != CT_NONE; -+#else -+ return gc->clientClip != NULL; -+#endif -+} -+ - static RegionPtr - sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc, - int sx, int sy, -@@ -5628,7 +5640,7 @@ sna_do_copy(DrawablePtr src, DrawablePtr - - /* Compute source clip region */ - if (src->type == DRAWABLE_PIXMAP) { -- if (src == dst && gc->clientClipType == CT_NONE) { -+ if (src == dst && !has_clip(gc)) { - DBG(("%s: pixmap -- using gc clip\n", __FUNCTION__)); - clip = gc->pCompositeClip; - } else { -@@ -14391,7 +14403,7 @@ sna_validate_gc(GCPtr gc, unsigned long - - if (changes & (GCClipMask|GCSubwindowMode) || - drawable->serialNumber != (gc->serialNumber & DRAWABLE_SERIAL_BITS) || -- (gc->clientClipType != CT_NONE && (changes & (GCClipXOrigin | GCClipYOrigin)))) -+ (has_clip(gc) && (changes & (GCClipXOrigin | GCClipYOrigin)))) - miComputeCompositeClip(gc, drawable); - - sna_gc(gc)->changes |= changes; -@@ -14830,7 +14842,7 @@ static bool has_offload_slaves(struct sn - { - #if HAS_PIXMAP_SHARING - ScreenPtr screen = sna->scrn->pScreen; -- PixmapDirtyUpdatePtr dirty; -+ PixmapDirtyUpdatePtr dirty = NULL; - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { - assert(dirty->src == sna->front); -@@ -14987,7 +14999,7 @@ static void sna_accel_post_damage(struct - { - #if HAS_PIXMAP_SHARING - ScreenPtr screen = sna->scrn->pScreen; -- PixmapDirtyUpdatePtr dirty; -+ PixmapDirtyUpdatePtr dirty = NULL; - bool flush = false; - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { -@@ -15216,7 +15228,7 @@ migrate_dirty_tracking(PixmapPtr old_fro - { - #if HAS_PIXMAP_SHARING - ScreenPtr screen = old_front->drawable.pScreen; -- PixmapDirtyUpdatePtr dirty, safe; -+ PixmapDirtyUpdatePtr dirty = NULL, safe; - - xorg_list_for_each_entry_safe(dirty, safe, &screen->pixmap_dirty_list, ent) { - assert(dirty->src == old_front); Property changes on: x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.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:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c (nonexistent) @@ -1,14 +0,0 @@ ---- 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) Property changes on: 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: x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/uxa/intel_driver.c.orig 2014-10-28 00:30:09.015749289 +0100 -+++ src/uxa/intel_driver.c 2014-10-28 00:30:26.834767496 +0100 -@@ -723,7 +723,7 @@ - intel_dirty_update(ScreenPtr screen) - { - RegionPtr region; -- PixmapDirtyUpdatePtr ent; -+ PixmapDirtyUpdatePtr ent = NULL; - - if (xorg_list_is_empty(&screen->pixmap_dirty_list)) - return; Property changes on: x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.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:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_compat-api.h =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_compat-api.h (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_compat-api.h (nonexistent) @@ -1,43 +0,0 @@ ---- src/compat-api.h.orig 2013-05-21 10:15:11 UTC -+++ src/compat-api.h -@@ -158,4 +158,40 @@ static inline void FreePixmap(PixmapPtr - if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) - #endif - -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) -+#define DamageUnregister(d, dd) DamageUnregister(dd) -+#endif -+ -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,16,99,1,0) -+ -+#define XORG_XV_VERSION 2 -+#define ddStopVideo_ARGS XvPortPtr port, DrawablePtr draw -+#define ddSetPortAttribute_ARGS XvPortPtr port, Atom attribute, INT32 value -+#define ddGetPortAttribute_ARGS XvPortPtr port, Atom attribute, INT32 *value -+#define ddQueryBestSize_ARGS XvPortPtr port, CARD8 motion, CARD16 vid_w, CARD16 vid_h, CARD16 drw_w, CARD16 drw_h, unsigned int *p_w, unsigned int *p_h -+#define ddPutImage_ARGS DrawablePtr draw, XvPortPtr port, GCPtr gc, INT16 src_x, INT16 src_y, CARD16 src_w, CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h, XvImagePtr format, unsigned char *buf, Bool sync, CARD16 width, CARD16 height -+#define ddQueryImageAttributes_ARGS XvPortPtr port, XvImagePtr format, unsigned short *w, unsigned short *h, int *pitches, int *offsets -+ -+#else -+ -+#define XORG_XV_VERSION 1 -+#define ddStopVideo_ARGS ClientPtr client, XvPortPtr port, DrawablePtr draw -+#define ddSetPortAttribute_ARGS ClientPtr client, XvPortPtr port, Atom attribute, INT32 value -+#define ddGetPortAttribute_ARGS ClientPtr client, XvPortPtr port, Atom attribute, INT32 *value -+#define ddQueryBestSize_ARGS ClientPtr client, XvPortPtr port, CARD8 motion, CARD16 vid_w, CARD16 vid_h, CARD16 drw_w, CARD16 drw_h, unsigned int *p_w, unsigned int *p_h -+#define ddPutImage_ARGS ClientPtr client, DrawablePtr draw, XvPortPtr port, GCPtr gc, INT16 src_x, INT16 src_y, CARD16 src_w, CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h, XvImagePtr format, unsigned char *buf, Bool sync, CARD16 width, CARD16 height -+#define ddQueryImageAttributes_ARGS ClientPtr client, XvPortPtr port, XvImagePtr format, unsigned short *w, unsigned short *h, int *pitches, int *offsets -+ -+#endif -+ -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,16,99,1,0) -+#include -+#define miHandleExposures(pSrcDrawable, pDstDrawable, \ -+ pGC, srcx, srcy, width, height, \ -+ dstx, dsty, plane) \ -+ miHandleExposures(pSrcDrawable, pDstDrawable, \ -+ pGC, srcx, srcy, width, height, \ -+ dstx, dsty) -+#endif -+ - #endif Property changes on: x11-drivers/xf86-video-intel/files/patch-src_compat-api.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_intel__device.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_intel__device.c (nonexistent) +++ x11-drivers/xf86-video-intel/files/patch-src_intel__device.c (working copy) @@ -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 /* for getline() */ ++ + #include + #include + #include Index: x11-drivers/xf86-video-intel/files/patch-src_intel__list.h =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_intel__list.h (nonexistent) +++ x11-drivers/xf86-video-intel/files/patch-src_intel__list.h (working copy) @@ -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)) Index: x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c (nonexistent) +++ x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c (working copy) @@ -0,0 +1,12 @@ +--- 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: 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: x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c (nonexistent) @@ -1,28 +0,0 @@ ---- src/sna/fb/fbpict.c.orig 2013-03-27 11:58:09 UTC -+++ src/sna/fb/fbpict.c -@@ -156,6 +156,16 @@ create_conical_gradient_image(PictGradie - gradient->nstops); - } - -+static inline bool -+picture_has_clip(PicturePtr p) -+{ -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,16,99,1,0) -+ return p->clientClip; -+#else -+ return p->clientClipType != CT_NONE; -+#endif -+} -+ - static pixman_image_t * - create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) - { -@@ -180,7 +190,7 @@ create_bits_picture(PicturePtr pict, Boo - * only set the clip region for pictures with drawables - */ - if (has_clip) { -- if (pict->clientClipType != CT_NONE) -+ if (picture_has_clip(pict)) - pixman_image_set_has_client_clip(image, TRUE); - - if (*xoff || *yoff) Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (working copy) @@ -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; - - 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; - + ++#define _WITH_GETLINE /* to expose getline() in stdio.h on FreeBSD */ ++#include /* for getline() */ ++ + #include "sna.h" + #include "sna_reg.h" + Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c (nonexistent) @@ -1,43 +0,0 @@ ---- src/sna/sna_composite.c.orig 2013-08-14 11:59:36 UTC -+++ src/sna/sna_composite.c -@@ -122,11 +122,21 @@ clip_to_dst(pixman_region16_t *region, - } - - static inline bool -+picture_has_clip(PicturePtr p) -+{ -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,16,99,1,0) -+ return p->clientClip; -+#else -+ return p->clientClipType != CT_NONE; -+#endif -+} -+ -+static inline bool - clip_to_src(RegionPtr region, PicturePtr p, int dx, int dy) - { - bool result; - -- if (p->clientClipType == CT_NONE) -+ if (!picture_has_clip(p)) - return true; - - pixman_region_translate(p->clientClip, -@@ -220,7 +230,7 @@ sna_compute_composite_region(RegionPtr r - __FUNCTION__, - src->pDrawable ? src->pDrawable->width : 0, - src->pDrawable ? src->pDrawable->height : 0, -- src->clientClipType, -+ picture_has_clip(src), - region->extents.x1, region->extents.y1, - region->extents.x2, region->extents.y2)); - -@@ -287,7 +297,7 @@ trim_extents(BoxPtr extents, const Pictu - static void - _trim_source_extents(BoxPtr extents, const PicturePtr p, int dx, int dy) - { -- if (p->clientClipType != CT_NONE) -+ if (picture_has_clip(p)) - trim_extents(extents, p, dx, dy); - } - Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/sna/sna_driver.c.orig 2015-03-05 09:44:44 UTC -+++ src/sna/sna_driver.c -@@ -769,6 +769,7 @@ static Bool sna_late_close_screen(CLOSE_ - DBG(("%s\n", __FUNCTION__)); - - sna_accel_close(sna); -+ sna_video_close(sna); - - depths = screen->allowedDepths; - for (d = 0; d < screen->numDepths; d++) Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c (nonexistent) @@ -1,111 +0,0 @@ -From 48a33fc379b17eed195875222ad773c911d9dff1 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 2 Sep 2014 19:08:36 +0100 -Subject: sna/trapezoids: Use the corrected trapezoid origin for aligned boxes - -The rule for the origin of the CompositeTrapezoids routine is the -upper-left corner of the first trapezoid. Care must be taken in case the -trapezoid edge is upside down to consider the upper vertex. - -Reported-by: "Jasper St. Pierre" -Signed-off-by: Chris Wilson - - ---- src/sna/sna_trapezoids.c.orig 2013-08-20 22:26:26.000000000 +0200 -+++ src/sna/sna_trapezoids.c 2015-04-12 16:40:02.382938000 +0200 -@@ -2690,13 +2690,16 @@ - BoxRec stack_boxes[64], *boxes; - pixman_region16_t region, clip; - struct sna_composite_op tmp; -+ int16_t dst_x, dst_y; - bool ret = true; - int dx, dy, n, num_boxes; - - if (NO_ALIGNED_BOXES) - return false; - -- DBG(("%s\n", __FUNCTION__)); -+ DBG(("%s: pixmap=%ld, nboxes=%d, dx=(%d, %d)\n", __FUNCTION__, -+ get_drawable_pixmap(dst->pDrawable)->drawable.serialNumber, -+ ntrap, dst->pDrawable->x, dst->pDrawable->y)); - - boxes = stack_boxes; - if (ntrap > (int)ARRAY_SIZE(stack_boxes)) { -@@ -2738,19 +2741,20 @@ - if (num_boxes == 0) - goto free_boxes; - -- DBG(("%s: extents (%d, %d), (%d, %d) offset of (%d, %d)\n", -+ trapezoid_origin(&traps[0].left, &dst_x, &dst_y); -+ -+ DBG(("%s: extents (%d, %d), (%d, %d) offset of (%d, %d), origin (%d, %d)\n", - __FUNCTION__, - region.extents.x1, region.extents.y1, - region.extents.x2, region.extents.y2, - region.extents.x1 - boxes[0].x1, -- region.extents.y1 - boxes[0].y1)); -- -- src_x += region.extents.x1 - boxes[0].x1; -- src_y += region.extents.y1 - boxes[0].y1; -+ region.extents.y1 - boxes[0].y1, -+ dst_x, dst_y)); - - if (!sna_compute_composite_region(&clip, - src, NULL, dst, -- src_x, src_y, -+ src_x + region.extents.x1 - dst_x - dx, -+ src_y + region.extents.y1 - dst_y - dy, - 0, 0, - region.extents.x1 - dx, region.extents.y1 - dy, - region.extents.x2 - region.extents.x1, -@@ -2760,9 +2764,18 @@ - goto done; - } - -+ DBG(("%s: clipped extents (%d, %d), (%d, %d); now offset by (%d, %d), orgin (%d, %d)\n", -+ __FUNCTION__, -+ clip.extents.x1, clip.extents.y1, -+ clip.extents.x2, clip.extents.y2, -+ clip.extents.x1 - boxes[0].x1, -+ clip.extents.y1 - boxes[0].y1, -+ dst_x, dst_y)); -+ - if (force_fallback || - !sna->render.composite(sna, op, src, NULL, dst, -- src_x, src_y, -+ src_x + clip.extents.x1 - dst_x, -+ src_y + clip.extents.y1 - dst_y, - 0, 0, - clip.extents.x1, clip.extents.y1, - clip.extents.x2 - clip.extents.x1, -@@ -2796,6 +2809,8 @@ - } - - DBG(("%s: fbComposite()\n", __FUNCTION__)); -+ src_x -= dst_x - dx; -+ src_y -= dst_y - dy; - if (maskFormat) { - pixman_region_init_rects(®ion, boxes, num_boxes); - RegionIntersect(®ion, ®ion, &clip); -@@ -2804,8 +2819,8 @@ - count = REGION_NUM_RECTS(®ion); - for (i = 0; i < count; i++) { - fbComposite(op, src, NULL, dst, -- src_x + b[i].x1 - boxes[0].x1, -- src_y + b[i].y1 - boxes[0].y1, -+ src_x + b[i].x1, -+ src_y + b[i].y1, - 0, 0, - b[i].x1, b[i].y1, - b[i].x2 - b[i].x1, b[i].y2 - b[i].y1); -@@ -2819,8 +2834,8 @@ - count = REGION_NUM_RECTS(®ion); - for (i = 0; i < count; i++) { - fbComposite(op, src, NULL, dst, -- src_x + b[i].x1 - boxes[0].x1, -- src_y + b[i].y1 - boxes[0].y1, -+ src_x + b[i].x1, -+ src_y + b[i].y1, - 0, 0, - b[i].x1, b[i].y1, - b[i].x2 - b[i].x1, b[i].y2 - b[i].y1); Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c (nonexistent) @@ -1,82 +0,0 @@ ---- src/sna/sna_video.c.orig 2015-03-05 09:45:32 UTC -+++ src/sna/sna_video.c -@@ -68,6 +68,7 @@ - #else - static inline void sna_video_xvmc_setup(struct sna *sna, ScreenPtr ptr) - { -+ DBG(("%s: XvMC not compiled in\n")); - } - #endif - -@@ -620,6 +621,7 @@ sna_xv_fixup_formats(ScreenPtr screen, X - return count; - } - -+#if XORG_XV_VERSION < 2 - static int - sna_xv_query_adaptors(ScreenPtr screen, - XvAdaptorPtr *adaptors, -@@ -636,20 +638,10 @@ static Bool - sna_xv_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - struct sna *sna = to_sna_from_screen(screen); -- int i; -- -- for (i = 0; i < sna->xv.num_adaptors; i++) { -- free(sna->xv.adaptors[i].pPorts->devPriv.ptr); -- free(sna->xv.adaptors[i].pPorts); -- free(sna->xv.adaptors[i].pEncodings); -- } -- free(sna->xv.adaptors); -- -- sna->xv.adaptors = NULL; -- sna->xv.num_adaptors = 0; -- -+ sna_video_close(sna); - return TRUE; - } -+#endif - - void sna_video_init(struct sna *sna, ScreenPtr screen) - { -@@ -671,8 +663,10 @@ void sna_video_init(struct sna *sna, Scr - return; - - xv = to_xv(screen); -+#if XORG_XV_VERSION < 2 - xv->ddCloseScreen = sna_xv_close_screen; - xv->ddQueryAdaptors = sna_xv_query_adaptors; -+#endif - - sna_video_textured_setup(sna, screen); - sna_video_sprite_setup(sna, screen); -@@ -698,7 +692,28 @@ void sna_video_destroy_window(WindowPtr - XvPortPtr port; - - port = sna_window_get_port(win); -- if (port) -+ if (port) { -+#if XORG_XV_VERSION < 2 - port->pAdaptor->ddStopVideo(NULL, port, &win->drawable); -+#else -+ port->pAdaptor->ddStopVideo(port, &win->drawable); -+#endif -+ } - assert(sna_window_get_port(win) == NULL); - } -+ -+void sna_video_close(struct sna *sna) -+{ -+ int i; -+ -+ for (i = 0; i < sna->xv.num_adaptors; i++) { -+ free(sna->xv.adaptors[i].pPorts->devPriv.ptr); -+ free(sna->xv.adaptors[i].pPorts); -+ free(sna->xv.adaptors[i].pEncodings); -+ } -+ free(sna->xv.adaptors); -+ -+ sna->xv.adaptors = NULL; -+ sna->xv.num_adaptors = 0; -+} -+ Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/sna/sna_video.h.orig 2015-03-05 09:53:01 UTC -+++ src/sna/sna_video.h -@@ -129,6 +129,7 @@ void sna_video_overlay_setup(struct sna - void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen); - void sna_video_textured_setup(struct sna *sna, ScreenPtr screen); - void sna_video_destroy_window(WindowPtr win); -+void sna_video_close(struct sna *sna); - - XvAdaptorPtr sna_xv_adaptor_alloc(struct sna *sna); - int sna_xv_fixup_formats(ScreenPtr screen, Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c (nonexistent) @@ -1,101 +0,0 @@ ---- src/sna/sna_video_overlay.c.orig 2015-03-05 09:54:32 UTC -+++ src/sna/sna_video_overlay.c -@@ -121,9 +121,7 @@ static bool sna_video_overlay_update_att - return drmIoctl(video->sna->kgem.fd, DRM_IOCTL_I915_OVERLAY_ATTRS, &attrs) == 0; - } - --static int sna_video_overlay_stop(ClientPtr client, -- XvPortPtr port, -- DrawablePtr draw) -+static int sna_video_overlay_stop(ddStopVideo_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -148,10 +146,7 @@ static int sna_video_overlay_stop(Client - } - - static int --sna_video_overlay_set_attribute(ClientPtr client, -- XvPortPtr port, -- Atom attribute, -- INT32 value) -+sna_video_overlay_set_attribute(ddSetPortAttribute_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -270,12 +265,7 @@ sna_video_overlay_get_attribute(ClientPt - } - - static int --sna_video_overlay_best_size(ClientPtr client, -- XvPortPtr port, -- CARD8 motion, -- CARD16 vid_w, CARD16 vid_h, -- CARD16 drw_w, CARD16 drw_h, -- unsigned int *p_w, unsigned int *p_h) -+sna_video_overlay_best_size(ddQueryBestSize_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -464,18 +454,7 @@ sna_video_overlay_show(struct sna *sna, - } - - static int --sna_video_overlay_put_image(ClientPtr client, -- DrawablePtr draw, -- XvPortPtr port, -- GCPtr gc, -- INT16 src_x, INT16 src_y, -- CARD16 src_w, CARD16 src_h, -- INT16 drw_x, INT16 drw_y, -- CARD16 drw_w, CARD16 drw_h, -- XvImagePtr format, -- unsigned char *buf, -- Bool sync, -- CARD16 width, CARD16 height) -+sna_video_overlay_put_image(ddPutImage_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -604,18 +583,16 @@ invisible: - /* - * If the video isn't visible on any CRTC, turn it off - */ -+#if XORG_XV_VERSION < 2 - sna_video_overlay_stop(client, port, draw); -+#else -+ sna_video_overlay_stop(port, draw); -+#endif - return Success; - } - - static int --sna_video_overlay_query(ClientPtr client, -- XvPortPtr port, -- XvImagePtr format, -- unsigned short *w, -- unsigned short *h, -- int *pitches, -- int *offsets) -+sna_video_overlay_query(ddQueryImageAttributes_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna_video_frame frame; -@@ -771,8 +748,10 @@ void sna_video_overlay_setup(struct sna - adaptor->pAttributes = (XvAttributeRec *)Attributes; - adaptor->nImages = ARRAY_SIZE(Images); - adaptor->pImages = (XvImageRec *)Images; -+#if XORG_XV_VERSION < 2 - adaptor->ddAllocatePort = sna_xv_alloc_port; - adaptor->ddFreePort = sna_xv_free_port; -+#endif - adaptor->ddPutVideo = NULL; - adaptor->ddPutStill = NULL; - adaptor->ddGetVideo = NULL; -@@ -843,4 +822,6 @@ void sna_video_overlay_setup(struct sna - } - - sna_video_overlay_update_attrs(video); -+ -+ DBG(("%s: '%s' initialized %d ports\n", __FUNCTION__, adaptor->name, adaptor->nPorts)); - } Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c (nonexistent) @@ -1,114 +0,0 @@ ---- src/sna/sna_video_sprite.c.orig 2015-03-05 10:02:08 UTC -+++ src/sna/sna_video_sprite.c -@@ -56,9 +56,7 @@ static const XvAttributeRec attribs[] = - { XvSettable | XvGettable, 0, 0xffffff, (char *)"XV_COLORKEY" }, - }; - --static int sna_video_sprite_stop(ClientPtr client, -- XvPortPtr port, -- DrawablePtr draw) -+static int sna_video_sprite_stop(ddStopVideo_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct drm_mode_set_plane s; -@@ -82,10 +80,7 @@ static int sna_video_sprite_stop(ClientP - return Success; - } - --static int sna_video_sprite_set_attr(ClientPtr client, -- XvPortPtr port, -- Atom attribute, -- INT32 value) -+static int sna_video_sprite_set_attr(ddSetPortAttribute_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - -@@ -104,10 +99,7 @@ static int sna_video_sprite_set_attr(Cli - return Success; - } - --static int sna_video_sprite_get_attr(ClientPtr client, -- XvPortPtr port, -- Atom attribute, -- INT32 *value) -+static int sna_video_sprite_get_attr(ddGetPortAttribute_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - -@@ -121,13 +113,7 @@ static int sna_video_sprite_get_attr(Cli - return Success; - } - --static int sna_video_sprite_best_size(ClientPtr client, -- XvPortPtr port, -- CARD8 motion, -- CARD16 vid_w, CARD16 vid_h, -- CARD16 drw_w, CARD16 drw_h, -- unsigned int *p_w, -- unsigned int *p_h) -+static int sna_video_sprite_best_size(ddQueryBestSize_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -310,18 +296,7 @@ sna_video_sprite_show(struct sna *sna, - return true; - } - --static int sna_video_sprite_put_image(ClientPtr client, -- DrawablePtr draw, -- XvPortPtr port, -- GCPtr gc, -- INT16 src_x, INT16 src_y, -- CARD16 src_w, CARD16 src_h, -- INT16 drw_x, INT16 drw_y, -- CARD16 drw_w, CARD16 drw_h, -- XvImagePtr format, -- unsigned char *buf, -- Bool sync, -- CARD16 width, CARD16 height) -+static int sna_video_sprite_put_image(ddPutImage_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -430,16 +405,14 @@ static int sna_video_sprite_put_image(Cl - - invisible: - /* If the video isn't visible on any CRTC, turn it off */ -+#if XORG_XV_VERSION < 2 - return sna_video_sprite_stop(client, port, draw); -+#else -+ return sna_video_sprite_stop(port, draw); -+#endif - } - --static int sna_video_sprite_query(ClientPtr client, -- XvPortPtr port, -- XvImagePtr format, -- unsigned short *w, -- unsigned short *h, -- int *pitches, -- int *offsets) -+static int sna_video_sprite_query(ddQueryImageAttributes_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna_video_frame frame; -@@ -548,8 +521,10 @@ void sna_video_sprite_setup(struct sna * - if (sna->kgem.gen == 071) - adaptor->nImages = 4; - -+#if XORG_XV_VERSION < 2 - adaptor->ddAllocatePort = sna_xv_alloc_port; - adaptor->ddFreePort = sna_xv_free_port; -+#endif - adaptor->ddPutVideo = NULL; - adaptor->ddPutStill = NULL; - adaptor->ddGetVideo = NULL; -@@ -593,6 +568,8 @@ void sna_video_sprite_setup(struct sna * - - xvColorKey = MAKE_ATOM("XV_COLORKEY"); - xvAlwaysOnTop = MAKE_ATOM("XV_ALWAYS_ON_TOP"); -+ -+ DBG(("%s: '%s' initialized %d ports\n", __FUNCTION__, adaptor->name, adaptor->nPorts)); - } - #else - void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c =================================================================== --- x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c (revision 427425) +++ x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c (nonexistent) @@ -1,105 +0,0 @@ ---- src/sna/sna_video_textured.c.orig 2015-03-05 10:08:42 UTC -+++ src/sna/sna_video_textured.c -@@ -56,9 +56,7 @@ static const XvImageRec Images[] = { - XVMC_YUV, - }; - --static int sna_video_textured_stop(ClientPtr client, -- XvPortPtr port, -- DrawablePtr draw) -+static int sna_video_textured_stop(ddStopVideo_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - -@@ -71,10 +69,7 @@ static int sna_video_textured_stop(Clien - } - - static int --sna_video_textured_set_attribute(ClientPtr client, -- XvPortPtr port, -- Atom attribute, -- INT32 value) -+sna_video_textured_set_attribute(ddSetPortAttribute_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - -@@ -100,10 +95,7 @@ sna_video_textured_set_attribute(ClientP - } - - static int --sna_video_textured_get_attribute(ClientPtr client, -- XvPortPtr port, -- Atom attribute, -- INT32 *value) -+sna_video_textured_get_attribute(ddGetPortAttribute_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - -@@ -120,13 +112,7 @@ sna_video_textured_get_attribute(ClientP - } - - static int --sna_video_textured_best_size(ClientPtr client, -- XvPortPtr port, -- CARD8 motion, -- CARD16 vid_w, CARD16 vid_h, -- CARD16 drw_w, CARD16 drw_h, -- unsigned int *p_w, -- unsigned int *p_h) -+sna_video_textured_best_size(ddQueryBestSize_ARGS) - { - if (vid_w > (drw_w << 1)) - drw_w = vid_w >> 1; -@@ -153,18 +139,7 @@ sna_video_textured_best_size(ClientPtr c - * compositing. It's a new argument to the function in the 1.1 server. - */ - static int --sna_video_textured_put_image(ClientPtr client, -- DrawablePtr draw, -- XvPortPtr port, -- GCPtr gc, -- INT16 src_x, INT16 src_y, -- CARD16 src_w, CARD16 src_h, -- INT16 drw_x, INT16 drw_y, -- CARD16 drw_w, CARD16 drw_h, -- XvImagePtr format, -- unsigned char *buf, -- Bool sync, -- CARD16 width, CARD16 height) -+sna_video_textured_put_image(ddPutImage_ARGS) - { - struct sna_video *video = port->devPriv.ptr; - struct sna *sna = video->sna; -@@ -269,13 +244,7 @@ sna_video_textured_put_image(ClientPtr c - } - - static int --sna_video_textured_query(ClientPtr client, -- XvPortPtr port, -- XvImagePtr format, -- unsigned short *w, -- unsigned short *h, -- int *pitches, -- int *offsets) -+sna_video_textured_query(ddQueryImageAttributes_ARGS) - { - int size, tmp; - -@@ -384,8 +353,10 @@ void sna_video_textured_setup(struct sna - adaptor->pAttributes = (XvAttributeRec *)Attributes; - adaptor->nImages = ARRAY_SIZE(Images); - adaptor->pImages = (XvImageRec *)Images; -+#if XORG_XV_VERSION < 2 - adaptor->ddAllocatePort = sna_xv_alloc_port; - adaptor->ddFreePort = sna_xv_free_port; -+#endif - adaptor->ddPutVideo = NULL; - adaptor->ddPutStill = NULL; - adaptor->ddGetVideo = NULL; -@@ -426,4 +397,6 @@ void sna_video_textured_setup(struct sna - xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); - xvContrast = MAKE_ATOM("XV_CONTRAST"); - xvSyncToVblank = MAKE_ATOM("XV_SYNC_TO_VBLANK"); -+ -+ DBG(("%s: '%s' initialized %d ports\n", __FUNCTION__, adaptor->name, adaptor->nPorts)); - } Property changes on: x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Index: x11-drivers/xf86-video-intel/pkg-descr =================================================================== --- x11-drivers/xf86-video-intel/pkg-descr (revision 427425) +++ x11-drivers/xf86-video-intel/pkg-descr (working copy) @@ -1,3 +1,10 @@ -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. +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 + +WWW: http://www.intellinuxgraphics.com/