summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-07-02 20:36:07 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-07-02 20:36:07 +0800
commit6bfe1efdef1b509234f1114c5ec22c7c1f297ed1 (patch)
tree3079f65ab40ee38e529ed7e06b223b24b985a56d
parenta80b480d17fbacd15870192261f9a95592da86f7 (diff)
downloadxorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar.gz
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar.bz2
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar.lz
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar.xz
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.tar.zst
xorg-devel-ports-6bfe1efdef1b509234f1114c5ec22c7c1f297ed1.zip
Update to 2.21.11
With help from: kwm git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1002 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--x11-drivers/xf86-video-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-intel/distinfo4
-rw-r--r--x11-drivers/xf86-video-intel/files/extra-i915kms24
3 files changed, 15 insertions, 15 deletions
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index c29e710..7becdb8 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -28,7 +28,7 @@ MAN4= intel.4x
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
-INTEL_VERSION= 2.21.10
+INTEL_VERSION= 2.21.11
INTEL_REVISION= 0
CONFIGURE_ARGS+= --enable-sna
MAKE_JOBS_UNSAFE=yes
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index 76fbf4f..5b01a25 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,4 +1,4 @@
SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.21.10.tar.bz2) = 7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6
-SIZE (xorg/driver/xf86-video-intel-2.21.10.tar.bz2) = 1905905
+SHA256 (xorg/driver/xf86-video-intel-2.21.11.tar.bz2) = 523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22
+SIZE (xorg/driver/xf86-video-intel-2.21.11.tar.bz2) = 1916261
diff --git a/x11-drivers/xf86-video-intel/files/extra-i915kms b/x11-drivers/xf86-video-intel/files/extra-i915kms
index c900909..b5d43c6 100644
--- a/x11-drivers/xf86-video-intel/files/extra-i915kms
+++ b/x11-drivers/xf86-video-intel/files/extra-i915kms
@@ -1,13 +1,13 @@
---- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300
-+++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200
-@@ -393,8 +393,8 @@
- dev->domain, dev->bus, dev->dev, dev->func);
+--- 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 FALSE;
+ ret = drmCheckModesettingSupported(id);
+- if (ret) {
+- if (xf86LoadKernelModule("i915"))
++ if (ret || 1) {
++ if (xf86LoadKernelModule("i915kms"))
+ ret = drmCheckModesettingSupported(id);
+ if (ret)
+ return -1;