Commit Graph

710 Commits

Author SHA1 Message Date
Thomas Petazzoni
cb8895ceff xserver_xorg-server: provide more options for SHA1 library
Until now, the X.org server was forcefully selecting OpenSSL, just to
have a SHA1 implementation. However, in fact, the X.org server is
capable of using a SHA1 implementation from multiple libraries:
OpenSSL, libgcrypt and libsha1 amongst others.

So, this patch changes the X.org server package so that we use the
SHA1 functions from OpenSSL is OpenSSL is already available, or the
SHA1 functions from libgcrypt is libgcrypt is already available, or if
neither OpenSSL nor libgcrypt are enabled in the configuration, we
select the much smaller libsha1, that has been specifically written to
fulfill the X.org server requirements.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:39:27 +01:00
Thomas Petazzoni
b6de4b198e xlib_libX11: split the DEPENDENCIES variable on multiple lines
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:36:12 +01:00
Thomas Petazzoni
0a0330a582 xlib_libX11: do not depend on bigreqsproto nor xcmiscproto
The BR2_PACKAGE_XPROTO_BIGREQSPROTO option was selected by
xlib_libX11, but xlib_libX11 does not have this protocol package in
its DEPENDENCIES. In some builds, it leads to xproto_bigreqsproto to
be built as the last package, with no other package depending on it,
which doesn't make sense.

xproto_xcmiscproto was selected and part of DEPENDENCIES, but an
inspection of libX11 configure.ac and libX11 source code shows that it
does not depend on xcmiscproto at all.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:35:32 +01:00
Thomas Petazzoni
3679abe0a3 x11r7: do not globally select libraries
It doesn't make sense for BR2_PACKAGE_XORG7 to globally select
libraries such as libpng, zlib, expat or fontconfig. For example, if
you do a build with just xlib_libX11, then libpng gets built as the
last package, without anybody actually depending on it, even if it was
selected by BR2_PACKAGE_XORG7.

