[Midnightbsd-cvs] mports [19190] trunk/x11-drivers: update video
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 29 08:21:15 EDT 2015
Revision: 19190
http://svnweb.midnightbsd.org/mports/?rev=19190
Author: laffer1
Date: 2015-05-29 08:21:15 -0400 (Fri, 29 May 2015)
Log Message:
-----------
update video
Modified Paths:
--------------
trunk/x11-drivers/Makefile
trunk/x11-drivers/xf86-video-intel/Makefile
trunk/x11-drivers/xf86-video-intel/pkg-plist
trunk/x11-drivers/xf86-video-mach64/Makefile
trunk/x11-drivers/xf86-video-mach64/pkg-plist
trunk/x11-drivers/xf86-video-mga/Makefile
trunk/x11-drivers/xf86-video-mga/distinfo
trunk/x11-drivers/xf86-video-mga/pkg-plist
trunk/x11-drivers/xf86-video-neomagic/Makefile
trunk/x11-drivers/xf86-video-neomagic/pkg-plist
trunk/x11-drivers/xf86-video-nv/Makefile
trunk/x11-drivers/xf86-video-nv/pkg-plist
trunk/x11-drivers/xf86-video-openchrome/Makefile
trunk/x11-drivers/xf86-video-openchrome/pkg-plist
trunk/x11-drivers/xf86-video-r128/Makefile
trunk/x11-drivers/xf86-video-r128/pkg-plist
trunk/x11-drivers/xf86-video-rendition/Makefile
trunk/x11-drivers/xf86-video-rendition/pkg-plist
trunk/x11-drivers/xf86-video-s3/Makefile
trunk/x11-drivers/xf86-video-s3/pkg-plist
trunk/x11-drivers/xf86-video-savage/Makefile
trunk/x11-drivers/xorg-drivers/Makefile
Added Paths:
-----------
trunk/x11-drivers/xf86-video-intel/files/patch-clang
trunk/x11-drivers/xf86-video-intel/files/patch-i915kms
trunk/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c
trunk/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_threads.c
trunk/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_compat-api.h
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c
trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c
trunk/x11-drivers/xf86-video-rendition/files/
trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
trunk/x11-drivers/xf86-video-s3/files/
trunk/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c
Removed Paths:
-------------
trunk/x11-drivers/xf86-video-intel/files/extra-i915kms
trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
trunk/x11-drivers/xf86-video-newport/
Modified: trunk/x11-drivers/Makefile
===================================================================
--- trunk/x11-drivers/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -27,7 +27,6 @@
SUBDIR += xf86-video-mach64
SUBDIR += xf86-video-mga
SUBDIR += xf86-video-neomagic
-SUBDIR += xf86-video-newport
SUBDIR += xf86-video-nv
SUBDIR += xf86-video-openchrome
SUBDIR += xf86-video-r128
Modified: trunk/x11-drivers/xf86-video-intel/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-intel/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= xf86-video-intel
-PORTVERSION= ${INTEL_VERSION}
-PORTREVISION= ${INTEL_REVISION}
+PORTVERSION= 2.21.15
+PORTREVISION= 8
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -9,6 +9,8 @@
COMMENT= Driver for Intel integrated graphics chipsets
LICENSE= mit
+LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
+
USE_GL= gl
USE_LDCONFIG= yes
@@ -22,48 +24,22 @@
xrender \
xvmc
-.include <bsd.mport.options.mk>
+USES+= cpe
+CPE_VENDOR= x
-.if defined(WITH_NEW_XORG)
-INTEL_VERSION= 2.21.15
-INTEL_REVISION= 1
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
-MAKE_JOBS_UNSAFE=yes
-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= 6
-PLIST_SUB+= OLD=""
+CONFIGURE_ARGS+= --disable-glamor
+INSTALL_TARGET= install-strip
-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
+.include <bsd.port.options.mk>
+
+.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
+RUN_DEPENDS+= drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|"i915kms"|"i915kms_port"|g' \
+ ${WRKSRC}/src/intel_device.c
.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
-
.include <bsd.port.mk>
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-i915kms
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-i915kms 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-i915kms 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,11 +0,0 @@
---- src/intel_driver.c.orig 2012-05-17 16:13:46.000000000 +0200
-+++ src/intel_driver.c 2012-05-17 16:14:46.000000000 +0200
-@@ -334,7 +334,7 @@
- snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
- dev->domain, dev->bus, dev->dev, dev->func);
-
-- intel->drmSubFD = drmOpen("i915", busid);
-+ intel->drmSubFD = drmOpen("i915kms", busid);
- if (intel->drmSubFD == -1) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- "[drm] Failed to open DRM device for %s: %s\n",
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7017_ch7017.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,17 +0,0 @@
---- src/ch7017/ch7017.c.orig 2009-04-08 18:59:47.000000000 -0500
-+++ src/ch7017/ch7017.c 2010-02-21 12:40:12.000000000 -0600
-@@ -34,13 +34,11 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
-
- #include "../i2c_vid.h"
- #include "ch7017_reg.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ch7xxx_ch7xxx.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,17 +0,0 @@
---- src/ch7xxx/ch7xxx.c.orig 2010-02-21 12:42:11.000000000 -0600
-+++ src/ch7xxx/ch7xxx.c 2010-02-21 12:44:40.000000000 -0600
-@@ -34,13 +34,11 @@
- #include <string.h>
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
-
- #include "../i2c_vid.h"
- #include "ch7xxx.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_driver.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,111 +0,0 @@
---- src/i810_driver.c.orig 2010-02-21 12:55:16.000000000 -0600
-+++ src/i810_driver.c 2010-02-21 13:17:04.000000000 -0600
-@@ -69,8 +69,6 @@
- */
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
-@@ -490,20 +488,6 @@
- );
-
- /*
-- * Tell the loader about symbols from other modules that this module
-- * might refer to.
-- */
-- LoaderRefSymLists(I810vgahwSymbols,
-- I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
--#ifdef XF86DRI
-- I810drmSymbols,
-- I810driSymbols,
--#endif
-- I810shadowFBSymbols,
-- I810vbeSymbols, vbeOptionalSymbols,
-- I810ddcSymbols, NULL);
--
-- /*
- * The return value must be non-NULL on success even though there
- * is no TearDownProc.
- */
-@@ -809,7 +793,6 @@
- }
-
- if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
-- xf86LoaderReqSymLists(I810vbeSymbols, NULL);
- MonInfo = vbeDoEDID(pVbe, NULL);
- xf86PrintEDID(MonInfo);
- xf86SetDDCproperties(pScrn, MonInfo);
-@@ -864,8 +847,6 @@
- if (!xf86LoadSubModule(pScrn, "vgahw"))
- return FALSE;
-
-- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
--
- /* Allocate a vgaHWRec */
- if (!vgaHWGetHWRec(pScrn))
- return FALSE;
-@@ -878,10 +859,6 @@
- pI810->PciInfo->func);
- #endif
-
-- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
-- return FALSE;
-- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
--
- /* Set pScrn->monitor */
- pScrn->monitor = pScrn->confScreen->monitor;
-
-@@ -960,7 +937,6 @@
- I810FreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
- }
-
- #ifdef XF86DRI
-@@ -1244,14 +1220,12 @@
- I810FreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(I810fbSymbols, NULL);
-
- if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
- if (!xf86LoadSubModule(pScrn, "ramdac")) {
- I810FreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
- }
-
- if (xf86GetOptValInteger
-@@ -1278,9 +1252,6 @@
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Couldn't load shadowfb module:\n");
- }
-- else {
-- xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
-- }
- }
-
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
-@@ -1312,16 +1283,12 @@
- #ifdef XF86DRI
- /* Load the dri module if requested. */
- if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
-- if (xf86LoadSubModule(pScrn, "dri")) {
-- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
-- }
-+ xf86LoadSubModule(pScrn, "dri");
- }
- #endif
-
- /* We won't be using the VGA access after the probe */
- I810SetMMIOAccess(pI810);
-- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
-
- return TRUE;
- }
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_hwmc.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,10 +0,0 @@
---- src/i810_hwmc.c.orig 2010-02-21 13:40:44.000000000 -0600
-+++ src/i810_hwmc.c 2010-02-21 13:41:16.000000000 -0600
-@@ -42,7 +42,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i810_video.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,10 +0,0 @@
---- src/i810_video.c.orig 2010-02-21 13:17:58.000000000 -0600
-+++ src/i810_video.c 2010-02-21 13:18:37.000000000 -0600
-@@ -42,7 +42,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dri.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,14 +0,0 @@
---- src/i830_dri.c.orig 2010-02-21 13:30:37.000000000 -0600
-+++ src/i830_dri.c 2010-02-21 13:39:02.000000000 -0600
-@@ -1731,9 +1731,10 @@
- info.driverName = IS_I965G(pI830) ? "i965" : "i915";
- info.deviceName = p;
- info.version = 1;
--
-+#if 0
- info.CreateBuffers = I830DRI2CreateBuffers;
- info.DestroyBuffers = I830DRI2DestroyBuffers;
-+#endif
- info.CopyRegion = I830DRI2CopyRegion;
-
- pI830->drmSubFD = info.fd;
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_driver.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,97 +0,0 @@
---- src/i830_driver.c.orig 2010-02-21 13:20:12.000000000 -0600
-+++ src/i830_driver.c 2010-02-21 13:26:14.000000000 -0600
-@@ -175,8 +175,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86Priv.h"
- #include "xf86cmap.h"
- #include "compiler.h"
-@@ -1050,7 +1048,6 @@
- if (!xf86LoadSubModule(pScrn, "ddc")) {
- pI830->ddc2 = FALSE;
- } else {
-- xf86LoaderReqSymLists(I810ddcSymbols, NULL);
- pI830->ddc2 = TRUE;
- }
-
-@@ -1058,8 +1055,6 @@
- /* Load I2C if we have the code to use it */
- if (pI830->ddc2) {
- if (xf86LoadSubModule(pScrn, "i2c")) {
-- xf86LoaderReqSymLists(I810i2cSymbols, NULL);
--
- pI830->ddc2 = TRUE;
- } else {
- pI830->ddc2 = FALSE;
-@@ -1511,11 +1506,9 @@
- /* The vgahw module should be loaded here when needed */
- if (!xf86LoadSubModule(pScrn, "vgahw"))
- return FALSE;
-- xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
-
- if (!xf86LoadSubModule(pScrn, "ramdac"))
- return FALSE;
-- xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
-
- return TRUE;
- }
-@@ -1854,12 +1847,6 @@
- pI830->PciInfo->func);
- #endif
-
-- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
-- PreInitCleanup(pScrn);
-- return FALSE;
-- }
--
-- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
- pScrn->monitor = pScrn->confScreen->monitor;
- pScrn->progClock = TRUE;
- pScrn->rgbBits = 8;
-@@ -1942,8 +1929,6 @@
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(I810fbSymbols, NULL);
--
- switch (pI830->accel) {
- #ifdef I830_USE_XAA
- case ACCEL_XAA:
-@@ -1951,7 +1936,6 @@
- PreInitCleanup(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(I810xaaSymbols, NULL);
- break;
- #endif
-
-@@ -1973,7 +1957,6 @@
- PreInitCleanup(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(I830exaSymbols, NULL);
- break;
- }
- #endif
-@@ -1988,17 +1971,13 @@
-
- /* We won't be using the VGA access after the probe. */
- I830SetMMIOAccess(pI830);
-- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
-- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
- }
-
- #if defined(XF86DRI)
- /* Load the dri module if requested. */
- if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
- pI830->directRenderingType != DRI_DISABLED) {
-- if (xf86LoadSubModule(pScrn, "dri")) {
-- xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
-- }
-+ xf86LoadSubModule(pScrn, "dri");
- }
- #endif
-
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_dvo.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,80 +0,0 @@
---- src/i830_dvo.c.orig 2010-05-03 11:09:54.000000000 -0500
-+++ src/i830_dvo.c 2010-05-03 11:13:31.000000000 -0500
-@@ -38,28 +38,6 @@
- #include "ch7xxx/ch7xxx.h"
- #include "tfp410/tfp410.h"
-
--static const char *SIL164Symbols[] = {
-- "Sil164VidOutput",
-- NULL
--};
--static const char *TFP410Symbols[] = {
-- "Tfp410VidOutput",
-- NULL
--};
--static const char *CH7xxxSymbols[] = {
-- "CH7xxxVidOutput",
-- NULL
--};
--static const char *ivch_symbols[] = {
-- "ivch_methods",
-- NULL
--};
--
--static const char *ch7017_symbols[] = {
-- "ch7017_methods",
-- NULL
--};
--
- /* driver list */
- struct _I830DVODriver i830_dvo_drivers[] =
- {
-@@ -69,7 +47,6 @@
- .fntablename = "SIL164VidOutput",
- .dvo_reg = DVOC,
- .address = (SIL164_ADDR_1<<1),
-- .symbols = SIL164Symbols
- },
- {
- .type = I830_OUTPUT_DVO_TMDS,
-@@ -77,7 +54,6 @@
- .fntablename = "CH7xxxVidOutput",
- .dvo_reg = DVOC,
- .address = (CH7xxx_ADDR_1<<1),
-- .symbols = CH7xxxSymbols
- },
- {
- .type = I830_OUTPUT_DVO_LVDS,
-@@ -85,7 +61,6 @@
- .fntablename = "ivch_methods",
- .dvo_reg = DVOA,
- .address = 0x04, /* Might also be 0x44, 0x84, 0xc4 */
-- .symbols = ivch_symbols
- },
- {
- .type = I830_OUTPUT_DVO_TMDS,
-@@ -93,7 +68,6 @@
- .fntablename = "TFP410VidOutput",
- .dvo_reg = DVOC,
- .address = (TFP410_ADDR_1<<1),
-- .symbols = TFP410Symbols
- },
- {
- .type = I830_OUTPUT_DVO_LVDS,
-@@ -101,7 +75,6 @@
- .fntablename = "ch7017_methods",
- .dvo_reg = DVOC,
- .address = 0xea,
-- .symbols = ch7017_symbols,
- .gpio = GPIOE,
- }
- };
-@@ -447,8 +420,6 @@
- if (drv->modhandle == NULL)
- continue;
-
-- xf86LoaderReqSymLists(drv->symbols, NULL);
--
- ret_ptr = NULL;
- drv->vid_rec = LoaderSymbol(drv->fntablename);
-
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_i2c.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,11 +0,0 @@
---- src/i830_i2c.c.orig 2010-02-21 13:27:07.000000000 -0600
-+++ src/i830_i2c.c 2010-02-21 13:27:45.000000000 -0600
-@@ -31,8 +31,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_render.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,78 +0,0 @@
---- src/i830_render.c.orig 2009-05-12 19:12:11.000000000 -0500
-+++ src/i830_render.c 2010-03-07 15:30:45.000000000 -0600
-@@ -210,26 +210,8 @@
- (dblend << S8_DST_BLEND_FACTOR_SHIFT);
- }
-
--static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-- int w = pPict->pDrawable->width;
-- int h = pPict->pDrawable->height;
-- int i;
--
-- if ((w > 2048) || (h > 2048))
-- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
-- for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
-- i++)
-- {
-- if (i830_tex_formats[i].fmt == pPict->format)
-- break;
-- }
-- if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
-- I830FALLBACK("Unsupported picture format 0x%x\n",
-- (int)pPict->format);
--
- if (pPict->repeatType > RepeatReflect)
- I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
-
-@@ -239,6 +221,26 @@
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
- }
-
-+ if (pPict->pDrawable)
-+ {
-+ int w, h, i;
-+
-+ w = pPict->pDrawable->width;
-+ h = pPict->pDrawable->height;
-+ if ((w > 2048) || (h > 2048))
-+ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+ for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
-+ i++)
-+ {
-+ if (i830_tex_formats[i].fmt == pPict->format)
-+ break;
-+ }
-+ if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
-+ I830FALLBACK("Unsupported picture format 0x%x\n",
-+ (int)pPict->format);
-+ }
-+
- return TRUE;
- }
-
-@@ -376,9 +378,9 @@
- "alpha and source value blending.\n");
- }
-
-- if (!i830_check_composite_texture(pSrcPicture, 0))
-+ if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
- I830FALLBACK("Check Src picture texture\n");
-- if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
-+ if (pMaskPicture != NULL && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
- I830FALLBACK("Check Mask picture texture\n");
-
- if (!i830_get_dest_format(pDstPicture, &tmp1))
-@@ -392,7 +394,7 @@
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- uint32_t dst_format, dst_pitch;
- Bool is_affine_src, is_affine_mask;
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i830_video.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,10 +0,0 @@
---- src/i830_video.c.orig 2010-02-21 13:28:37.000000000 -0600
-+++ src/i830_video.c 2010-02-21 13:29:05.000000000 -0600
-@@ -57,7 +57,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_hwmc.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,10 +0,0 @@
---- src/i915_hwmc.c.orig 2010-02-21 13:42:21.000000000 -0600
-+++ src/i915_hwmc.c 2010-02-21 13:42:38.000000000 -0600
-@@ -32,7 +32,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,69 +0,0 @@
---- src/i915_render.c.orig 2009-05-12 19:12:11.000000000 -0500
-+++ src/i915_render.c 2010-03-07 15:30:45.000000000 -0600
-@@ -167,26 +167,8 @@
- return TRUE;
- }
-
--static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-- int w = pPict->pDrawable->width;
-- int h = pPict->pDrawable->height;
-- int i;
--
-- if ((w > 2048) || (h > 2048))
-- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
-- for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-- i++)
-- {
-- if (i915_tex_formats[i].fmt == pPict->format)
-- break;
-- }
-- if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
-- I830FALLBACK("Unsupported picture format 0x%x\n",
-- (int)pPict->format);
--
- if (pPict->repeatType > RepeatReflect)
- I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
-
-@@ -194,6 +176,26 @@
- pPict->filter != PictFilterBilinear)
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
-
-+ if (pPict->pDrawable)
-+ {
-+ int w, h, i;
-+
-+ w = pPict->pDrawable->width;
-+ h = pPict->pDrawable->height;
-+ if ((w > 2048) || (h > 2048))
-+ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+ for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-+ i++)
-+ {
-+ if (i915_tex_formats[i].fmt == pPict->format)
-+ break;
-+ }
-+ if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
-+ I830FALLBACK("Unsupported picture format 0x%x\n",
-+ (int)pPict->format);
-+ }
-+
- return TRUE;
- }
-
-@@ -220,9 +222,9 @@
- "alpha and source value blending.\n");
- }
-
-- if (!i915_check_composite_texture(pSrcPicture, 0))
-+ if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
- I830FALLBACK("Check Src picture texture\n");
-- if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
-+ if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
- I830FALLBACK("Check Mask picture texture\n");
-
- if (!i915_get_dest_format(pDstPicture, &tmp1))
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_i965_render.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,78 +0,0 @@
---- src/i965_render.c.orig 2009-05-12 19:12:11.000000000 -0500
-+++ src/i965_render.c 2010-03-07 15:30:45.000000000 -0600
-@@ -181,26 +181,8 @@
- return TRUE;
- }
-
--static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
-- int w = pPict->pDrawable->width;
-- int h = pPict->pDrawable->height;
-- int i;
--
-- if ((w > 8192) || (h > 8192))
-- I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
-- for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-- i++)
-- {
-- if (i965_tex_formats[i].fmt == pPict->format)
-- break;
-- }
-- if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
-- I830FALLBACK("Unsupported picture format 0x%x\n",
-- (int)pPict->format);
--
- if (pPict->repeatType > RepeatReflect)
- I830FALLBACK("extended repeat (%d) not supported\n",
- pPict->repeatType);
-@@ -211,6 +193,26 @@
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
- }
-
-+ if (pPict->pDrawable)
-+ {
-+ int w, h, i;
-+
-+ w = pPict->pDrawable->width;
-+ h = pPict->pDrawable->height;
-+ if ((w > 8192) || (h > 8192))
-+ I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+ for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-+ i++)
-+ {
-+ if (i965_tex_formats[i].fmt == pPict->format)
-+ break;
-+ }
-+ if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
-+ I830FALLBACK("Unsupported picture format 0x%x\n",
-+ (int)pPict->format);
-+ }
-+
- return TRUE;
- }
-
-@@ -239,9 +241,9 @@
- }
- }
-
-- if (!i965_check_composite_texture(pSrcPicture, 0))
-+ if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
- I830FALLBACK("Check Src picture texture\n");
-- if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
-+ if (pMaskPicture != NULL && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
- I830FALLBACK("Check Mask picture texture\n");
-
- if (!i965_get_dest_format(pDstPicture, &tmp1))
-@@ -1258,7 +1260,7 @@
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state= pI830->gen4_render_state;
- gen4_composite_op *composite_op = &render_state->composite_op;
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_ivch_ivch.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,17 +0,0 @@
---- src/ivch/ivch.c.orig 2010-02-21 12:47:05.000000000 -0600
-+++ src/ivch/ivch.c 2010-02-21 12:48:09.000000000 -0600
-@@ -31,13 +31,11 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsproto.h>
- #include <unistd.h>
-
- #include "../i2c_vid.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_sil164_sil164.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,17 +0,0 @@
---- src/sil164/sil164.c.orig 2010-02-21 12:49:54.000000000 -0600
-+++ src/sil164/sil164.c 2010-02-21 12:50:40.000000000 -0600
-@@ -35,13 +35,11 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsproto.h>
-
- #include "../i2c_vid.h"
- #include "sil164.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-src_tfp410_tfp410.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,17 +0,0 @@
---- src/tfp410/tfp410.c.orig 2010-02-21 12:52:35.000000000 -0600
-+++ src/tfp410/tfp410.c 2010-02-21 12:53:19.000000000 -0600
-@@ -34,13 +34,11 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
-
- #include "../i2c_vid.h"
- #include "tfp410.h"
Deleted: trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,32 +0,0 @@
---- uxa/uxa-priv.h.orig 2009-05-12 19:12:11.000000000 -0500
-+++ uxa/uxa-priv.h 2010-02-21 12:27:32.000000000 -0600
-@@ -42,8 +42,7 @@
- #define NEED_EVENTS
- #include <X11/Xproto.h>
- #ifdef MITSHM
--#define _XSHM_SERVER_
--#include <X11/extensions/shmstr.h>
-+#include <X11/extensions/shmproto.h>
- #endif
- #include "scrnintstr.h"
- #include "pixmapstr.h"
-@@ -319,17 +318,11 @@
- extern const GCOps uxa_ops;
-
- #ifdef MITSHM
--extern ShmFuncs uxa_shm_funcs;
--
- /* XXX these come from shmint.h, which isn't exported by the server */
--void
--ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
-
--void
--ShmSetPixmapFormat(ScreenPtr pScreen, int format);
-+#include "shmint.h"
-
--void
--fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-+extern ShmFuncs uxa_shm_funcs;
-
- #endif
-
Added: trunk/x11-drivers/xf86-video-intel/files/patch-clang
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-clang (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-clang 2015-05-29 12:21:15 UTC (rev 19190)
@@ -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)) {
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-clang
___________________________________________________________________
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-i915kms
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-i915kms (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-i915kms 2015-05-29 12:21:15 UTC (rev 19190)
@@ -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;
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-i915kms
___________________________________________________________________
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__sna__sna_accel.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,81 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src__sna__sna_accel.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__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 2015-05-29 12:21:15 UTC (rev 19190)
@@ -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)
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
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -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;
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-src__uxa__intel_driver.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_compat-api.h
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_compat-api.h (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_compat-api.h 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,43 @@
+--- 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 <mi.h>
++#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: trunk/x11-drivers/xf86-video-intel/files/patch-src_compat-api.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
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,28 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_fb_fbpict.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_sna_kgem.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,87 @@
+--- 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
+ #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;
+
Property changes on: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.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_sna_sna__composite.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,43 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__composite.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_sna_sna__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,10 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__driver.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_sna_sna__trapezoids.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,111 @@
+From 48a33fc379b17eed195875222ad773c911d9dff1 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+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" <jstpierre at mecheye.net>
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+
+
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__trapezoids.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_sna_sna__video.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,82 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.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_sna_sna__video.h
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.h 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,10 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video.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
Added: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,101 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__overlay.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_sna_sna__video__sprite.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,114 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__sprite.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_sna_sna__video__textured.c
===================================================================
--- trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c (rev 0)
+++ trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,105 @@
+--- 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: trunk/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__video__textured.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-plist
===================================================================
--- trunk/x11-drivers/xf86-video-intel/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-intel/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,21 +1,8 @@
-lib/libI810XvMC.la
lib/libI810XvMC.so
lib/libI810XvMC.so.1
-lib/libIntelXvMC.la
+lib/libI810XvMC.so.1.0.0
lib/libIntelXvMC.so.1
lib/libIntelXvMC.so
-%%OLD%%lib/xorg/modules/drivers/ch7017.la
-%%OLD%%lib/xorg/modules/drivers/ch7017.so
-%%OLD%%lib/xorg/modules/drivers/ch7xxx.la
-%%OLD%%lib/xorg/modules/drivers/ch7xxx.so
-lib/xorg/modules/drivers/intel_drv.la
+lib/libIntelXvMC.so.1.0.0
lib/xorg/modules/drivers/intel_drv.so
-%%OLD%%lib/xorg/modules/drivers/ivch.la
-%%OLD%%lib/xorg/modules/drivers/ivch.so
-%%OLD%%lib/xorg/modules/drivers/sil164.la
-%%OLD%%lib/xorg/modules/drivers/sil164.so
-%%OLD%%lib/xorg/modules/drivers/tfp410.la
-%%OLD%%lib/xorg/modules/drivers/tfp410.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/intel.4x.gz
Modified: trunk/x11-drivers/xf86-video-mach64/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-mach64/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-mach64/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11-drivers/xf86-video-mach64/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-mach64/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-mach64/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1 @@
-lib/xorg/modules/drivers/mach64_drv.la
lib/xorg/modules/drivers/mach64_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
Modified: trunk/x11-drivers/xf86-video-mga/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-mga/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-mga/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= xf86-video-mga
-PORTVERSION= 1.6.3
+PORTVERSION= 1.6.4
PORTEPOCH= 3
CATEGORIES= x11-drivers
@@ -14,6 +14,5 @@
XORG_CAT= driver
USE_XORG= xf86driproto videoproto xextproto glproto
-MAN4= mga.4x
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-video-mga/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-mga/distinfo 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-mga/distinfo 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.6.3.tar.bz2) = 7704b1ea35098769787a9c93e903b827be97a99facfb1696aa5236a58ff1c7d7
-SIZE (xorg/driver/xf86-video-mga-1.6.3.tar.bz2) = 454763
+SHA256 (xorg/driver/xf86-video-mga-1.6.4.tar.bz2) = 48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f
+SIZE (xorg/driver/xf86-video-mga-1.6.4.tar.bz2) = 475858
Modified: trunk/x11-drivers/xf86-video-mga/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-mga/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-mga/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1,2 @@
-lib/xorg/modules/drivers/mga_drv.la
lib/xorg/modules/drivers/mga_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/mga.4x.gz
Modified: trunk/x11-drivers/xf86-video-neomagic/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-neomagic/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-neomagic/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -11,6 +12,5 @@
XORG_CAT= driver
USE_XORG= videoproto xextproto xf86dgaproto
-MAN4= neomagic.4x
.include <bsd.port.mk>
Modified: trunk/x11-drivers/xf86-video-neomagic/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-neomagic/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-neomagic/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1,2 @@
-lib/xorg/modules/drivers/neomagic_drv.la
lib/xorg/modules/drivers/neomagic_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/neomagic.4x.gz
Modified: trunk/x11-drivers/xf86-video-nv/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-nv/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-nv/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11-drivers/xf86-video-nv/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-nv/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-nv/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1,2 @@
lib/xorg/modules/drivers/nv_drv.so
man/man4/nv.4x.gz
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
Modified: trunk/x11-drivers/xf86-video-openchrome/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-openchrome/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-openchrome/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -13,7 +14,6 @@
XORG_CAT= driver
USE_XORG= videoproto xf86driproto xextproto xvmc glproto
-MAN4= openchrome.4x
MAKE_ARGS+= drivermandir=${LOCALBASE}/man/man4
Modified: trunk/x11-drivers/xf86-video-openchrome/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-openchrome/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-openchrome/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,11 +1,8 @@
-lib/libchromeXvMC.la
lib/libchromeXvMC.so
lib/libchromeXvMC.so.1
-lib/libchromeXvMCPro.la
+lib/libchromeXvMC.so.1.0.0
lib/libchromeXvMCPro.so
lib/libchromeXvMCPro.so.1
-lib/xorg/modules/drivers/openchrome_drv.la
+lib/libchromeXvMCPro.so.1.0.0
lib/xorg/modules/drivers/openchrome_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/openchrome.4x.gz
Modified: trunk/x11-drivers/xf86-video-r128/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-r128/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-r128/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11-drivers/xf86-video-r128/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-r128/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-r128/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1,2 @@
lib/xorg/modules/drivers/r128_drv.so
man/man4/r128.4x.gz
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
Modified: trunk/x11-drivers/xf86-video-rendition/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-rendition/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -11,6 +12,5 @@
XORG_CAT= driver
USE_XORG= xextproto
-MAN4= rendition.4x
.include <bsd.port.mk>
Added: trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c (rev 0)
+++ trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,10 @@
+--- src/rendition.c.orig 2012-07-17 05:32:12 UTC
++++ src/rendition.c
+@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC
+ fbPictureInit (pScreen, 0, 0);
+
+ xf86SetBlackWhitePixels(pScreen);
+- miInitializeBackingStore(pScreen);
+
+ /*********************************************************/
+ /* The actual setup of the driver-specific code */
Property changes on: trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.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-rendition/files/patch-src_rendition.h
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h (rev 0)
+++ trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.h 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,12 @@
+--- src/rendition.h.orig 2012-07-16 02:42:28 UTC
++++ src/rendition.h
+@@ -28,9 +28,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+
Property changes on: trunk/x11-drivers/xf86-video-rendition/files/patch-src_rendition.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-rendition/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-rendition/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-rendition/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,7 +1,4 @@
-lib/xorg/modules/drivers/rendition_drv.la
lib/xorg/modules/drivers/rendition_drv.so
lib/xorg/modules/v10002d.uc
lib/xorg/modules/v20002d.uc
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/rendition.4x.gz
Modified: trunk/x11-drivers/xf86-video-s3/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-s3/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-s3/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xf86-video-s3
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
@@ -11,6 +12,5 @@
XORG_CAT= driver
USE_XORG= videoproto xextproto
-MAN4= s3.4x
.include <bsd.port.mk>
Added: trunk/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c (rev 0)
+++ trunk/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.c 2015-05-29 12:21:15 UTC (rev 19190)
@@ -0,0 +1,18 @@
+--- src/s3_driver.c.orig 2012-07-17 04:50:05 UTC
++++ src/s3_driver.c
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"
+@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARG
+ fbPictureInit (pScreen, 0, 0);
+ S3DGAInit(pScreen);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ /* framebuffer manager setup */
Property changes on: trunk/x11-drivers/xf86-video-s3/files/patch-src_s3__driver.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-s3/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-s3/pkg-plist 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-s3/pkg-plist 2015-05-29 12:21:15 UTC (rev 19190)
@@ -1,5 +1,2 @@
-lib/xorg/modules/drivers/s3_drv.la
lib/xorg/modules/drivers/s3_drv.so
- at dirrmtry lib/xorg/modules/drivers
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg
+man/man4/s3.4x.gz
Modified: trunk/x11-drivers/xf86-video-savage/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-savage/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xf86-video-savage/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-savage
PORTVERSION= 2.3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
Modified: trunk/x11-drivers/xorg-drivers/Makefile
===================================================================
--- trunk/x11-drivers/xorg-drivers/Makefile 2015-05-29 12:19:07 UTC (rev 19189)
+++ trunk/x11-drivers/xorg-drivers/Makefile 2015-05-29 12:21:15 UTC (rev 19190)
@@ -2,6 +2,7 @@
PORTNAME= xorg-drivers
PORTVERSION= 7.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -47,7 +48,6 @@
i740 \
mga \
neomagic \
- newport \
rendition \
s3 \
s3virge \
@@ -55,7 +55,6 @@
siliconmotion \
sis \
tdfx \
- tga \
trident \
tseng \
vmware \
More information about the Midnightbsd-cvs
mailing list