Commit Graph

381 Commits

Author SHA1 Message Date
Thomas Petazzoni
ef2c11e51a Remove unused X11_PREFIX option
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-28 00:30:26 +02: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
Thomas Petazzoni
ee363f5231 xkeyboard-config: add dependency on host-xapp_xkbcomp
In order to get xkeyboard-config to build, it needs xkbcomp to be
built on the host, i.e host-xapp_xkbcomp. In turn, xapp_xkbcomp needs
xlib_libX11 and xlib_libxkbfile, which in turn need a few libraries.

This commit adds all the relevant dependencies to build everything
that is needed to get xkeyboard-config to build correctly.

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
Thomas Petazzoni
ff15966c2e xlib_libXt: fix build issues
The .mk file was hacking the CC_FOR_BUILD value so that
$(STAGING_DIR)/usr/include is added to the include path. This is not
correct since $(STAGING_DIR) contains target stuff, not host
stuff. The correct fix is to add a dependency on host-xproto_xproto,
which will install the needed headers in $(HOST_DIR)/usr/include.

In addition to that, a patch is added to make xlib_libXt build system
behave properly in the cross-compilation case, where the makestrs tool
needs to be built on the host as part of the compilation process. This
was working before because of our quirky TARGET_CONFIGURE_OPTS, but
those are going to be fixed in a future commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-06 10:32:35 +02:00
Thomas Petazzoni
def6e3fd14 xcb-util: add dependency on host-gperf
gperf on the host is needed, since it is used by xcb-util to generate
a perfect hash function.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-06 10:32:35 +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
Paul Jones
d74be05226 xkeyboard-config: Depends on host-intltool
Closes #1813

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-08 22:40:41 +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
Paulius Zaleckas
b578f670d1 Remove locale dependency from xserver
XServer compiles just fine without locale support

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-28 22:00:42 +02:00
Peter Korsgaard
45ca86d4e9 libxcb: relax host-python regexp
Some python versions print x.y rather than x.y.z as version number, so
make regexp more robust.

Reported-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-10 22:18:44 +02:00
Peter Korsgaard
0d6068ae01 Merge branch 'misc-fixes2' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-08 00:09:11 +02:00
Thomas Petazzoni
e3963e90cc xlib_libX11: re-add a patch to fix the keysymdef issue
When xlib_libX11 was bumped to 1.3.2 in commit
1d956c9190, the keysymdef patch was
dropped. However, this patch is still needed in order to be able to
tell ./configure where the keysymdef header file is installed.

The patch has been updated for 1.3.2.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:28:59 +02:00
Thomas Petazzoni
4880edd506 libxcb: fix path to Python modules
When building libxcb, the variable XCBPROTO_XCBPYTHONDIR must point to
the location where the Python modules needed to run the c_client.py
program are installed. The path
$(STAGING_DIR)/usr/lib/python2.6/site-packages was hardcoded. However,
it doesn't work when the version of Python installed on the host is
Python 2.5.

Therefore, add a little bit of magic to compute the host Python
version.

We also verify that Python is available on the host, as we don't build
it in Buildroot.

Fixes bug #1531.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:28:33 +02:00
Thomas Petazzoni
803967499f xfonts: fix dependencies and build process
Instead of assuming that mkfontdir and mkfontscale are available on
the development system, use the one installed in $(HOST_DIR).

The FCCACHE variable is removed, because, for some reason, the
installation process of xfonts disables the call to fc-cache when a
DESTDIR is passed. See the definition of XORG_FONT_FCCACHE in
aclocal.m4 in font packages:

AC_DEFUN([XORG_FONT_FCCACHE],[
        AC_PATH_PROG(FCCACHE, fc-cache)
        FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"'
        if test x"$FCCACHE" = x ; then
                RUN_FCCACHE="${FCCACHE_WARN}"
        else
                RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else'
                RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)"
        fi
        AC_SUBST([RUN_FCCACHE])
])

