svn commit: r371625 - in head/x11-drivers/xf86-video-intel: . files
Koop Mast
kwm at FreeBSD.org
Tue Oct 28 11:02:47 UTC 2014
Author: kwm
Date: Tue Oct 28 11:02:44 2014
New Revision: 371625
URL: https://svnweb.freebsd.org/changeset/ports/371625
QAT: https://qat.redports.org/buildarchive/r371625/
Log:
Remove UMS DDX support (xf86-video-intel 2.7.1).
Use INSTALL_TARGET=install-strip for stripping.
Rename patches to patch-.
Add two patches to fix crashing the 1.14 xserver.
Added:
head/x11-drivers/xf86-video-intel/files/patch-clang
- copied unchanged from r371606, head/x11-drivers/xf86-video-intel/files/extra-clang
head/x11-drivers/xf86-video-intel/files/patch-i915kms
- copied unchanged from r371606, head/x11-drivers/xf86-video-intel/files/extra-i915kms
head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c (contents, props changed)
head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c
- copied unchanged from r371606, head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
head/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c (contents, props changed)
head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
- copied unchanged from r371606, head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
Deleted:
head/x11-drivers/xf86-video-intel/files/extra-clang
head/x11-drivers/xf86-video-intel/files/extra-i915kms
head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c
head/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
head/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
head/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
head/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
head/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
head/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
head/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
head/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
head/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
head/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
head/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c
head/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
head/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
Modified:
head/x11-drivers/xf86-video-intel/Makefile
head/x11-drivers/xf86-video-intel/pkg-plist
Modified: head/x11-drivers/xf86-video-intel/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-intel/Makefile Tue Oct 28 07:04:00 2014 (r371624)
+++ head/x11-drivers/xf86-video-intel/Makefile Tue Oct 28 11:02:44 2014 (r371625)
@@ -2,13 +2,15 @@
# $FreeBSD$
PORTNAME= xf86-video-intel
-PORTVERSION= ${INTEL_VERSION}
-PORTREVISION= ${INTEL_REVISION}
+PORTVERSION= 2.21.15
+PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11 at FreeBSD.org
COMMENT= Driver for Intel integrated graphics chipsets
+LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
+
ONLY_FOR_ARCHS= amd64 i386
USE_GL= gl
@@ -23,48 +25,9 @@ USE_XORG= glproto \
xrender \
xvmc
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-INTEL_VERSION= 2.21.15
-INTEL_REVISION= 4
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
CONFIGURE_ARGS+= --disable-glamor
-PLIST_SUB+= OLD="@comment "
-EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \
- ${PATCHDIR}/extra-src_sna_kgem.c \
- ${PATCHDIR}/extra-clang \
- ${PATCHDIR}/extra-i915kms
-LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util
-.else
-INTEL_VERSION= 2.7.1
-INTEL_REVISION= 9
-PLIST_SUB+= OLD=""
-
-EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
- ${PATCHDIR}/extra-src_i830_render.c \
- ${PATCHDIR}/extra-src_ch7xxx_ch7xxx.c \
- ${PATCHDIR}/extra-src_i830_video.c \
- ${PATCHDIR}/extra-src_i810_driver.c \
- ${PATCHDIR}/extra-src_i915_hwmc.c \
- ${PATCHDIR}/extra-src_i810_hwmc.c \
- ${PATCHDIR}/extra-src_i915_render.c \
- ${PATCHDIR}/extra-src_i810_video.c \
- ${PATCHDIR}/extra-src_i965_render.c \
- ${PATCHDIR}/extra-src_i830_dri.c \
- ${PATCHDIR}/extra-src_ivch_ivch.c \
- ${PATCHDIR}/extra-src_i830_driver.c \
- ${PATCHDIR}/extra-src_sil164_sil164.c \
- ${PATCHDIR}/extra-src_i830_dvo.c \
- ${PATCHDIR}/extra-src_tfp410_tfp410.c \
- ${PATCHDIR}/extra-src_i830_i2c.c \
- ${PATCHDIR}/extra-uxa_uxa-priv.h
-.endif
-
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
+INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Copied: head/x11-drivers/xf86-video-intel/files/patch-clang (from r371606, head/x11-drivers/xf86-video-intel/files/extra-clang)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-clang Tue Oct 28 11:02:44 2014 (r371625, copy of r371606, head/x11-drivers/xf86-video-intel/files/extra-clang)
@@ -0,0 +1,63 @@
+--- 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)) {
Copied: head/x11-drivers/xf86-video-intel/files/patch-i915kms (from r371606, head/x11-drivers/xf86-video-intel/files/extra-i915kms)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-i915kms Tue Oct 28 11:02:44 2014 (r371625, copy of r371606, head/x11-drivers/xf86-video-intel/files/extra-i915kms)
@@ -0,0 +1,13 @@
+--- 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);
+
+ ret = drmCheckModesettingSupported(id);
+- if (ret) {
+- if (xf86LoadKernelModule("i915"))
++ if (ret || 1) {
++ if (xf86LoadKernelModule("i915kms"))
+ ret = drmCheckModesettingSupported(id);
+ if (ret)
+ return -1;
Added: head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c Tue Oct 28 11:02:44 2014 (r371625)
@@ -0,0 +1,29 @@
+--- src/sna/sna_accel.c.orig 2014-10-28 00:26:56.720761613 +0100
++++ src/sna/sna_accel.c 2014-10-28 00:28:12.783756153 +0100
+@@ -14830,7 +14830,7 @@
+ {
+ #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 +14987,7 @@
+ {
+ #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 +15216,7 @@
+ {
+ #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);
Copied: head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c (from r371606, head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c Tue Oct 28 11:02:44 2014 (r371625, copy of r371606, head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c)
@@ -0,0 +1,14 @@
+--- 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)
Added: head/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c Tue Oct 28 11:02:44 2014 (r371625)
@@ -0,0 +1,11 @@
+--- 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;
Copied: head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (from r371606, head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c Tue Oct 28 11:02:44 2014 (r371625, copy of r371606, head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c)
@@ -0,0 +1,87 @@
+--- src/sna/kgem.c.orig 2013-08-04 11:10:59.000000000 +0200
++++ src/sna/kgem.c 2013-08-14 11:59:14.787060294 +0200
+@@ -25,6 +25,7 @@
+ *
+ */
+
++#define _WITH_GETLINE
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+@@ -1890,7 +1891,8 @@
+ 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));
+
+@@ -2104,7 +2106,8 @@
+
+ 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) {
+@@ -2309,7 +2312,8 @@
+ 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);
+@@ -2390,7 +2394,8 @@
+
+ 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",
+@@ -3252,7 +3257,8 @@
+ 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;
+
+@@ -3855,7 +3861,7 @@
+ 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;
+@@ -5302,7 +5308,7 @@
+ 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)
+@@ -5578,7 +5584,7 @@
+ uint32_t size, uint32_t flags,
+ void **ret)
+ {
+- struct kgem_buffer *bo;
++ struct kgem_buffer *bo = NULL;
+ unsigned offset, alloc;
+ struct kgem_bo *old;
+
Modified: head/x11-drivers/xf86-video-intel/pkg-plist
==============================================================================
--- head/x11-drivers/xf86-video-intel/pkg-plist Tue Oct 28 07:04:00 2014 (r371624)
+++ head/x11-drivers/xf86-video-intel/pkg-plist Tue Oct 28 11:02:44 2014 (r371625)
@@ -4,13 +4,5 @@ lib/libI810XvMC.so.1.0.0
lib/libIntelXvMC.so.1
lib/libIntelXvMC.so
lib/libIntelXvMC.so.1.0.0
-%%OLD%%lib/xorg/modules/drivers/ch7017.so
-%%OLD%%lib/xorg/modules/drivers/ch7xxx.so
lib/xorg/modules/drivers/intel_drv.so
-%%OLD%%lib/xorg/modules/drivers/ivch.so
-%%OLD%%lib/xorg/modules/drivers/sil164.so
-%%OLD%%lib/xorg/modules/drivers/tfp410.so
man/man4/intel.4x.gz
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
More information about the svn-ports-head
mailing list