Commit Graph

70 Commits

Author SHA1 Message Date
Yann E. MORIN
dd61213114 sdl: disable x11 in host-sdl
We do not need an X11-capable host SDL, so just disable X11 support.

This currently works if the build machine has the X11 development
packages installed.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-18 21:53:35 +02:00
Samuel Martin
8445501740 *.mk: replace (TARGET|HOST)_PATH by BR_PATH
Thanks to the 2 previous patches of the series, BR_PATH contains
all locations in which host-packages may install programs.

This patch replaces the occurrences TARGET_PATH and HOST_PATH with
BR_PATH, everywhere these variables are used in the *.mk files.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-16 19:28:56 +02:00
Maxime Hadjinlian
bfe884fac7 sdl: Fix host variant dependencies
The host variant of sdl inherited the dependencies and conf opt from
sdl which could lead to some trouble.

For example:
  If you were to build host-sdl and had alsa-lib enabled in your
  packages list, it would try to build host-alsa-lib which does not
  exists.

This patch define basic dependencies and conf opt for the host variant.

Reported-by: Eric Limpens <limpens@gmail.com>
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-27 23:38:10 +01:00
Peter Korsgaard
b108fdcb83 Merge branch 'next'
Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-28 14:30:23 +01:00
Peter Korsgaard
f4b54ed184 sdl: fix SDL_AUTORECONF typo in comment
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-23 20:58:47 +01:00
Fabio Porcedda
060623cfed sdl: add support for top-level parallel make
To be sure that host-autoconf dependency is already built move the
call to autogen.sh from SDL_POST_PATCH_HOOKS to SDL_PRE_CONFIGURE_HOOKS.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-22 21:18:27 +01:00
Maxime Hadjinlian
102f86e8d4 sdl: add host version
Host version is needed to build xbmc

[Peter: use _PRE_CONFIGURE_HOOKS like target version]
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-19 16:12:21 +01:00
Fabio Porcedda
f75b5de9f6 sdl: add support for top-level parallel make
To be sure that host-autoconf dependency is already built move the
call to autogen.sh from SDL_POST_PATCH_HOOKS to SDL_PRE_CONFIGURE_HOOKS.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-14 21:10:27 +01:00
Maxime Hadjinlian
8a66ebabff sdl: fix autoreconf timing issue
Context:
The autobuilders were failing on the symbol _XData32 being in conflicts.
A patch had been added to SDL to add a check to the configure.in

Problem:
Sometimes, the build would fail, because of an _XData32 symbol being in
conflicts eventhrough the patch was here.

What was happening:
Following the classic buildroot workflow:
   - Extract
   - [...]
   - Apply 001 patch, which touches configure.in AND configure
   - Apply 002 patch, which touches configure.in
   - Invoke autogen.sh
   - [...]

Right before running autogen.sh, we have configure.in which is more
recent than configure, which is fine.
We then, execute autogen.sh which, basically, runs autoconf.

If your machine was lighty loaded, the time difference between
configure.in and configure was really tiny (ms order), which seems to be
neglected by autoconf.
The results was that the configure was *NOT* generated. And our second
patch was not taken into account.

If your machine was under heavy load, the time difference between the
two files would have been greater and then *maybe* picked up by
autoconf. And then the configure file was re-generated.

When the 0001 patch was introduced, SDL package did *NOT* run it's
autogen.sh, which is why it touches also the configure.
This came later, causing this behavior.

Fixes:
  http://autobuild.buildroot.net/results/d1c/d1c36f634dbf6b6e5d18444c2a23dfd129202b80/

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-11 10:36:56 +01:00
Clayton Shotwell
755bed6635 sdl: Fix missing autoconf
Fixing an issue seen on the autobuilders with sdl failing to run the
autogen.sh script. Several of the autobuild issues are listed below.

