summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulius Zaleckas <paulius.zaleckas@gmail.com>2010-05-03 19:51:58 +0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-05-03 20:13:14 +0200
commitca218debd5c54023517955babd080dc0db9204ee (patch)
tree5b944417d07f99325ca9600a04f5e179f0186722
parentaac61fdcc3688e494f9bd31cbc5c3c16191c2d93 (diff)
X11 OpenChrome driver depends on libxcomposite
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES6
-rw-r--r--Config.in2
-rw-r--r--package/x11r7/xdriver_xf86-video-openchrome/Config.in1
-rw-r--r--package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk14
4 files changed, 21 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 7ef6d8126..21848a67c 100644
--- 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 3a690d6f1..fc68bf9e4 100644
--- 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 25424ff5b..4a6924689 100644
--- 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 44bc111d5..486ab6fa0 100644
--- 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