xorg: simplify dependencies on X.org

Many packages used to depend on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7,
but this is useless since BR2_PACKAGE_XORG is a non-existing
configuration option. So, these depencies gets simplified to
BR2_PACKAGE_XORG7 only.

Some others were depending on BR2_PACKAGE_TINYX (which doesn't) exist
or BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tiny ||
BR2_PACKAGE_XSERVER_x11r7. Replace all that mess by a simple
dependency on BR2_PACKAGE_XORG7.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-07-17 14:34:22 +02:00
parent 8c00f43904
commit cc76043bd4
11 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_BLACKBOX config BR2_PACKAGE_BLACKBOX
bool "blackbox" bool "blackbox"
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
help help
Blackbox is a fast, lightweight window manager for the X Blackbox is a fast, lightweight window manager for the X

View File

@ -5,7 +5,7 @@ config BR2_PACKAGE_DILLO
depends on BR2_PACKAGE_LIBGTK12 depends on BR2_PACKAGE_LIBGTK12
depends on BR2_PACKAGE_ZLIB depends on BR2_PACKAGE_ZLIB
depends on BR2_PACKAGE_LIBPNG depends on BR2_PACKAGE_LIBPNG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
Dillo is a small GTK+ based web browser written in C. Dillo is a small GTK+ based web browser written in C.

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_DOCKER config BR2_PACKAGE_DOCKER
bool "docker" bool "docker"
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
help help
a system tray dock for X a system tray dock for X

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_FLTK config BR2_PACKAGE_FLTK
bool "fltk" bool "fltk"
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
A cross-platform C++ GUI toolkit for UNIX/Linux (X11), A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
Microsoft Windows, and MacOS X. Microsoft Windows, and MacOS X.

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_ACE_OF_PENGUINS config BR2_PACKAGE_ACE_OF_PENGUINS
bool "ace_of_penguins" bool "ace_of_penguins"
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
The Ace of Penguins is a set of Unix/X solitaire games based The Ace of Penguins is a set of Unix/X solitaire games based
on the ones available for Windows but with a number of on the ones available for Windows but with a number of

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBGTK12 config BR2_PACKAGE_LIBGTK12
bool "libgtk12" bool "libgtk12"
select BR2_PACKAGE_LIBGLIB12 select BR2_PACKAGE_LIBGLIB12
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX depends on BR2_PACKAGE_XORG7
help help
The GTK+ graphical user interface library The GTK+ graphical user interface library

View File

@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PDF
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_PANGO select BR2_PACKAGE_PANGO
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
help help
The GTK+ version 2 graphical user interface library The GTK+ version 2 graphical user interface library

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_METACITY config BR2_PACKAGE_METACITY
bool "metacity" bool "metacity"
select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGTK2
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
Metacity is a window manager for the X Window System. Metacity is a window manager for the X Window System.

View File

@ -2,7 +2,7 @@ config BR2_PACKAGE_MIDORI
bool "midori" bool "midori"
select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY select BR2_PACKAGE_LIBSEXY
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
Midori is a lightweight web browser based on WebKit Midori is a lightweight web browser based on WebKit

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_RDESKTOP config BR2_PACKAGE_RDESKTOP
bool "rdesktop" bool "rdesktop"
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
help help
rdesktop is an open source client for Windows NT Terminal rdesktop is an open source client for Windows NT Terminal
Server and Windows 2000/2003 Terminal Services, capable of Server and Windows 2000/2003 Terminal Services, capable of

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_RXVT config BR2_PACKAGE_RXVT
bool "rxvt" bool "rxvt"
depends on BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7 depends on BR2_PACKAGE_XORG7
help help
A nice small colour vt102 X terminal emulator. A nice small colour vt102 X terminal emulator.