http://autobuild.buildroot.net/results/7326631048bc9e15ffadc6f541f2235592b5259b/
http://autobuild.buildroot.net/results/0adf5ea64075323eba1183f93c16d2954673f3e1/

Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-10 15:00:48 +01:00
Vicente Olivert Riera
4f3f23a55f sdl: Fix compilation with libX11 >= 1.5.99.902
Applying an upstream patch to fix a compilation error with versions of
libX11 since 1.5.99.902. This patch modifies configure.in so we need to
run autogen.sh to make it working correctly. Running autoreconf will
fail because SDL uses bit tricky automake/autoconf configuration.

Upstream patch URL:
   http://hg.libsdl.org/SDL/rev/91ad7b43317a

Fixes:
   http://autobuild.buildroot.net/results/bf8/bf83466a7bbb0635d97fe279a18778d92f20bea2/

[Peter: add comment why we're doing this, add needed dependencies]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-09 16:22:32 +01:00
Vicente Olivert Riera
bb79b96472 sdl: rename patches to add sequence numbers
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-09 15:15:16 +01:00
Jerzy Grzegorek
5a57148657 fix header package name
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-07-27 15:21:03 +02:00
Jerzy Grzegorek
e0d9d33cc2 fix white spaces
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-20 21:13:57 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Danomi Manchego
181768f00c sdl: add license info
[Peter: License is LGPLv2.1+]
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-04 08:43:51 +02:00
Peter Korsgaard
1655f3c5b7 sdl: fix directfb configure check
The configure script nicely supports a preconfigured directfb-config
(using ac_cv_path_DIRECTFBCONFIG), except for when it checks the directfb
version where it simply uses whatever directfb-config is in the path,
breaking the build when this isn't available / recent enough.

Fix is to use the correct one instead. As SDL doesn't autoreconf cleanly,
also patch the generated configure script.

Finally move the ac_cv_path_DIRECTFBCONFIG setting under the directfb
conditional as it is only needed there.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-28 22:32:39 +02:00
Thomas Petazzoni
95da46dfd6 sdl: use <pkg>_CONFIG_SCRIPTS for sdl-config
Use the <pkg>_CONFIG_SCRIPTS mechanism to handle the sdl-config
script, so that it properly gets removed from the target. However, we
can't completely remove the manual fixup, because it also takes care
of removing the -Wl,-rpath option, which the general
<pkg>_CONFIG_SCRIPTS doesn't do.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-18 09:46:31 +01:00
Peter Korsgaard
042e0b54f9 sdl: use default autotools target-install
Fixes http://autobuild.buildroot.org/results/c950d7920d384cb0d37403cbe8344691d4231a1a

The normal 'make install' is perfectly fine, and it also works for static
builds.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-05 23:28:51 +01: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
9a9fdf9289 sdl: fix X11 dependencies
No need to build the entire X server to build SDL with X11 support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-08 11:42:56 +01:00
Peter Korsgaard
fc09aae5b4 sdl: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-07 23:27:58 +01:00
Peter Korsgaard
5aeca1f669 sdl: ensure mesa3d gets built before if enabled for opengl support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-07 23:21:53 +01: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
8a6f23a424 sdl: build alsa support if enabled
Ensure alsa-lib gets built before SDL if enabled, so the SDL configure
script correctly detects alsa support.

Noticed by Ayla on IRC.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-19 23:11:57 +02:00
Peter Korsgaard
668c357fec sdl: fix directfb driver build if host has directfb-config
Ensure our cross directfb-config is used, so the right linker paths
as passed to the compiler.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 22:18:35 +02:00
Peter Korsgaard
0be744e495 package: 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.

Notice: php not changed, as it uses a very old 1.5 version for the
embedded sqlite, where our buildroot-libtool-v1.5.patch doesn't apply.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-17 14:02:52 +01:00
Peter Korsgaard
869b11c8b5 dsl: disable ps3 video driver
The ps3 driver is enabled by default on ps3, but depends on spu support,
which most ppc toolchains don't have, so disable it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-17 10:45:31 +02:00
Thomas Petazzoni
66264b8755 sdl: fix build of other sdl components
The post installation hook of SDL was not being executed, due to an
incorrect usage of the infrastructure. Moreover, it did not patch
prefix/exec_prefix in sdl-config as is needed. In addition to that, we
remove the -Wl,-rpath option from sdl-config, since it is not needed.

This fixes at least the build of sdl_image, and probably of other sdl
components as well.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-17 00:09:35 +02:00
Peter Korsgaard
bb7593dfdb sdl: fix build without directfb after autotools conversion
Make sure --enable-video-directfb=no gets passed to configure
if directfb isn't enabled, so sdl doesn't try to link with the
host version instead (if available).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-25 12:25:57 +02:00
cmchao
cce342461a sdl : convert to autotools infrastructure & bump to 1.2.14
Changes by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 * Installation to target is the default
 * Remove SDL_EXTRA_CFLAGS, unused
 * Remove reference to SDL_DIRECTFB_INCLUDES, unused
 * Remove strip, done globally

Signed-off-by: cmchao <cmchao@gmail.com>
2010-06-24 13:51:10 +02:00
Julien Boibessot
48b628b861 sdl: needs tslib to be compiled first when selected.
If SDL is built before tslib, then SDL can't detect it at configure
time and so touchscreen's support in SDL is crappy.

Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-26 13:17:43 +01:00
Peter Korsgaard
351b679608 package/sdl: fix dependencies for directfb/qt/x11 support
Closes #683

And cleanup Kconfig while we're at it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-11-22 21:03:42 +01:00
Peter Korsgaard
3fdf0bffb8 buildroot: silence ./configure step when building with 'make -s'
We have been passing -q to ./configure when using 'make -s' for
packages using Makefile.autotools.in for some time. Do the same
for packages using autotools, but not using the
Makefile.autotools.in infrastructure, taking care to not do it
for packages with hand written configure scripts.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-01 21:24:42 +02:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
A C library will have been built by the toolchain makefiles, so there is no
need for packages to explicitly depend on uclibc.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-09-03 20:22:38 +02:00
Ulf Samuelsson
0496551eac Make sure ln command does not break if link exist 2009-01-22 07:51:28 +00:00
Peter Korsgaard
4a7bfd2775 package/: convert to DOWNLOAD helper 2009-01-16 11:42:52 +00:00
Ulf Samuelsson
0a63b6ce56 Make sure SDL finds DirectFB headers ,if used 2009-01-11 20:24:24 +00:00
Peter Korsgaard
ac1d92c425 package/: get rid of unneeded $(strip ..) 2008-12-08 08:15:27 +00:00
Peter Korsgaard
4683420c4c Kconfig: remove 'default n'
'default n' is the default, so there's no need to say it explicitly.
2008-07-17 20:01:44 +00:00
Peter Korsgaard
a5ac61715b buildroot: s/depends/depends on/
The new kconfig is more strict regarding depends/depends on, so fixup
the tree.
2008-06-19 19:06:25 +00:00
Peter Korsgaard
2e5685b3a8 sdl: Fix include files install.
Patch sdl-config rpath setting rather than setting exec-prefix and
using DESTDIR as the SDL makefile uses prefix for some files,
and exec-prefix for others leading to double $(STAGING_DIR) prefix.
2008-03-17 16:39:03 +00:00
Peter Korsgaard
5f6726bdfd sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib 2008-03-07 13:31:24 +00:00
Peter Korsgaard
37fd644ab7 sdl: bump version 2008-03-07 13:31:16 +00:00
Peter Korsgaard
5ca52f571b sdl: remove unused legacy patch 2008-03-07 13:31:11 +00:00
Peter Korsgaard
0dc5a8d6fc sdl: remove wrong comment 2008-03-07 13:31:07 +00:00
Ivan Kuten
76d37d1048 correct paths in sdl-config 2007-11-16 15:35:14 +00:00
Ivan Kuten
5d48d2cd12 update SDL to 1.2.12, allow video driver selection 2007-11-16 12:37:23 +00:00
Bernhard Reutner-Fischer
14a71561a3 - just use the strip binary to avoid confusing libtool (quotes)
- use $(STRIPCMD) in packages to avoid clashes with $(STRIP)
2007-10-01 16:15:31 +00:00
Ulf Samuelsson
1e5e164a9b Use correct library path for SDL 2007-09-23 09:53:43 +00:00