Use PACKAGECONFIG instead of using logic in DEPENDS and EXTRA_OECONF, adding new
options for PulseAudio, tslib, DirectFB, OpenGL and X11. Pass
--disable-x11-shared so that it links to the X libraries instead of using
dlopen().
Disable tslib by default as the kernel event input subsystem is generally used.
SDL's OpenGL support requires X11 so check for both x11 and opengl, and merge
the dependencies.
Finally enable native builds, with a minimal PACKAGECONFIG that will build from
oe-core for native and nativesdk.
(From OE-Core rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
configure_tweak.patch was simply adding arguments to AC_DEFINE which are only
needed by autoheader. We we now disable autoheader and use upstream's
config.h.in this patch isn't needed anymore.
(From OE-Core rev: 687e5ef86361a16d6c411386939d4ba96a5909ea)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The libglu requires both opengl (depends on virtual/libgl) and x11
(needs libGL.so which is provided by mesa when x11 in DISTRO_FEATURES),
so let libsdl depends on libglu when both x11 and opengl in
DISTRO_FEATURES.
(From OE-Core rev: b33e927096292f22f1bd9b2b0f633a6d645fc1eb)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch was incorrect, GLU depends on GLX (and so X) but you can build SDL
with X11 and without GL.
This reverts commit f744f0b18c.
(From OE-Core rev: d557edc559c8b77083edee2bd4178e24aaf5211c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Let it depend on libglu when x11 rather than opengl, since libglu can't
be built without x11.
(From OE-Core rev: 777080af697d35b3f983465d6a094f4171e57e56)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I used a for loop to build these packages more than 520 times, these
recipes never failed.
(From OE-Core rev: 7957c5bc2771a763d26e50e716733c6335cef3c2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rather than code which doesn't even work properly when cross compiling,
lets just use pkg-config instead. Its a little simpler.
(From OE-Core rev: b550572bdad318aed02230496721430eec89c937)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds a binconfig-disabled class which can be used by recipes where
a -config file is installed but we wish to disable it and just rely on
the .pc files instead.
Rather than simply deleting it, we make the script "exit 1" so that it
can be found in PATH and raise a build error rather than something
silently falling back to the build system for example.
Rather than randomly finding -config files, this adds in the
specification of a list of binconfig scripts which is more deterministic
and maintainable moving forward.
This patch converts various users in OE-Core to use this, a world build
of OE-Core tests out ok with this change. There will likely be issues in
other layers however, hence this being a RFT.
(From OE-Core rev: 5870bd272b0b077d0826fb900b251884c1c05061)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Configure checks for glu.h to determine if openGL is available.
(From OE-Core rev: a7641a2bc3f3f7e661f71b17f91382fb9a1cde55)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* another PRINC removed
(From OE-Core rev: 85db931054caa4dfb7bfca596558dcff4de286fc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
WARNING: QA Issue: nativesdk-libsdl: configure was passed unrecognised options: --disable-video-gem --disable-video-xbios --enable-dlopen --disable-debug --enable-endian
The gem and xbios options exist but their helptext is wrong and there
is no "video" in the name. This patch removes the now obsolete options
and corrects the names of the others to match reality.
(From OE-Core rev: 8cea5dd7d6804a8d739f5db6a5814ab6c802d538)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix out of tree builds by remvoing cwd assumption.
(From OE-Core rev: 4a805f74b8a2ac5db27ed8f3c3232d2391a18842)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: db1a03da3a6a6e7adb68e28883204adfaa8b3f47)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without that fix ALSA is inconditionally disabled,
reguardless of the fact that alsa is in the distribution
feature or not.
This patch has been tested on the om-gta04 target with both
alsa distribution feature enabled(libsdl can then play sound),
and disabled(it fails to play some sound trough alsa).
(From OE-Core rev: b635e47a2b8b711d5ddae3b3e5a5656402aee845)
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update libsdl to 1.2.15.
Patch add.XGetRequest.symbol.patch is merged by upstream, so remove it.
(From OE-Core rev: 94e18a1c574b97ba87724c0fea79d2af77ba4186)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Use conditional dependencies for DirectFB, like
it's already done for OpenGL and X11.
(From OE-Core rev: 29ba15af6b4a85687bd487779ec2ea2be80644dc)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable X11 output support for target and nativesdk if x11 is not in
DISTRO_FEATURES.
Fixes [YOCTO #2020]
(From OE-Core rev: 506e4c9b05d61f126fff112d7c111902d5c9fac5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
What we want, and how meta-oe used to do it:
libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
Current OE-core status:
libsdl_1.2.14-r2_armv7a.ipk
With this commit we get both proper shlib renaming and the -dev package now has all the dev files
(From OE-Core rev: ae4118a1f78f113c3d687c3aa6a86007cf977cae)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Its not listed in DEPENDS so should never have been built. We could
configure this as a configuration option and I'll take a patch for
that but I like deterministic builds so force it off for now.
(From OE-Core rev: 0a7a8597be05c8def8af58eecab49d963dc9d757)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* virtual/libsdl is used in sdl.bbclass but nothing was providing it
* rpath disabled because otherwise libtool and ld try to link against
${libdir}/libdl.so.2 on the host
(see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01)
(From OE-Core rev: e00897b93f09f86445af38858d4f61866cd1ce70)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update libsdl to 1.2.14
* update configure_tweak.patch
* update bb file, including add configure option --disable-video-ps3,
drop acinclude.m4 and kernel-asm-page.patch and remove old libtool macros
(From OE-Core rev: 4466055d83384fd12565e1de4e968330bff42ca2)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We already enable target version for libsdl and use BBCLASSEXTEND
to enable nativesdk. No need to inherit nativesdk then.
(From OE-Core rev: f3945cf1a9d33438afbcb28ee35edc10b9d047d9)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some place pnum=1 is used which is removed as well since
striplevel=1 is default
(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To enable opengl for libsdl, we need DEPENDS on virtual/libgl. Add a check for
"opengl" in DISTRO_FEATURES and when it's set, "--enable-video-opengl"
and "virtual/libgl" will be added into EXTRA_CONF and DEPENDS.
(From OE-Core rev: c28e62125209aa2e9606f094a4100ac1107fdd28)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rename libsdl-nativesdk to libsdl to enable target version. libsdl
is needed in some graphics testing.
(From OE-Core rev: 2d719f69676e9a64f7baf34f058441b887dfa14a)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Peter Kjellerstedt
Ross Burton
Alexander Kanavin
Robert Yang
Richard Purdie
Otavio Salvador
Koen Kooi
Martin Jansa
Saul Wold
Denis 'GNUtoo' Carikli
Kang Kai
Andreas Oberritter
Paul Eggleton
Jiajun Xu
Khem Raj
Yu Ke
Richard Purdie