Merge branch 'x11r75' of git://gitorious.org/takeme-buildroot/takeme-buildroot

4 files changed, 18 insertions, 33 deletions

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 3921a92f5..2b42fe0cc 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_OPENCHROME
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
 	bool "xf86-video-openchrome"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBDRM
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/openchrome.mk
deleted file mode 100644
index 8ced23e56..000000000
--- a/package/x11r7/xdriver_xf86-video-openchrome/openchrome.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#############################################################
-#
-# openchrome
-#
-#############################################################
-OPENCHROME_VERSION = 0.2.903
-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_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-OPENCHROME_AUTORECONF = YES
-OPENCHROME_CONF_OPT = --enable-shared --disable-static
-
-$(eval $(call AUTOTARGETS,package/x11r7,openchrome))
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/openchrome-0.2.903-cross-compile.patch b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome-0.2.904-cross-compile.patch
index c7bfc9350..e25939807 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/openchrome-0.2.903-cross-compile.patch
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome-0.2.904-cross-compile.patch
@@ -19,18 +19,3 @@
  fi
  
  AC_MSG_CHECKING([whether to include DRI support])
-@@ -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"])
-+else
-+	have_xf86Module_h="yes"
-+fi
- 
- # Check the ABI_VIDEODRV_VERSION
- SAVE_CFLAGS="$CFLAGS"
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
new file mode 100644
index 000000000..44bc111d5
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# openchrome
+#
+#############################################################
+XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.2.904
+XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://www.openchrome.org/releases
+
+XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+XDRIVER_XF86_VIDEO_OPENCHROME_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_OPENCHROME_CONF_OPT = --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-openchrome))