From d4e56ff4dc8a0528550eb8503956bdcddb2fe516 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Mon, 30 Jun 2008 12:55:29 +0000
Subject: packages: fix xorg to compile modular and tiny versions

Based on googlecode r558 by John Voltz.
---
 .../xdriver_xf86-video-i810-1.6.5.patch             | 21 ---------------------
 ...driver_xf86-video-i810-1.7.4-cross-compile.patch | 21 +++++++++++++++++++++
 .../xdriver_xf86-video-i810.mk                      |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch

(limited to 'package/x11r7/xdriver_xf86-video-i810')

diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch
deleted file mode 100644
index 9f0179d59..000000000
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch
+++ /dev/null
@@ -1,21 +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
-@@ -80,12 +80,18 @@
- AC_HEADER_STDC
- 
- if test "$DRI" != no; 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"])
-+	else
-+		have_dri_h="yes"
-+		have_sarea_h="yes"
-+		have_dristruct_h="yes"
-+	fi
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch
new file mode 100644
index 000000000..9f0179d59
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.7.4-cross-compile.patch
@@ -0,0 +1,21 @@
+--- 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
+@@ -80,12 +80,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; 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"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
index 1e5447aca..5672aed15 100644
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5
+XDRIVER_XF86_VIDEO_I810_VERSION = 1.7.4
 XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_I810_AUTORECONF = NO
+XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810))
-- 
cgit v1.2.3