From ddf6677fe76a46b05d3cb89fa6b4b9152fc52502 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 22 Sep 2012 15:49:30 +0200 Subject: xdriver_x86-driver-intel: bump version Signed-off-by: Peter Korsgaard --- ...ver_xf86-video-intel-2.10.0-cross-compile.patch | 11 ---------- ...iver_xf86-video-intel-2.9.1-cross-compile.patch | 25 ---------------------- .../xdriver_xf86-video-intel-cross-compile.patch | 11 ++++++++++ .../xdriver_xf86-video-intel.mk | 2 +- 4 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch (limited to 'package/x11r7/xdriver_xf86-video-intel') diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch deleted file mode 100644 index 0b020ac5c..000000000 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac.orig 2010-01-04 22:20:07.000000000 +0000 -+++ b/configure.ac 2010-02-19 12:12:50.000000000 +0000 -@@ -103,7 +103,7 @@ - CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" - CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" - AC_MSG_CHECKING([whether to include DRI support]) --if test x$DRI != xno; then -+if test "$cross_compiling" = "no" -a test x$DRI != xno; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch deleted file mode 100644 index 76a33eb1d..000000000 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- xdriver_xf86-video-intel-2.9.1/configure.ac.orig 2010-01-28 11:18:27.526329157 +0200 -+++ xdriver_xf86-video-intel-2.9.1/configure.ac 2010-01-28 11:21:38.065198735 +0200 -@@ -114,6 +114,7 @@ save_CFLAGS="$CFLAGS" - CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" - CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $drm_cflags" - AC_MSG_CHECKING([whether to include DRI support]) -+if test "$cross_compiling" = "no" ; then - if test x$DRI != xno; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -@@ -132,6 +133,14 @@ if test x$DRI = xauto; then - DRI="no" - fi - fi -+else -+if test x$DRI != xno; then -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ DRI="yes" -+fi -+fi - AC_MSG_RESULT([$DRI]) - CFLAGS="$save_CFLAGS $DEBUGFLAGS" - diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch new file mode 100644 index 000000000..0b020ac5c --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch @@ -0,0 +1,11 @@ +--- a/configure.ac.orig 2010-01-04 22:20:07.000000000 +0000 ++++ b/configure.ac 2010-02-19 12:12:50.000000000 +0000 +@@ -103,7 +103,7 @@ + CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" + CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" + AC_MSG_CHECKING([whether to include DRI support]) +-if test x$DRI != xno; then ++if test "$cross_compiling" = "no" -a test x$DRI != xno; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h], diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index acffd668c..b5bdf1a3c 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.10.0 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.13.0 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES -- cgit v1.2.3