xdriver_x86-driver-intel: bump version
authorPeter Korsgaard <jacmet@sunsite.dk>
Sat, 22 Sep 2012 13:49:30 +0000 (15:49 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 22 Sep 2012 19:34:54 +0000 (21:34 +0200)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch [deleted file]
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.9.1-cross-compile.patch [deleted file]
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-cross-compile.patch [new file with mode: 0644]
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch [deleted file]

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 (file)
index 0b020ac..0000000
+++ /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 (file)
index 76a33eb..0000000
+++ /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 (file)
index 0000000..0b020ac
--- /dev/null
@@ -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],
index acffd668c362e876a58b5d407d6a3331a9ce847f..b5bdf1a3c574e1a7c75beae6039eed6ea3d3daa9 100644 (file)
@@ -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
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-2.0.0.patch
deleted file mode 100644 (file)
index bf9ffe7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- xf86-video-vesa-2.0.0/configure.ac.orig    2007-06-11 13:10:35.000000000 +0200
-+++ xf86-video-vesa-2.0.0/configure.ac 2007-06-11 14:16:45.000000000 +0200
-@@ -56,8 +56,8 @@
- PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
-+CFLAGS="$CFLAGS $XORG_CFLAGS "'-I$(top_srcdir)/src'
-+INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])