X11 OpenChrome driver depends on libxcomposite

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 7ef6d8126ebca91108433c2def3efdee0d54332c..21848a67cababd87ef3244b699775428cc4698d0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2010.05, Not yet released
+
+       Fixes all over the tree.
+
+       Updated/fixed packages: xdriver_xf86-video-openchrome
+
 2010.05-rc1, Released May 3rd, 2010:
 
        Cleaned up / restructured package menu.

diff --git a/Config.in b/Config.in
index 3a690d6f102631118d154c5c881e86853d92e4a4..fc68bf9e4df1b72f850424dd01d9bd5fe1f725bc 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
        string
-       default "2010.05-rc1"
+       default "2010.05-rc1-git"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 25424ff5b612e5cdd7972c08a0b8f12d239a21df..4a692468901a30fe0e9b9494cf9025b170d30dc3 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XLIB_LIBX11
+       select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
        select BR2_PACKAGE_XLIB_LIBXVMC
        select BR2_PACKAGE_XPROTO_GLPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

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
index 44bc111d572e02b13c984813248398624a312fac..486ab6fa05dceccd019319b8df712c24340bb070 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -7,7 +7,19 @@ 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_DEPENDENCIES = \
+       xserver_xorg-server \
+       libdrm \
+       xlib_libX11 \
+       xlib_libXcomposite \
+       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