From 1ff39ba7171eac38c39ec3ceb434b8a82b4a1177 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 11 Mar 2017 19:22:28 -0800 Subject: x11-drivers/xf86-video-intel: Drop old versions --- .../xf86-video-intel-2.99.917-config-header.patch | 27 --------- ...eo-intel-2.99.917-libdrm-kernel-4_0-crash.patch | 65 ---------------------- .../xf86-video-intel-2.99.917-sna-udev-fstat.patch | 57 ------------------- .../xf86-video-intel-2.99.917-uxa-udev-fstat.patch | 27 --------- 4 files changed, 176 deletions(-) delete mode 100644 x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch delete mode 100644 x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch delete mode 100644 x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch delete mode 100644 x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch (limited to 'x11-drivers/xf86-video-intel/files') diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch deleted file mode 100644 index cf4e7307d28c..000000000000 --- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-config-header.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/575970 -https://lists.freedesktop.org/archives/intel-gfx/2016-December/113685.html - -From 7cb250a3ce966dc0c96d167669922b0667160d1e Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Wed, 13 Apr 2016 21:35:37 -0400 -Subject: [PATCH] tools/backlight_helper: #include "config.h" - ---- - tools/backlight_helper.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tools/backlight_helper.c b/tools/backlight_helper.c -index a00f0d6bd8a2..aadb8fac92ba 100644 ---- a/tools/backlight_helper.c -+++ b/tools/backlight_helper.c -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - #include - #include --- -2.11.0.rc2 - diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch deleted file mode 100644 index ea3aa30ed13c..000000000000 --- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Thu, 19 Mar 2015 23:14:17 +0000 -Subject: sna: Protect against ABI breakage in recent versions of libdrm - -Signed-off-by: Chris Wilson - -diff --git a/src/sna/kgem.c b/src/sna/kgem.c -index 11f0828..6f16cba 100644 ---- a/src/sna/kgem.c -+++ b/src/sna/kgem.c -@@ -182,6 +182,15 @@ struct local_i915_gem_caching { - #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching) - #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching) - -+struct local_i915_gem_mmap { -+ uint32_t handle; -+ uint32_t pad; -+ uint64_t offset; -+ uint64_t size; -+ uint64_t addr_ptr; -+}; -+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap) -+ - struct local_i915_gem_mmap2 { - uint32_t handle; - uint32_t pad; -@@ -514,15 +523,15 @@ retry_wc: - - static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo) - { -- struct drm_i915_gem_mmap mmap_arg; -+ struct local_i915_gem_mmap arg; - int err; - - retry: -- VG_CLEAR(mmap_arg); -- mmap_arg.handle = bo->handle; -- mmap_arg.offset = 0; -- mmap_arg.size = bytes(bo); -- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) { -+ VG_CLEAR(arg); -+ arg.handle = bo->handle; -+ arg.offset = 0; -+ arg.size = bytes(bo); -+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) { - assert(err != EINVAL); - - if (__kgem_throttle_retire(kgem, 0)) -@@ -536,10 +545,10 @@ retry: - return NULL; - } - -- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo))); -+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo))); - - DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle)); -- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr; -+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr; - } - - static int gem_write(int fd, uint32_t handle, --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch deleted file mode 100644 index 7e276ac872fd..000000000000 --- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 24 Feb 2015 15:25:40 +0000 -Subject: sna: udev integration depends on fstat and sys/stat.h - -src/sna/sna_driver.c: In function 'sna_handle_uevents': -src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] - -Also take the opportunity to include udev support in the configure -summary. - -Signed-off-by: Chris Wilson - -diff --git a/configure.ac b/configure.ac -index 7476e2b..de3a4b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev, - - if test "x$UDEV" != "xno"; then - PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"]) -+ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"]) - if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then - AC_MSG_ERROR([udev support requested but not found (libudev)]) - fi - if test "x$udev" = "xyes"; then - AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) -+ udev_msg=" yes" -+ else -+ udev_msg=" no" - fi - fi - -@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS" - echo " Support for legacy User Mode Setting (for i810)? $UMS" - echo " Support for Direct Rendering Infrastructure:$dri_msg" - echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" -+echo " Support for display hotplug notifications (udev):$udev_msg" - echo " Build additional tools and utilities?$tools_msg" - if test -n "$xp_msg"; then - echo " Experimental support:$xp_msg" -diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c -index 8c0d0b5..bc20ef0 100644 ---- a/src/sna/sna_driver.c -+++ b/src/sna/sna_driver.c -@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL) - } - - #if HAVE_UDEV -+#include -+ - static void - sna_handle_uevents(int fd, void *closure) - { --- -cgit v0.10.2 - diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch deleted file mode 100644 index 66793568d4e5..000000000000 --- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 369ceec0e4910ba2c37736a59c55c0d6c26433bf Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Tue, 24 Feb 2015 15:25:40 +0000 -Subject: uxa: udev integration depends on fstat and sys/stat.h - -src/uxa/intel_driver.c: In function 'I830HandleUEvents': -src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known -src/uxa/intel_driver.c:746:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] - -Signed-off-by: Chris Wilson - -diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c -index c554124..6e64b8c 100644 ---- a/src/uxa/intel_driver.c -+++ b/src/uxa/intel_driver.c -@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list, - } - - #if HAVE_UDEV -+#include -+ - static void - I830HandleUEvents(int fd, void *closure) - { --- -cgit v0.10.2 - -- cgit v1.2.3-65-gdbad