Commit Graph

61 Commits

Author SHA1 Message Date
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
Gustavo Zacarias
019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Valentine Barshak
50c0a71d3a x11r7: xserver_xorg-server: Amend record proto selection
Record proto is not really required. It can be disabled.

Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-25 20:31:20 +02:00
Peter Korsgaard
51b990b09f xserver_xorg-server: needs record proto
Fixes http://autobuild.buildroot.net/results/0ab69c80b3e5e95a8947c32231d32da895deca60

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-25 11:30:56 +02:00
Simon Dawson
21a5f16edb xserver_xorg-server: fix dbus/udev configure problem
If both the dbus and udev packages are selected, then the configure step
for the xserver_xorg-server package fails as follows.

  configure: error: Hotplugging through both libudev and dbus/hal not allowed

The configure script no longer allows both the --enable-config-dbus
and --enable-config-udev options to be specified.

This patch changes the xserver_xorg-server makefile to use udev in preference
to dbus, when both are available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-23 20:53:30 +02:00
Peter Korsgaard
759d548e3e xserver_xorg-server: bump version
Based on patch by Allan W. Nielsen.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-22 21:34:39 +02:00
Ismael Luceno
f47d199ff8 xserver_xorg-server: Xvfb support
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-22 13:48:10 +02:00
Thomas Petazzoni
30d2b422e5 xserver_xorg-server: add upstream patches to fix build issue
Fixes the following build issue with gcc 4.6:

  LINK  Xfbdev
.../host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.6.1/../../../../arm-none-linux-gnueabi/bin/ld: ../../../os/.libs/libos.a(backtrace.o): undefined reference to symbol 'dladdr@@GLIBC_2.4'
.../host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.6.1/../../../../arm-none-linux-gnueabi/bin/ld: note: 'dladdr@@GLIBC_2.4' is defined in DSO .../host/usr/arm-unknown-linux-gnueabi/sysroot/lib/libdl.so.2 so try adding it to the linker command line
.../host/usr/arm-unknown-linux-gnueabi/sysroot/lib/libdl.so.2: could not read symbols: Invalid operation

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-25 18:23:34 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Peter Korsgaard
920544e02b xserver-xorg: fix build when Xtst isn't available
The optional DMX support (Distributed Multihead X) needs Xtst, which
may or may not be available in the buildroot config. DMX is unlikely
to be needed for a BR system, so simply disable it rather than
forcibly requiring Xtst.

Fixes http://autobuild.buildroot.org/results/df990ded6472de62132e3a089634fafe0e029107/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-19 08:55:47 +02:00
Thomas Petazzoni
42a28105f1 x11r7: AUTORECONF=NO is the default, remove
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-05 20:23:33 +02:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Peter Korsgaard
b96193a4b5 xorg-xserver: configure needs pkg-config
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-25 08:44:26 +02:00
Gustavo Zacarias
723f276ffd xorg-server: point localstatedir to /var
We don't want logs to end up in /usr/var/log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-10 14:38:58 +01:00
Peter Korsgaard
68f166074b package/x11r7: apply libtool patch where possible
Now that we have libtool-2.2.x patch support, we can get rid of a bunch
of _LIBTOOL_PATH = NO, fixing (potential) cross link issues.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-17 13:56:10 +01:00
Matt Johnson
936be892dd xserver-xorg: fix CFLAGS
Ensure we just append to TARGET_CFLAGS, instead of overriding it.

Signed-off-by: Matt Johnson <mj1856@hotmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-27 22:23:49 +01:00
Peter Korsgaard
69a8991bdc xserver-xorg: enable glx support if mesa3d is enabled
Closes #2533

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-07 21:02:38 +01:00
Paulius Zaleckas
1bc5b0bdf1 Create X symlink for TinyX
When installing TinyX to target create /usr/bin/X symlink
to Xfbdev as it is the only TinyX driver we build.
This makes utils like startx happy :)

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:26:29 +01:00
Thomas Petazzoni
5f71fc1f19 Remove support for shared configuration cache
The configuration cache shared between packages, while being in
principle a nice idea to speed-up the configuration of packages by
avoiding repetitive identical checks, turned out to be unreliable due
to the subtle differences between similar but not identical checks in
different packages. After spending some time trying to fix those, we
concluded that supporting the shared configuration cache is definitely
too hard and too unreliable, and that we'd better get rid of it
altogether.

