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-mga-1.4.6.1.patch | 21 --------------------- .../xdriver_xf86-video-mga-1.4.8.patch | 21 +++++++++++++++++++++ .../xdriver_xf86-video-mga.mk | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch create mode 100644 package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch (limited to 'package/x11r7/xdriver_xf86-video-mga') diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch deleted file mode 100644 index 34cc1330c..000000000 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-mga-1.4.6.1/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200 -+++ xf86-video-mga-1.4.6.1/configure.ac 2007-06-10 12:00:37.000000000 +0200 -@@ -77,12 +77,18 @@ - AC_HEADER_STDC - - 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-mga/xdriver_xf86-video-mga-1.4.8.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch new file mode 100644 index 000000000..34cc1330c --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.8.patch @@ -0,0 +1,21 @@ +--- xf86-video-mga-1.4.6.1/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200 ++++ xf86-video-mga-1.4.6.1/configure.ac 2007-06-10 12:00:37.000000000 +0200 +@@ -77,12 +77,18 @@ + AC_HEADER_STDC + + 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-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 803715e24..90c8804bd 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1 +XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.8 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = NO +XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga)) -- cgit v1.2.3