diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
| commit | d4e56ff4dc8a0528550eb8503956bdcddb2fe516 (patch) | |
| tree | 2d6f8114da90ab526a5d7595c55ad8559de64366 /package/x11r7/xdriver_xf86-video-glint | |
| parent | af593cbceefb461c8c089395ff257c05cd290af7 (diff) | |
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
Diffstat (limited to 'package/x11r7/xdriver_xf86-video-glint')
3 files changed, 31 insertions, 23 deletions
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch deleted file mode 100644 index 437e06bb1..000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-glint-1.1.1/configure.ac.orig 2007-06-10 20:58:34.000000000 +0200 -+++ xf86-video-glint-1.1.1/configure.ac 2007-06-10 20:58:58.000000000 +0200 -@@ -69,12 +69,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-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch new file mode 100644 index 000000000..8c420d3a8 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.2.0-cross-compile.patch @@ -0,0 +1,29 @@ +--- a/configure.ac 2008-06-23 11:17:07.000000000 -0400 ++++ b/configure.ac 2008-06-23 11:16:31.000000000 -0400 +@@ -75,12 +75,20 @@ CPPFLAGS="$SAVE_CPPFLAGS" + AC_HEADER_STDC + + if test "$DRI" != 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"]) ++ 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], ++ [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-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk index 2e9eaee19..5f37470ea 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk @@ -4,10 +4,10 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1 +XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = NO +XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint)) |