This patch therefore removes the shared configuration cache
infrastructure and usage.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:21:17 +01:00
Thomas Petazzoni
a43e7e798c xserver: Add xkeyboard-config as a dependency
xkeyboard-config is required to install keymap files to the target,
without which the X server does not start.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:15 +02:00
Thomas Petazzoni
fb04640649 xserver: tell the X server where fonts are installed
All fonts are installed in /usr/share/fonts/X11 and not in
/usr/lib/X11/fonts/ where the X server looks by default.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:14 +02:00
Peter Korsgaard
c03cab1430 xserver-xorg: disable SDL kdrive server
Otherwise the build breaks if the SDL package is enabled, as xserver's
configure script detects SDL support, but doesn't find our sdl-config
script, so linking fails.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-24 20:34:03 +02:00
Peter Korsgaard
8bbf552993 xserver: dri support is only for the modular server
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-21 09:53:51 +02:00
Peter Korsgaard
fd5b0dc8fe xserver: libdrm is not needed for tinyx
libdrm is only needed for the modular server, and as libdrm
needs largefile support and tinyx doesn't, this dependency could
cause a build failure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-20 23:29:42 +02:00
Peter Korsgaard
7be1fd6c68 xserver: libpciaccess is not needed for tinyx
libpciaccess is only needed for the modular server, and as libpciaccess
needs largefile support and tinyx doesn't, this dependency could
cause a build failure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-20 16:07:12 +02:00
Peter Korsgaard
09b36fc064 xserver_xorg-server: fix _MAKE typo
The variable should be XSERVER_XORG_SERVER_MAKE, not .._XSERVER_MAKE.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-01 10:02:48 +02:00
Peter Korsgaard
41c49b3c9f xserver_xorg-server: Use $(MAKE1) for make install
Xserver installation fails with parallel make jobs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-30 20:13:45 +02:00
Peter Korsgaard
7f1bca8479 Revert "xserver_xorg-server: Use $(MAKE1) for make install"
This reverts commit b7acacaf6e.

Closes #1855

We DO need to install into staging for all the xdriver-* packages,
so revert this commit.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-30 20:12:52 +02:00
Paulius Zaleckas
b7acacaf6e xserver_xorg-server: Use $(MAKE1) for make install
Xserver installation fails with parallel make jobs.

Installation to staging is not needed. So just remove it
instead of converting to $(MAKE1).

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-28 22:47:52 +02:00
Darius Augulis
494149b989 Make Mesa3D optional for X11
[Peter: XF86DRIPROTO should only be selected if mesa is enabled]
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-01 22:19:26 +02:00
Will Wagner
09729b5e63 xserver_xorg-server: bump version, improve option support
Later version of xserver no longer need configure hack to say where
mesa3d is located.

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-22 12:26:09 +02:00
Paulius Zaleckas
a43dcbbccd Bump xorg-server to 1.7.1
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
2010-02-28 11:33:37 +02:00
Thomas Petazzoni
2831a05d03 xorg: bump X.org server version to 1.5.3
This version contains a fix to allow the compilation of the Xvesa
server against recent versions of the kernel headers (fix
http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.5-branch&id=992a7168f0db5733fe4a6cbd2f40c6b1f2a150e0)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-28 10:05:17 +02:00
Thomas Petazzoni
ae8bbdf891 xorg server: remove dependencies
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>
2009-07-24 23:26:47 +02:00
Thomas Petazzoni
2d8153655c xorg server: beautify list of dependencies
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>
2009-07-24 23:26:46 +02:00
Peter Korsgaard
9c3542dfc7 xserver-xorg: libXtst not needed 2009-03-16 15:48:29 +00:00
Peter Korsgaard
1fe300010f xserver-xorg: set buildroot mailing list as builder addr 2009-03-16 15:48:21 +00:00
Peter Korsgaard
17b803cd30 xserver-xorg: more optional dependencies 2009-03-16 15:48:14 +00:00
Peter Korsgaard
c1c9f90757 xserver-xorg: dbus is optional 2009-03-16 15:48:07 +00:00
Peter Korsgaard
3e872797d0 xorg_server: cleanup .mk
Rearrange lines and get rid of unneeded variables. Should have no functional
change.
2009-03-16 15:47:44 +00:00
Peter Korsgaard
59b0aa7a7e x11r7: update to 7.4
Patch by Dan Lykowski <lykowdk@gmail.com>, closes #181.

Minor fixups for kdrive by me.
2009-03-14 14:59:14 +00:00
Peter Korsgaard
b05b875995 xserver_xorg: add options for builtin fonts and aiglx
Patch by Dan Lykowski <lykowdk@gmail.com>
2009-03-13 19:46:03 +00:00
Peter Korsgaard
53b07783da x11r7/xserver_xorg: breaks with shared cache
The package overrides CFLAGS, so disable shared cache.
2008-12-22 22:10:30 +00:00
Peter Korsgaard
ac1d92c425 package/: get rid of unneeded $(strip ..) 2008-12-08 08:15:27 +00:00
Peter Korsgaard
14717272be x11r7/xserver: bump version 2008-10-21 19:44:57 +00:00
Peter Korsgaard
e337d002fe package/: remove redundant install-strip in *_TARGET_INSTALL_OPT
It's default now.
2008-10-20 11:53:16 +00:00
Peter Korsgaard
b0457a0ab7 x11r7/xserver: use install-strip for target install 2008-10-19 21:49:02 +00:00
Hans-Christian Egtvedt
497f55fb21 xserver_xorg-server: fix missing backslash on end of CONF_OPT
This patch adds a missing backslash on a line in the middle of the list of
XSERVER_XORG_SERVER_CONF_OPT.

Reported-by: Sebastian Matuschka <Sebastian.Matuschka@gcd-solutions.de>
2008-09-30 07:32:52 +00:00
Hamish Moffatt
84b4e00774 Applied patch from Michel Wilson to allow the cursor in the X root window to
be disabled. Unfortunately this is a compile-time option.
2008-09-10 13:16:23 +00:00
Peter Korsgaard
4dffbc8760 xserver: fix typo 2008-07-01 11:46:50 +00:00