* [Buildroot] [PATCH 01/13] xorg: reorganize the selection of the X.org server type
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 02/13] xorg: reindent configuration option details Thomas Petazzoni
` (11 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
The selection of the X.org server type was really strange. The user
had to select between none, tinyx and modular. Now, the menuconfig
interface display a single item for X.org, that can be
selected/unselected. This entry contains a submenu, that allows to
select the type of the X.org server (tinyX or modular) and that allows
(as before) to enable/disable X.org libraries, drivers, etc.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 32 --------------------------------
package/x11r7/Config.in | 31 ++++++++++++++++++++++++++++---
2 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index cb83563..7e7ca00 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -318,39 +318,7 @@ source "package/qtopia4/Config.in"
#source "package/microwin/Config.in"
-
-choice
- prompt "X Window System server"
- default BR2_PACKAGE_XSERVER_none
- help
- Select the X Window System server to use
-
-config BR2_PACKAGE_XSERVER_none
- bool "none"
-config BR2_PACKAGE_XSERVER_xorg
- bool "modular xorg"
- depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
-# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
-config BR2_PACKAGE_XSERVER_tinyx
- bool "tinyx"
- depends on BR2_USE_WCHAR
-endchoice
-
-comment "xorg requires a toolchain with C++, LOCALE, LARGEFILE and WCHAR support"
- depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE)
-comment "tinyx requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
-
-config BR2_X11_PREFIX
- string
- default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
- default "/usr" if BR2_PACKAGE_XSERVER_tinyx
- help
- X11 apps root location
-
-if !BR2_PACKAGE_XSERVER_none
source "package/x11r7/Config.in"
-endif
comment "X libraries and helper libraries"
#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 0720e3f..7af62ee 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -10,9 +10,34 @@ help
applications in the target.
if BR2_PACKAGE_XORG7
- menu "X11R7 Servers"
- source package/x11r7/xserver_xorg-server/Config.in
- endmenu
+
+choice
+ prompt "X Window System server type"
+ default BR2_PACKAGE_XSERVER_tinyx
+ help
+ Select the X Window System server to use
+
+config BR2_PACKAGE_XSERVER_xorg
+ bool "Modular X.org"
+ # depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
+ depends on BR2_USE_WCHAR && BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
+
+config BR2_PACKAGE_XSERVER_tinyx
+ bool "TinyX"
+ depends on BR2_USE_WCHAR
+
+endchoice
+
+config BR2_X11_PREFIX
+ string
+ default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
+ default "/usr" if BR2_PACKAGE_XSERVER_tinyx
+ help
+ X11 apps root location
+
+menu "X11R7 Servers"
+ source package/x11r7/xserver_xorg-server/Config.in
+endmenu
menu "X11R7 Libraries"
source package/x11r7/libxcb/Config.in
source package/x11r7/mesa3d/Config.in
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 02/13] xorg: reindent configuration option details
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 01/13] xorg: reorganize the selection of the X.org server type Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 03/13] xorg: remove useless configuration comment Thomas Petazzoni
` (10 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/Config.in | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 7af62ee..dad0924 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -1,13 +1,12 @@
menuconfig BR2_PACKAGE_XORG7
-bool "X.org X Window System, X11R7, release 7.4"
-default y if BR2_PACKAGE_XSERVER_x11r7
-select BR2_PACKAGE_ZLIB
-select BR2_PACKAGE_LIBPNG
-select BR2_PACKAGE_EXPAT
-select BR2_PACKAGE_FONTCONFIG
-help
- Support for X11R7 libraries, servers, drivers, and/or
- applications in the target.
+ bool "X.org X Window System, X11R7, release 7.4"
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_FONTCONFIG
+ help
+ Support for X11R7 libraries, servers, drivers, and/or
+ applications in the target.
if BR2_PACKAGE_XORG7
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 03/13] xorg: remove useless configuration comment
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 01/13] xorg: reorganize the selection of the X.org server type Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 02/13] xorg: reindent configuration option details Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 04/13] xorg: simplify dependencies on X.org Thomas Petazzoni
` (9 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/Config.in | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index dad0924..ace438a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -327,7 +327,3 @@ endmenu
source package/x11r7/xkeyboard-config/Config.in
endmenu
endif
-
-comment "X11R7 X Window System disabled"
- depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG
-
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 04/13] xorg: simplify dependencies on X.org
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (2 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 03/13] xorg: remove useless configuration comment Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency Thomas Petazzoni
` (8 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
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>
---
package/blackbox/Config.in | 2 +-
package/dillo/Config.in | 2 +-
package/docker/Config.in | 2 +-
package/fltk/Config.in | 2 +-
package/games/ace_of_penguins/Config.in | 2 +-
package/libgtk12/Config.in | 2 +-
package/libgtk2/Config.in | 2 +-
package/metacity/Config.in | 2 +-
package/midori/Config.in | 2 +-
package/rdesktop/Config.in | 2 +-
package/rxvt/Config.in | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index d6819b4..bf237c5 100644
--- 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 f0682d9..5724691 100644
--- 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 1c89a79..02ef83c 100644
--- 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 120ee68..b0ffb4e 100644
--- 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 3e1a9db..edbaf26 100644
--- 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 e0f643f..01393f9 100644
--- 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 19809f2..5c0482d 100644
--- 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 b552f67..12c54d1 100644
--- 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 eb960d4..fd1da35 100644
--- 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 9e0be5c..9ec6f8a 100644
--- 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 80aa717..f7196e7 100644
--- 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.
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (3 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 04/13] xorg: simplify dependencies on X.org Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 23:06 ` Peter Korsgaard
2009-07-17 16:03 ` [Buildroot] [PATCH 06/13] dillo: " Thomas Petazzoni
` (7 subsequent siblings)
12 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Configuration comments make the configuration system messy. And if we
want to tell the user about the possible missing depencies for each
and every package, there would be an unmaintable mess of configuration
comments.
Let's get rid of them, and let the user figure out using the help of
each package available in the configuration system.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/midori/Config.in | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/package/midori/Config.in b/package/midori/Config.in
index fd1da35..80b7f77 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -7,6 +7,3 @@ config BR2_PACKAGE_MIDORI
Midori is a lightweight web browser based on WebKit
http://software.twotoasts.de/?page=midori
-
-comment "midori - disabled (requires Xorg(7))"
- depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency
2009-07-17 16:03 ` [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency Thomas Petazzoni
@ 2009-07-17 23:06 ` Peter Korsgaard
2009-07-20 8:45 ` Thomas Petazzoni
0 siblings, 1 reply; 17+ messages in thread
From: Peter Korsgaard @ 2009-07-17 23:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
Thomas> Configuration comments make the configuration system
Thomas> messy. And if we want to tell the user about the possible
Thomas> missing depencies for each and every package, there would be
Thomas> an unmaintable mess of configuration comments.
I don't completely agree. For toolchain issues such as WCHAR I think
the comments can be very helpful as it isn't obvious why a package
isn't visible.
For package dependencies, 'select' should be used for library
dependencies. For huge things like X, I think it's OK to not show any
comments as the user most likely doesn't expect an X package to be
available if they haven't enabled X.
Related to this, I think we should move the X applications into a
seperate sub menu.
The stuff that can work with either directfb or X is a bit more
tricky.
Thomas> Let's get rid of them, and let the user figure out using the
Thomas> help of each package available in the configuration system.
How? The package won't be visible if it has unmet dependencies.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency
2009-07-17 23:06 ` Peter Korsgaard
@ 2009-07-20 8:45 ` Thomas Petazzoni
0 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-20 8:45 UTC (permalink / raw)
To: buildroot
Le Sat, 18 Jul 2009 01:06:51 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> I don't completely agree. For toolchain issues such as WCHAR I think
> the comments can be very helpful as it isn't obvious why a package
> isn't visible.
True, but they're also very unpretty in the package list.
> For package dependencies, 'select' should be used for library
> dependencies. For huge things like X, I think it's OK to not show any
> comments as the user most likely doesn't expect an X package to be
> available if they haven't enabled X.
Yes.
> Related to this, I think we should move the X applications into a
> seperate sub menu.
Agreed. I've just started proposing some cleanups. More will follow if
I find some time.
> The stuff that can work with either directfb or X is a bit more
> tricky.
Definitely.
> Thomas> Let's get rid of them, and let the user figure out using the
> Thomas> help of each package available in the configuration system.
>
> How? The package won't be visible if it has unmet dependencies.
Well, someone is currently working on xconfig support for Buildroot
(the patches should be coming out if I find the time to review them).
And xconfig allows to see all options, including the ones that cannot
be selected at the moment. Maybe a similar thing could be added to the
menuconfig interface ?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 06/13] dillo: remove configuration comment on X.org dependency
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (4 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 05/13] midori: remove configuration comment on X.org dependency Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 23:21 ` Peter Korsgaard
2009-07-17 16:03 ` [Buildroot] [PATCH 07/13] matchbox: fix dependencies Thomas Petazzoni
` (6 subsequent siblings)
12 siblings, 1 reply; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Configuration comments make the configuration system messy. And if we
want to tell the user about the possible missing depencies for each
and every package, there would be an unmaintable mess of configuration
comments.
Let's get rid of them, and let the user figure out using the help of
each package available in the configuration system.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/dillo/Config.in | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/package/dillo/Config.in b/package/dillo/Config.in
index 5724691..c27a0e8 100644
--- a/package/dillo/Config.in
+++ b/package/dillo/Config.in
@@ -10,6 +10,3 @@ config BR2_PACKAGE_DILLO
Dillo is a small GTK+ based web browser written in C.
http://www.dillo.org/
-
-comment "dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))"
- depends on !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 06/13] dillo: remove configuration comment on X.org dependency
2009-07-17 16:03 ` [Buildroot] [PATCH 06/13] dillo: " Thomas Petazzoni
@ 2009-07-17 23:21 ` Peter Korsgaard
0 siblings, 0 replies; 17+ messages in thread
From: Peter Korsgaard @ 2009-07-17 23:21 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
Thomas> Configuration comments make the configuration system
Thomas> messy. And if we want to tell the user about the possible
Thomas> missing depencies for each and every package, there would be
Thomas> an unmaintable mess of configuration comments.
Thomas> Let's get rid of them, and let the user figure out using the
Thomas> help of each package available in the configuration system.
Please change the 'depends on' lines for the libraries to 'select'
then.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 07/13] matchbox: fix dependencies
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (5 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 06/13] dillo: " Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 08/13] xorg server: beautify list of dependencies Thomas Petazzoni
` (5 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
A dependency on BR2_PACKAGE_XORG7 is enough, no need to depend on
BR2_PACKAGE_XORG_XSERVER.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/matchbox/Config.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index b57a4a2..afa5684 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_MATCHBOX
bool "MatchBox Window Manager"
- select BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XORG7
select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBXDAMAGE
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 08/13] xorg server: beautify list of dependencies
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (6 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 07/13] matchbox: fix dependencies Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 09/13] xorg server: remove dependencies Thomas Petazzoni
` (4 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Reorganize the list of depencies with a sane indentation level, and
one dependency per line. Yes, the list is long, but is easier to read,
and future patches modifying this list will be easier to review.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../xserver_xorg-server/xserver_xorg-server.mk | 66 ++++++++++++++++----
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 77c8208..0c70441 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -12,19 +12,59 @@ XSERVER_XORG_SERVER_INSTALL_STAGING = YES
XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS
XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
-XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \
- xproto_compositeproto xproto_damageproto xproto_fixesproto \
- xproto_glproto xproto_kbproto xproto_randrproto \
- xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \
- xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \
- xlib_libXrender xlib_libXres xlib_libXft xlib_libXcursor \
- xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \
- xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \
- xproto_evieext xproto_fontsproto xproto_inputproto xproto_renderproto \
- xproto_resourceproto xproto_videoproto xproto_xcmiscproto \
- xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \
- xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \
- pixman mcookie
+XSERVER_XORG_SERVER_DEPENDENCIES = \
+ xutil_util-macros \
+ xlib_libXfont \
+ xlib_libxkbui \
+ xlib_libX11 \
+ xlib_libXau \
+ xlib_libXaw \
+ xlib_libXdmcp \
+ xlib_libXScrnSaver \
+ xlib_libXext \
+ xlib_libXfixes \
+ xlib_libXi \
+ xlib_libXmu \
+ xlib_libXpm \
+ xlib_libXrender \
+ xlib_libXres \
+ xlib_libXft \
+ xlib_libXcursor \
+ xlib_libXinerama \
+ xlib_libXrandr \
+ xlib_libXdamage \
+ xlib_libXxf86misc \
+ xlib_libXxf86vm \
+ xlib_liblbxutil \
+ xlib_libxkbfile \
+ xlib_xtrans \
+ xdata_xbitmaps \
+ xproto_bigreqsproto \
+ xproto_compositeproto \
+ xproto_damageproto \
+ xproto_evieext \
+ xproto_fixesproto \
+ xproto_fontsproto \
+ xproto_glproto \
+ xproto_inputproto \
+ xproto_kbproto \
+ xproto_randrproto \
+ xproto_renderproto \
+ xproto_resourceproto \
+ xproto_videoproto \
+ xproto_xcmiscproto \
+ xproto_xextproto \
+ xproto_xf86bigfontproto \
+ xproto_xf86dgaproto \
+ xproto_xf86driproto \
+ xproto_xf86miscproto \
+ xproto_xf86rushproto \
+ xproto_xf86vidmodeproto \
+ xproto_xproto \
+ libdrm \
+ pixman \
+ openssl \
+ mcookie
XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-xvfb \
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 09/13] xorg server: remove dependencies
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (7 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 08/13] xorg server: beautify list of dependencies Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 10/13] xorg: remove reference to non-existing BR2_PACKAGE_XSERVER_none Thomas Petazzoni
` (3 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Currently, the X.org server selection always trigger the compilation
and installation of libXt (the X toolkit) and libXaw (Athena Widget
toolkits), which is are legacy toolkits not used by modern toolkits
(Gtk, Qt, etc.). They are only used by old X11 applications that are
typically not used on embedded systems.
Not compiling them save compilation time, and more importantly, space
on the target.
We also remove the compilation on xlib_libxkbui, libxmu and libxpm,
because they all depend on libXt.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/xserver_xorg-server/Config.in | 4 ----
.../xserver_xorg-server/xserver_xorg-server.mk | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 58bd8d2..105c790 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
bool "xorg-server"
select BR2_PACKAGE_XLIB_LIBXFONT
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_XLIB_LIBXKBUI
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
select BR2_PACKAGE_XPROTO_DAMAGEPROTO
@@ -15,13 +14,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXAU
- select BR2_PACKAGE_XLIB_LIBXAW
select BR2_PACKAGE_XLIB_LIBXDMCP
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXI
- select BR2_PACKAGE_XLIB_LIBXMU
- select BR2_PACKAGE_XLIB_LIBXPM
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXRES
select BR2_PACKAGE_XLIB_LIBXXF86MISC
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0c70441..e2af324 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -15,17 +15,13 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
XSERVER_XORG_SERVER_DEPENDENCIES = \
xutil_util-macros \
xlib_libXfont \
- xlib_libxkbui \
xlib_libX11 \
xlib_libXau \
- xlib_libXaw \
xlib_libXdmcp \
xlib_libXScrnSaver \
xlib_libXext \
xlib_libXfixes \
xlib_libXi \
- xlib_libXmu \
- xlib_libXpm \
xlib_libXrender \
xlib_libXres \
xlib_libXft \
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 10/13] xorg: remove reference to non-existing BR2_PACKAGE_XSERVER_none
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (8 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 09/13] xorg server: remove dependencies Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 11/13] xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none Thomas Petazzoni
` (2 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index 7e7ca00..e7550d0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -321,7 +321,6 @@ source "package/qtopia4/Config.in"
source "package/x11r7/Config.in"
comment "X libraries and helper libraries"
-#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
source "package/atk/Config.in"
source "package/cairo/Config.in"
source "package/pango/Config.in"
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 11/13] xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (9 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 10/13] xorg: remove reference to non-existing BR2_PACKAGE_XSERVER_none Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 12/13] xorg: remove references to non-existing configuration options Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 13/13] xorg: remove the XSERVER variable Thomas Petazzoni
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
The BR2_PACKAGE_XSERVER_none option has gone, so use BR2_PACKAGE_XORG7
instead. It is more logical to test if BR2_PACKAGE_XORG7 is set to
know if an X.org server is available, than testing if
BR2_PACKAGE_XSERVER_none is set to know if an X.org server is *not*
available.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/atk/atk.mk | 2 +-
package/cairo/cairo.mk | 2 +-
package/cups/cups.mk | 2 +-
package/directfb/Config.in | 2 +-
package/games/lxdoom/Config.in | 2 +-
package/java/classpath/classpath.mk | 2 +-
package/java/jamvm/jamvm.mk | 2 +-
package/libgtk2/libgtk2.mk | 2 +-
package/pango/pango.mk | 4 ++--
package/xpdf/xpdf.mk | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 199ec7d..2d3a4e5 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -45,7 +45,7 @@ ATK_CONF_OPT = --enable-shared \
--disable-glibtest --enable-explicit-deps=no \
--disable-debug
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
ATK_CONF_OPT += --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 048351e..7a7e532 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -48,7 +48,7 @@ else
CAIRO_CONF_OPT += --disable-directfb
endif
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
CAIRO_CONF_OPT += --enable-xlib --with-x
CAIRO_DEPENDENCIES += $(XSERVER)
else
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 9051e0d..a22651f 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -18,7 +18,7 @@ else
CUPS_CONF_OPT += --disable-dbus
endif
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
CUPS_DEPENDENCIES += xlib_libX11
endif
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 1f08174..fce9ed4 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -16,7 +16,7 @@ config BR2_PACKAGE_DIRECTFB_MULTI
config BR2_PACKAGE_DIRECTFB_XSERVER
bool "build with X server backend"
depends on BR2_PACKAGE_DIRECTFB
- depends on !BR2_PACKAGE_XSERVER_none
+ depends on BR2_PACKAGE_XORG7
config BR2_PACKAGE_DIRECTFB_UNIQUE
bool "enable unique window manager"
diff --git a/package/games/lxdoom/Config.in b/package/games/lxdoom/Config.in
index 8eb7d52..ebef9f5 100644
--- a/package/games/lxdoom/Config.in
+++ b/package/games/lxdoom/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_LXDOOM
bool "lxdoom"
- depends on !BR2_PACKAGE_XSERVER_none
+ depends on BR2_PACKAGE_XORG7
help
This is the linux version of the popular doom game.
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 71c18a0..b62e29c 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -77,7 +77,7 @@ else
CLASSPATH_CONF_OPT+= --disable-gtk-peer
endif
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
CLASSPATH_DEPENDENCIES+= $(XSERVER)
CLASSPATH_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index dff089a..92ae4a6 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -52,7 +52,7 @@ JAMVM_CONF_OPT = \
JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath
#Include X libraries when we have an X server
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
JAMVM_DEPENDENCIES+= $(XSERVER)
JAMVM_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 7db0067..5c9e542 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -85,7 +85,7 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_DEPENDENCIES += directfb
endif
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
LIBGTK2_CONF_OPT += \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index c1aac86..8cccae6 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,7 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPT_X = --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
@@ -85,7 +85,7 @@ $(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR
--prefix="$(HOST_DIR)/usr" \
--sysconfdir="$(HOST_DIR)/etc" \
--disable-static \
- $(if $(BR2_PACKAGE_XSERVER_none),--without-x,--with-x) \
+ $(if $(BR2_PACKAGE_XORG7),--with-x,--without-x) \
--disable-debug \
)
touch $@
diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk
index 1fbe711..1f09a9d 100644
--- a/package/xpdf/xpdf.mk
+++ b/package/xpdf/xpdf.mk
@@ -17,7 +17,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
XPDF_CONF_OPT += --enable-fixedpoint
endif
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
XPDF_DEPENDENCIES += $(XSERVER) openmotif
XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
--with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 12/13] xorg: remove references to non-existing configuration options
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (10 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 11/13] xorg: use BR2_PACKAGE_XORG instead of BR2_PACKAGE_XSERVER_none Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
2009-07-17 16:03 ` [Buildroot] [PATCH 13/13] xorg: remove the XSERVER variable Thomas Petazzoni
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
The option BR2_PACKAGE_TINY, BR2_PACKAGE_XORG and BR2_PACKAGE_XGGI
don't exist, so do not use them to find the value of the $(XSERVER)
variable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 7daa3b4..32aa259 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -384,18 +384,9 @@ endif
# X Windowing system
XSERVER:=
-ifeq ($(BR2_PACKAGE_TINYX),y)
-XSERVER+=tinyx
-endif
-ifeq ($(BR2_PACKAGE_XORG),y)
-XSERVER+=xorg
-endif
ifeq ($(BR2_PACKAGE_XORG7),y)
XSERVER+=xserver_xorg-server
endif
-ifeq ($(BR2_PACKAGE_XGGI),y)
-XSERVER+=xggi
-endif
X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
#"))
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Buildroot] [PATCH 13/13] xorg: remove the XSERVER variable
2009-07-17 16:03 [Buildroot] [pull request] Pull request for branch xorg Thomas Petazzoni
` (11 preceding siblings ...)
2009-07-17 16:03 ` [Buildroot] [PATCH 12/13] xorg: remove references to non-existing configuration options Thomas Petazzoni
@ 2009-07-17 16:03 ` Thomas Petazzoni
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Petazzoni @ 2009-07-17 16:03 UTC (permalink / raw)
To: buildroot
The XSERVER variable used to be defined by package/Makefile.in because
the X server package name was different depending on the type of X
server that was choosen. Nowadays, the name of the package is always
xserver_xorg-server, so there's no point in having this XSERVER
intermediate variable.
This patch makes all packages use xserver_xorg-server directly as a
dependency, and removes the XSERVER variable from package/Makefile.in.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 6 ------
package/blackbox/blackbox.mk | 2 +-
package/cairo/cairo.mk | 2 +-
package/dillo/dillo.mk | 2 +-
package/docker/docker.mk | 2 +-
package/fltk/fltk.mk | 2 +-
package/games/ace_of_penguins/ace_of_penguins.mk | 2 +-
package/java/classpath/classpath.mk | 2 +-
package/java/jamvm/jamvm.mk | 2 +-
package/libgtk12/libgtk12.mk | 2 +-
package/libgtk2/libgtk2.mk | 2 +-
package/metacity/metacity.mk | 2 +-
package/midori/midori.mk | 2 +-
package/pango/pango.mk | 16 ++++++++--------
package/rdesktop/rdesktop.mk | 2 +-
package/rxvt/rxvt.mk | 2 +-
package/synergy/synergy.mk | 2 +-
package/xpdf/xpdf.mk | 2 +-
package/xvkbd/Config.in | 1 +
package/xvkbd/xvkbd.mk | 2 +-
20 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 32aa259..3511244 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -380,14 +380,8 @@ else
ENABLE_DEBUG:=
endif
-
# X Windowing system
-XSERVER:=
-ifeq ($(BR2_PACKAGE_XORG7),y)
-XSERVER+=xserver_xorg-server
-endif
-
X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
#"))
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index a85c753..371a4a4 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES
BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
-BLACKBOX_DEPENDENCIES:=uclibc $(XSERVER)
+BLACKBOX_DEPENDENCIES:=uclibc xserver_xorg-server
$(eval $(call AUTOTARGETS,package,blackbox))
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 7a7e532..a084083 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -50,7 +50,7 @@ endif
ifeq ($(BR2_PACKAGE_XORG7),y)
CAIRO_CONF_OPT += --enable-xlib --with-x
- CAIRO_DEPENDENCIES += $(XSERVER)
+ CAIRO_DEPENDENCIES += xserver_xorg-server
else
CAIRO_CONF_OPT += --disable-xlib --without-x
endif
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 12d9a5c..1dcfd55 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -39,7 +39,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo
$(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install
touch $(DILLO_DIR)/.installed
-dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
+dillo: uclibc xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 860cd7e..3b8c25c 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
-DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 $(XSERVER)
+DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 xserver_xorg-server
$(eval $(call AUTOTARGETS,package,docker))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index f4a0498..9574cb8 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -18,6 +18,6 @@ FLTK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \
--sysconfdir=/etc --enable-shared --enable-threads --with-x
-FLTK_DEPENDENCIES = uclibc $(XSERVER)
+FLTK_DEPENDENCIES = uclibc xserver_xorg-server
$(eval $(call AUTOTARGETS,package,fltk))
\ No newline at end of file
diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index 2aaf7aa..2e4fda6 100644
--- a/package/games/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES
ACE_OF_PENGUINS_STAGING = NO
ACE_OF_PENGUINS_TARGET = YES
-ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER)
+ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng xserver_xorg-server
$(eval $(call AUTOTARGETS,package/games,ace_of_penguins))
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index b62e29c..d037adf 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -78,7 +78,7 @@ else
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
- CLASSPATH_DEPENDENCIES+= $(XSERVER)
+ CLASSPATH_DEPENDENCIES+= xserver_xorg-server
CLASSPATH_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 92ae4a6..750bfae 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -53,7 +53,7 @@ JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath
#Include X libraries when we have an X server
ifeq ($(BR2_PACKAGE_XORG7),y)
- JAMVM_DEPENDENCIES+= $(XSERVER)
+ JAMVM_DEPENDENCIES+= xserver_xorg-server
JAMVM_CONF_OPT+= --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index a578ae8..bb121f0 100644
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -86,7 +86,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
-libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
+libgtk12: uclibc libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12-clean:
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 5c9e542..3b85f63 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -91,7 +91,7 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--with-gdktarget=x11
- LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER)
+ LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server
else
LIBGTK2_CONF_OPT += --without-x
endif
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index d5d5bb7..6861165 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -16,7 +16,7 @@ METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--disable-dependency-tracking \
--disable-sm --disable-startup-notification
-METACITY_DEPENDENCIES = uclibc libgtk2 $(XSERVER)
+METACITY_DEPENDENCIES = uclibc libgtk2 xserver_xorg-server
$(eval $(call AUTOTARGETS,package,metacity))
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 805b028..6861d4c 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -11,6 +11,6 @@ MIDORI_AUTORECONF = YES
MIDORI_INSTALL_STAGING = NO
MIDORI_INSTALL_TARGET = YES
-MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy $(XSERVER)
+MIDORI_DEPENDENCIES = uclibc host-pkgconfig webkit libsexy xserver_xorg-server
$(eval $(call AUTOTARGETS,package,midori))
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 8cccae6..2bcebf3 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,20 +40,20 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+PANGO_CONF_OPT = --enable-shared --enable-static \
+ --enable-explicit-deps=no --disable-debug
+
+PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 cairo
+
ifeq ($(BR2_PACKAGE_XORG7),y)
- PANGO_CONF_OPT_X = --with-x \
+ PANGO_CONF_OPT += --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
+ PANGO_DEPENDENCIES += xserver_xorg-server
else
- PANGO_CONF_OPT_X = --without-x
+ PANGO_CONF_OPT += --without-x
endif
-PANGO_CONF_OPT = --enable-shared --enable-static \
- $(PANGO_CONF_OPT_X) \
- --enable-explicit-deps=no --disable-debug
-
-PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) cairo
-
$(eval $(call AUTOTARGETS,package,pango))
$(PANGO_HOOK_POST_INSTALL):
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index 63be0b8..e94fd77 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -38,7 +38,7 @@ $(RDESKTOP_DIR)/rdesktop: $(RDESKTOP_DIR)/.configured
$(TARGET_DIR)/usr/bin/rdesktop: $(RDESKTOP_DIR)/rdesktop
cp $^ $@
-rdesktop: uclibc openssl $(XSERVER) $(TARGET_DIR)/usr/bin/rdesktop
+rdesktop: uclibc openssl xserver_xorg-server $(TARGET_DIR)/usr/bin/rdesktop
rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk
index 1a0a826..14d08d2 100644
--- a/package/rxvt/rxvt.mk
+++ b/package/rxvt/rxvt.mk
@@ -65,7 +65,7 @@ $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt: $(RXVT_BINARY)
$(INSTALL) -m 0755 -D $^ $@
(cd $(@D); ln -fs rxvt xterm)
-rxvt: $(XSERVER) $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
+rxvt: xserver_xorg-server $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
rxvt-clean:
rm -f $(TARGET_DIR)$(X11_PREFIX)/bin/rxvt
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index b89f3cd..763e57b 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -14,6 +14,6 @@ SYNERGY_INSTALL_TARGET = YES
SYNERGY_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr --sysconfdir=/etc
-SYNERGY_DEPENDENCIES = uclibc $(XSERVER)
+SYNERGY_DEPENDENCIES = uclibc xserver_xorg-server
$(eval $(call AUTOTARGETS,package,synergy))
diff --git a/package/xpdf/xpdf.mk b/package/xpdf/xpdf.mk
index 1f09a9d..ab60b2b 100644
--- a/package/xpdf/xpdf.mk
+++ b/package/xpdf/xpdf.mk
@@ -18,7 +18,7 @@ ifeq ($(BR2_SOFT_FLOAT),y)
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
- XPDF_DEPENDENCIES += $(XSERVER) openmotif
+ XPDF_DEPENDENCIES += xserver_xorg-server openmotif
XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
--with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \
--with-freetype2-library=$(STAGING_DIR)/usr/lib CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" \
diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in
index eeef152..888367a 100644
--- a/package/xvkbd/Config.in
+++ b/package/xvkbd/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_XVKBD
bool "xvkbd"
+ depends on BR2_PACKAGE_XORG7
help
on-screen keyboard for X
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 510e3c4..d287809 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \
XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-XVKBD_DEPENDENCIES = uclibc $(XSERVER)
+XVKBD_DEPENDENCIES = uclibc xserver_xorg-server
$(eval $(call AUTOTARGETS,package,xvkbd))
--
1.6.0.4
^ permalink raw reply related [flat|nested] 17+ messages in thread