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. --- .../xdriver_xf86-video-ati-6.6.3.patch | 23 ------------------ .../xdriver_xf86-video-ati-cross-compile.patch | 27 ++++++++++++++++++++++ .../xdriver_xf86-video-ati.mk | 4 ++-- 3 files changed, 29 insertions(+), 25 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch create mode 100644 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch (limited to 'package/x11r7/xdriver_xf86-video-ati') diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch deleted file mode 100644 index ba05f8841..000000000 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xf86-video-ati-6.6.3/configure.ac.orig 2007-06-10 12:02:12.000000000 +0200 -+++ xf86-video-ati-6.6.3/configure.ac 2007-06-10 12:02:31.000000000 +0200 -@@ -84,13 +84,19 @@ - # Checks for header files. - AC_HEADER_STDC - --if test "$DRI" != no; then -+if test "x$DRI" != xno; 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-ati/xdriver_xf86-video-ati-cross-compile.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch new file mode 100644 index 000000000..d27617606 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-cross-compile.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 ++++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 +@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo + AC_HEADER_STDC + + if test "$DRI" != no; then +- AC_CHECK_FILE([${sdkdir}/dri.h], ++ 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], ++ AC_CHECK_FILE([${sdkdir}/sarea.h], + [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], ++ 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"]) ++ 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-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 5c1f3f850..8c4ae9c5f 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3 +XDRIVER_XF86_VIDEO_ATI_VERSION = 6.8.191 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_ATI_AUTORECONF = NO +XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati)) -- cgit v1.2.3