The individual x11r7 packages should select the libraries they need,
and add them in their DEPENDENCIES variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:34:37 +01:00
Thomas Petazzoni
1cd8be320c xserver_xorg-server: add more explanations about the two variants
[Peter: adjust help text according to Arnout's comments]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:32:56 +01:00
Thomas Petazzoni
924f36de1a xserver_xorg-server: option to build KDrive input drivers
When the Kdrive variant of the X server is selected, the drivers are
directly built into the X server. The X server therefore provides
options to enable or disable certain drivers, especially input
drivers.

This patch adds options to be able to enable or disable the evdev, kbd
and mouse drivers of Kdrive.

[Peter: fix Config.in indentation as pointed out by Arnout]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:20:38 +01:00
Thomas Petazzoni
73a84a6972 xserver_xorg-server: rename server-style configuration options
The BR2_PACKAGE_XSERVER_xorg and BR2_PACKAGE_XSERVER_tinyx options
used to select the style of X.org server to use are not named
consistently with the rest of the Buildroot options (in capital
letters and prefixed with the package name).

Therefore, we rename those options, and we take care to add the old
option names in the BR2_LEGACY infrastructure.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:13:29 +01:00
Thomas Petazzoni
208a81be5b xserver-xorg_server: Mention that TinyX is also known as Kdrive
Since several years, the TinyX name has been somewhat deprecated in
favor of Kdrive, so mention the "Kdrive" wording in our configuration
interface.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:13:17 +01:00
Thomas Petazzoni
50ca9a88a7 x11r7: fix indentation
Fixup the indentation when including the X.org server Config.in to
match all the other inclusions in x11r7/Config.in.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:12:22 +01:00
Thomas Petazzoni
88d66054ed x11r7: remove useless depends on of X.org drivers
All X.org server drivers are already enclosed in a if
BR2_PACKAGE_XSERVER_xorg .. endif block. Now that this option is only
set if a X.org server is enabled, there is no need for each individual
driver to depend on BR2_PACKAGE_XSERVER_XORG.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:12:16 +01:00
Thomas Petazzoni
940fcba1a5 x11r7: move X.org server style option
The selection between "modular" server and "Kdrive" server really
belongs as a sub-option of the X.org server itself, rather than as a
global x11r7 option. So we move it under the X.org server option.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-09 00:12:09 +01:00
Peter Korsgaard
698cd0a0f4 package: fixup after pthred-stubs rename
Commit 5bd41d165 (pthread-stubs: rename to xlib_libpthread-stubs) renamed
the pthread-stubs package but forgot to update the select statements.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-06 11:16:23 +01:00
Gustavo Zacarias
66bfe1d4fe xdriver_xf86-video-sunffb: remove package
The FFB was an old SBUS video card used in Sun SPARC workstations
from the 90s.
Highly unlikely a target for buildroot.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 14:34:48 +01:00
Gustavo Zacarias
b1bee2a288 xdriver_xf86-video-suncg6: remove package
The CG6 was an old SBUS video card used in Sun SPARC workstations from
the 90s.
Highly unlikely a target for buildroot.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 14:34:46 +01:00
Thomas Petazzoni
c02a49ce19 xdriver_xf86-video-xgixp: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:22 +01:00
Thomas Petazzoni
b2decde6b6 xdriver_xf86-video-xgi: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:18 +01:00
Thomas Petazzoni
cfbb36a972 xdriver_xf86-video-tseng: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:15 +01:00
Thomas Petazzoni
2d34c909f8 xdriver_xf86-video-suntcx: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:12 +01:00
Thomas Petazzoni
8015b1fac4 xdriver_xf86-video-sunleo: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:09 +01:00
Thomas Petazzoni
01eeab0c4b xdriver_xf86-video-suncg3: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:06 +01:00
Thomas Petazzoni
25e06814d1 xdriver_xf86-video-suncg14: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:43:03 +01:00
Thomas Petazzoni
5d2810b381 xdriver_xf86-video-sisusb: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:42:59 +01:00
Thomas Petazzoni
43e95a4e19 xdriver_xf86-video-s3virge: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:42:48 +01:00
Thomas Petazzoni
5bbdbacad8 xdriver_xf86-video-s3: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:42:45 +01:00
Thomas Petazzoni
2601c7f721 xdriver_xf86-video-rendition: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:27:03 +01:00
Thomas Petazzoni
6ced399048 xdriver_xf86-video-i740: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:58 +01:00
Thomas Petazzoni
0de14499a1 xdriver_xf86-video-chips: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:53 +01:00
Thomas Petazzoni
cd09ff8da0 xdriver_xf86-video-apm: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:48 +01:00
Thomas Petazzoni
0b0a9b258c xdriver_xf86-input-aiptek: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:40 +01:00
Thomas Petazzoni
6fd3e597c8 xdriver_xf86-input-acecad: remove package
This X.org driver has been removed from upstream X.org releases and is
related to a very specific type of hardware that isn't likely to be used
in a Buildroot context.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:38 +01:00
Thomas Petazzoni
5bd41d165e pthread-stubs: rename to xlib_libpthread-stubs
In upstream X.org releases, pthread-stubs is named libpthread-stubs,
so for consistency reasons, we rename the Buildroot package
accordingly. Also, while we're at it, we add a xlib_ prefix to the
package to match other X.org libraries in Buildroot.

The necessary Config.in.legacy code is added to ensure that users
having .config files using the old configuration option name get a
warning.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 13:26:14 +01:00
Peter Korsgaard
0b7a34d43f Revert "xlib_libXft: fix xft-config"
This reverts commit 1a1009931f.

Fixes http://autobuild.buildroot.net/results/e8c00cf5ec1e3829cd9013710bb1961d9c226c34

xlib_libXft hasn't provided an xft-config script since 2010.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-05 00:30:39 +01:00
Stefan Fröberg
1a1009931f xlib_libXft: fix xft-config
[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-04 22:47:51 +01:00
Thomas Petazzoni
9fb388c677 xapp_xman: replace := by =
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-02 20:31:14 +01:00
Thomas Petazzoni
fbe02c0937 xapp_xinput-calibrator: rename directory to match .mk name
The directory was named xapp_xinput_calibrator, but the .mk file was
named xapp_xinput-calibrator.mk, which isn't consistent. Rename the
directory to xapp_xinput-calibrator to be consistent with the naming
of the .mk file and the other x11r7 directories.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-02 20:28:27 +01:00
Thomas Petazzoni
42bc7af2e2 xcb-util-keysyms: new package
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-12-30 07:21:59 +01:00
Thomas Petazzoni
695edcbabe xserver_xorg-server: fix build on AArch64
Fixes the following build issue:

Making all in fb
  CC     libfb_la-fb24_32.lo
In file included from fb24_32.c:30:0:
fb.h:98:2: error: #error "GLYPHPADBYTES must be 4"

See:

 http://autobuild.buildroot.org/results/9135238abcde29918f8cb61002f1fb9279884a47/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-28 22:45:47 +01:00
Peter Korsgaard
e10cfb1e76 package: remove explicit --disable-doc* passing
Now that it is handled globally (pkg-infra: pass --disable-doc if
documentation is not enabled).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-12 21:20:22 +01:00
Thomas Petazzoni
7e099a6da8 xapp_xmh: add dependency on xdata_xbitmap
Fixes:

  http://autobuild.buildroot.org/results/fa059a89a305914700f63d7f0b0d4a3f63beb039/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-09 21:56:23 +01:00
Peter Korsgaard
cceda0efea xlib_libX11: disable nls compose overview generation
Perl is only used to generate compose overview documentation.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-03 22:55:02 -08:00
Peter Korsgaard
440750207d xproto_xcmiscproto: only build specs if explicitly requested
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-03 18:35:28 -08:00
Peter Korsgaard
73bf02320e xproto_xextproto: only build specs if explicitly requested
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-03 18:34:04 -08:00
Peter Korsgaard
9e5a4b26a2 xlib_xtrans: only build documentation if explicitly requested
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-03 18:28:21 -08:00
Peter Korsgaard
68cdb5e2d7 xlib_libXdmcp: only build documentation if explicitly requested
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-03 18:20:25 -08:00
Vellemans Noel
517e5395a1 mesa3d: requires host-libxml2 and host-python to generate some files
mesa3d now generates some C files at build time (related to the OpenGL
API) from XML files. This generation process is done using Python
scripts that require the libxml2 Python module.

Patch based on the initial work of Will Wagner (Thanks Will).

Signed-off-by: Vellemans Noel <noel.vellemans@visionbms.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 23:41:45 +01:00
Thomas Petazzoni
56fc639584 xapp_xvidtune: bump version to 1.0.2 to fix Xmu related build failure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 09:14:31 +01:00
Thomas Petazzoni
2327d04ec6 xapp_xmh: bump version to 1.0.2 to fix Xmu related build failure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 09:14:28 +01:00
Thomas Petazzoni
d8da7ab30e xapp_xlogo: bump version to 1.0.4 to fix Xmu related build failure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 09:13:35 +01:00
Thomas Petazzoni
2ec8bf1235 xapp_xload: bump version to 1.1.1 to fix Xmu related build failure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 09:13:31 +01:00
Thomas Petazzoni
0a4f38f1d9 xapp_xfd: bump version to 1.1.1 to fix Xmu related build failure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-17 09:12:51 +01:00