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>

diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index d6819b44c2c3528af78a1ce213d6158f28307182..bf237c53a434c7710de5f691ce364de0efce0f64 100644 (file)
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_BLACKBOX
        bool "blackbox"
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        depends on BR2_INSTALL_LIBSTDCPP
        help
          Blackbox is a fast, lightweight window manager for the X

diff --git a/package/dillo/Config.in b/package/dillo/Config.in
index f0682d9fd3e6d8b1484e238d68a17e098d3e065d..5724691752f6f5278d7d968b4db06edd6893a1ad 100644 (file)
--- a/package/dillo/Config.in
+++ b/package/dillo/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_DILLO
        depends on BR2_PACKAGE_LIBGTK12
        depends on BR2_PACKAGE_ZLIB
        depends on BR2_PACKAGE_LIBPNG
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          Dillo is a small GTK+ based web browser written in C.
 

diff --git a/package/docker/Config.in b/package/docker/Config.in
index 1c89a79c85f8ee0d86565d31eca1ef0021a1b805..02ef83c2e90b3825b04761dd31cede80a3e39405 100644 (file)
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DOCKER
        bool "docker"
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+       depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_LIBGLIB2
        help
          a system tray dock for X

diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index 120ee680a1b5b5819fd4130248015fc692b64d5f..b0ffb4e7e84f5db9bc6642cacea2dbee6cbd30c2 100644 (file)
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_FLTK
        bool "fltk"
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
          Microsoft Windows, and MacOS X.

diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in
index 3e1a9db2fb00f3545dddd88fa18b33714355a07e..edbaf26ce765ddd887139aa7c9db605e0fd8540d 100644 (file)
--- a/package/games/ace_of_penguins/Config.in
+++ b/package/games/ace_of_penguins/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_ACE_OF_PENGUINS
        bool "ace_of_penguins"
        select BR2_PACKAGE_LIBPNG
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          The Ace of Penguins is a set of Unix/X solitaire games based
          on the ones available for Windows but with a number of

diff --git a/package/libgtk12/Config.in b/package/libgtk12/Config.in
index e0f643ff257282946930fc50e4906597c5ed2d6c..01393f96f08a9525180ad5f3f2b6750749d29e93 100644 (file)
--- a/package/libgtk12/Config.in
+++ b/package/libgtk12/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBGTK12
        bool "libgtk12"
        select BR2_PACKAGE_LIBGLIB12
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+       depends on BR2_PACKAGE_XORG7
        help
          The GTK+ graphical user interface library
 

diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 19809f26e1104af0288fd79ca3377cb596a80b8b..5c0482d610003a308f4260741e421ddee81713fa 100644 (file)
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_CAIRO_PDF
        select BR2_PACKAGE_LIBGLIB2
        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
          The GTK+ version 2 graphical user interface library
 

diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index b552f67ac3f3c2882663175abb67a633345d688a..12c54d1170ab59953cb771547485064ba862b833 100644 (file)
--- a/package/metacity/Config.in
+++ b/package/metacity/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_METACITY
        bool "metacity"
        select BR2_PACKAGE_LIBGTK2
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          Metacity is a window manager for the X Window System.

diff --git a/package/midori/Config.in b/package/midori/Config.in
index eb960d4eb4cf7e54e5f593625c67e5f4db030387..fd1da3553629587c50e124635516099cdb98a39e 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_MIDORI
        bool "midori"
        select BR2_PACKAGE_WEBKIT
        select BR2_PACKAGE_LIBSEXY
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          Midori is a lightweight web browser based on WebKit
 

diff --git a/package/rdesktop/Config.in b/package/rdesktop/Config.in
index 9e0be5c8729df779f8b805246c52ab676f333eae..9ec6f8a7329ef4ea1dcd3b9b8eb88ded8819f44e 100644 (file)
--- a/package/rdesktop/Config.in
+++ b/package/rdesktop/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_RDESKTOP
        bool "rdesktop"
        select BR2_PACKAGE_OPENSSL
-       depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+       depends on BR2_PACKAGE_XORG7
        help
          rdesktop is an open source client for Windows NT Terminal
          Server and Windows 2000/2003 Terminal Services, capable of

diff --git a/package/rxvt/Config.in b/package/rxvt/Config.in
index 80aa717e0d077e7042b9e939522fc1db19496d0b..f7196e747498a4ff7439e4ac90566fab4d292e37 100644 (file)
--- a/package/rxvt/Config.in
+++ b/package/rxvt/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_RXVT
        bool "rxvt"
-       depends on BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tinyx || BR2_PACKAGE_XSERVER_x11r7
+       depends on BR2_PACKAGE_XORG7
        help
          A nice small colour vt102 X terminal emulator.