In addition to this, we update the font dependencies to include
font-utils for the host, mkfontdir for the host, mkfontscale for the
host and bdftopcf for the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
3be79ce2a5 xapp_mkfontdir: enable for the host
When compiling xfonts, mkfontdir is needed for the host, therefore,
enable it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
a10439d3cd Enable xapp_bdftopcf dependencies for the host
Now that xapp_bdftopcf is enabled on the host, we also need its
dependencies to be available for the host. The dependency of
host-xapp_bdftopcf is host-xlib_libXfont, which itself depends on a
bunch of other packages. Some of them were already available for the
host, some not (xfont_encodings, xlib_xtrans, xproto_fontcacheproto,
xproto_fontsproto) and are therefore added by this patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
34fec71532 xapp_bdftopcf: enable for the host
Compiling xfonts require having bdftopcf installed on the
host. Therefore, enable host support for this package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:41 +02:00
Thomas Petazzoni
4a57f7d261 xfont_font-util: enable host package
When compiling xfonts, host utilities like bdftopcf or ucs2any, part
of xfont_font-util are needed. Until now, xfont_font-util was
installing ugly symbolic links, assuming that these tools were
available on the development machine.

This patch enables the host package for xfont_font-util, removes the
post-install.sh script, and keeps only the useful part of this script
in a post install hook.

host-xfont_font-util will be used later by xfont packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:41 +02:00
Paulius Zaleckas
ca218debd5 X11 OpenChrome driver depends on libxcomposite
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-03 20:13:14 +02:00
Thomas Petazzoni
593c18c0bb packages: remove useless HOST_*_LIBTOOL_PATCH
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-02 23:26:27 +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
Darius Augulis
20c59892f9 xda_xcursor-themes: depends on libXcursor
While at it convert spaces to TABs

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:15:13 +02:00
Paulius Zaleckas
f421f557f5 xlib_libXtst: depends on libXi
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-01 22:13:33 +02:00
Will Wagner
3aed796e78 X11R7.5 - remove all version information from Config.in files
As discussed on the list, don't want to have to change the Config.in
file when we bump the version of a package

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:54 +02:00
Will Wagner
e5b948a54e libXaw: do not build docs (fails if missing host tools), also cleanup makefile
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:48 +02:00
Will Wagner
84e5d7c772 Remove XEvIE (app & proto) as removed from X11R7.5
[Peter: remove select from xserver Config.in]
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:43 +02:00
Will Wagner
fca42cd645 Remove XFree86-Misc (lib & proto) as removed from X11R7.5
[Peter: also remove selects from affected Config.in's]
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:38 +02:00
Will Wagner
9638be1acf Remove XTrap (app, lib & proto) as removed from X11R7.5
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:32 +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
Will Wagner
b72cb51e0b xdriver_xf86-video-intel: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 22:10:18 +02:00
Will Wagner
ec0db92559 xlib_libXxf86misc: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 22:02:35 +02:00
Will Wagner
de6d1e532f xproto_evieext: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 22:00:41 +02:00
Will Wagner
9b02ce9e9d xkeyboard-config: bump version
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:59:09 +02:00
Will Wagner
e9f9ef7d67 xlib_libXfontcache: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:57:39 +02:00
Will Wagner
741d1cd4b0 xlib_libpciaccess: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:57:33 +02:00
Will Wagner
b7bf7f0077 xproto_xf86miscproto: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:57:22 +02:00
Will Wagner
24c2ca7841 xproto_fontcacheproto: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:50:57 +02:00
Will Wagner
864950c1a4 xproto_dri2proto: bump version
[Peter: remove version from Config.in help]
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:49:37 +02:00
Will Wagner
7e391f1622 pthread-stubs: bump version
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:44:01 +02:00
Will Wagner
23840f1f44 xlib_libXau: remove duplicate dependancies
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:42:46 +02:00
Will Wagner
828f6a056e correct name of xapp_xinput.mk
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:40:56 +02:00
Will Wagner
4e67ed412e mesa3d: bump version and convert to autotools
Note this version requires a recent kernel with KMS support as it is
currently configured

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-08 21:38:21 +02:00
Peter Korsgaard
a12ef5db91 xlib_libX11: don't build documentation
Closes #1387

The documentation step needs working groff and ps2pdf on the host, and
only slows down the build, so just disable it.

At the same time, cleanup the overlong _CONF_OPT line.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-31 12:16:15 +02:00