matchbox: depend on x11 support, rather than selecting it

Packages should depend on BR2_PACKAGE_XORG7 rather than selecting it,
because:
 - X brings in a lot of dependencies, so shouldn't get implicitly enabled
 - Select doesn't check dependencies, so build breaks if XORG dependencies
   aren't met (locale/wchar)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index e6c11064247bf7c0b783784c9711714f9240e02a..c619b3f27a7ca0f8e0406b9e7f1adbae333d4a00 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,12 +14,12 @@
        e2fsprogs, festival, gstreamer, gst-plugins-bad, gst-plugins-base,
        gst-plugins-good, imagemagick, ipkg, iptables, iw, kernel-headers,
        kismet, libelf, libevent, libglib2, libidn, liblockfile, libmad,
-       libpcap, libupnp, libuuid, lighttpd, ltrace, lua, lzma, mdadm, nbd,
-       ncftp, ncurses, netkittelnet, netsnmp, ntfs-3g, openntp, openssl, php,
-       python, quagga, radvd, rsync, samba, sawman, sdl, shared-mime-info,
-       spawn-fcgi, speech-tools, sqlite, squashfs, synergy, syslinux,
-       target-binutils, tcpdump, u-boot, util-linux, valgrind, vsftpd, wipe,
-       wpa-supplicant, xdata_xcursor-themes, zlib
+       libpcap, libupnp, libuuid, lighttpd, ltrace, lua, lzma, matchbox,
+       mdadm, nbd, ncftp, ncurses, netkittelnet, netsnmp, ntfs-3g, openntp,
+       openssl, php, python, quagga, radvd, rsync, samba, sawman, sdl,
+       shared-mime-info, spawn-fcgi, speech-tools, sqlite, squashfs, synergy,
+       syslinux, target-binutils, tcpdump, u-boot, util-linux, valgrind,
+       vsftpd, wipe, wpa-supplicant, xdata_xcursor-themes, zlib
 
        Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4
 

diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index afa568412cb2edfcf60384311fbc2da022c96159..f57346783840af713d7aa479fa142374d10d6ea1 100644 (file)
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_MATCHBOX
        bool "MatchBox Window Manager"
-       select BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_FONTCONFIG
        select BR2_PACKAGE_XLIB_LIBXDAMAGE
        select BR2_PACKAGE_XLIB_LIBXCURSOR