From 59b0aa7a7ee327688a77dd5d01d0b2032f6535a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Mar 2009 14:59:14 +0000 Subject: x11r7: update to 7.4 Patch by Dan Lykowski , closes #181. Minor fixups for kdrive by me. --- ...iver_xf86-video-intel-2.3.2-cross-compile.patch | 30 ---------------------- ...iver_xf86-video-intel-2.4.2-cross-compile.patch | 30 ++++++++++++++++++++++ .../xdriver_xf86-video-intel.mk | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-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.3.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch deleted file mode 100644 index 0258d7018..000000000 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- xf86-video-i810-1.6.5/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200 -+++ xf86-video-i810-1.6.5/configure.ac 2007-06-10 20:59:50.000000000 +0200 -@@ -92,13 +92,14 @@ AC_HEADER_STDC - - AC_MSG_CHECKING([whether to include DRI support]) - if test x$DRI = xauto; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -- AC_CHECK_FILE([${sdkdir}/damage.h], -+ AC_CHECK_FILE([${sdkdir}/damage.h], - [have_damage_h="yes"], [have_damage_h="no"]) - - if test "$have_dri_h" = yes -a \ -@@ -108,6 +109,12 @@ if test x$DRI = xauto; then - else - DRI="no" - fi -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ DRI="yes" -+ fi - fi - AC_MSG_RESULT([$DRI]) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch new file mode 100644 index 000000000..ff476bd0e --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.4.2-cross-compile.patch @@ -0,0 +1,30 @@ +--- xf86-video-intel-2.4.2/configure.ac.orig 2007-06-10 20:59:27.000000000 +0200 ++++ xf86-video-intel-2.4.2/configure.ac 2007-06-10 20:59:50.000000000 +0200 +@@ -92,13 +92,14 @@ AC_HEADER_STDC + + AC_MSG_CHECKING([whether to include DRI support]) + if test x$DRI = xauto; then ++ if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) + AC_CHECK_FILE([${sdkdir}/dristruct.h], + [have_dristruct_h="yes"], [have_dristruct_h="no"]) +- AC_CHECK_FILE([${sdkdir}/damage.h], ++ AC_CHECK_FILE([${sdkdir}/damage.h], + [have_damage_h="yes"], [have_damage_h="no"]) + + if test "$have_dri_h" = yes -a \ +@@ -108,6 +109,12 @@ if test x$DRI = xauto; then + else + DRI="no" + fi ++ else ++ have_dri_h="yes" ++ have_sarea_h="yes" ++ have_dristruct_h="yes" ++ DRI="yes" ++ fi + fi + AC_MSG_RESULT([$DRI]) 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 7e81cc9eb..829cc3a5d 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.3.2 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.4.2 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