From c67d2a250274d97a44c058f2014dafc3321303b1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 4 Jun 2015 16:15:04 +0200 Subject: [PATCH] xf86-video-intel: update to xf86-video-intel-7d30cce Signed-off-by: Stephan Raue --- .../x11/driver/xf86-video-intel/package.mk | 3 +- .../patches/xf86-video-intel-buildfix.patch | 84 ------------------- 2 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-buildfix.patch diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 68dcbd9da3..f04b6efdbe 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -17,12 +17,13 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.99.917" +PKG_VERSION="7d30cce" PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain libXcomposite util-macros fontsproto systemd xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" diff --git a/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-buildfix.patch b/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-buildfix.patch deleted file mode 100644 index a3d62a68b5..0000000000 --- a/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-buildfix.patch +++ /dev/null @@ -1,84 +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 - -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 -