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/openchrome | |
| parent | af593cbceefb461c8c089395ff257c05cd290af7 (diff) | |
| download | buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.tar.gz buildroot-novena-d4e56ff4dc8a0528550eb8503956bdcddb2fe516.zip | |
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
Diffstat (limited to 'package/x11r7/openchrome')
| -rw-r--r-- | package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch (renamed from package/x11r7/openchrome/openchrome-r355-cross-compile.patch) | 15 | ||||
| -rw-r--r-- | package/x11r7/openchrome/openchrome.mk | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch index de12e5493..c7bfc9350 100644 --- a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch +++ b/package/x11r7/openchrome/openchrome-0.2.902-cross-compile.patch @@ -1,7 +1,7 @@ ---- openchrome-r355/configure.ac.orig 2007-06-10 15:07:43.000000000 +0200 -+++ openchrome-r355/configure.ac 2007-06-10 15:11:16.000000000 +0200 -@@ -69,12 +69,18 @@ - AC_HEADER_STDC +--- a/configure.ac 2008-04-09 15:42:55.000000000 -0400 ++++ b/configure.ac 2008-06-23 09:39:06.000000000 -0400 +@@ -87,12 +87,18 @@ if test x$XSERVER_LIBPCIACCESS = xyes; t + fi if test "$DRI" != no; then + if test "$cross_compiling" = "no" ; then @@ -19,17 +19,18 @@ fi AC_MSG_CHECKING([whether to include DRI support]) -@@ -113,8 +119,12 @@ +@@ -133,8 +139,12 @@ AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) -AC_CHECK_FILE([${sdkdir}/xf86Module.h], +- [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +if test "$cross_compiling" = "no" ; then + AC_CHECK_FILE([${sdkdir}/xf86Module.h], - [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) ++ [have_xf86Module_h="yes"], [have_xf86Module_h="no"]) +else + have_xf86Module_h="yes" +fi # Check the ABI_VIDEODRV_VERSION - SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_CFLAGS="$CFLAGS" diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk index 986eadf0e..65b470d72 100644 --- a/package/x11r7/openchrome/openchrome.mk +++ b/package/x11r7/openchrome/openchrome.mk @@ -3,13 +3,13 @@ # openchrome # ############################################################# -OPENCHROME_VERSION = r355 -OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2 -OPENCHROME_SITE = http://bazaar.mezis.net/ +OPENCHROME_VERSION = 0.2.902 +OPENCHROME_SOURCE = xf86-video-openchrome-$(OPENCHROME_VERSION).tar.bz2 +OPENCHROME_SITE = http://www.openchrome.org/releases OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto -OPENCHROME_AUTORECONF = NO +OPENCHROME_AUTORECONF = YES OPENCHROME_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,openchrome)) |