From d4e56ff4dc8a0528550eb8503956bdcddb2fe516 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard 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. --- ...iver_xf86-video-intel-2.3.2-cross-compile.patch | 30 ++++++++++++++++++++++ .../xdriver_xf86-video-intel.mk | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.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 new file mode 100644 index 000000000..0258d7018 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.3.2-cross-compile.patch @@ -0,0 +1,30 @@ +--- 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.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 0e0d760cd..48d8b69c4 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,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.1.1 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.3.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 = NO +XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel)) -- cgit v1.2.3