Commit Graph

29 Commits

Author SHA1 Message Date
Saul Wold d429204867 libsdl: Backport xData32 patch for x11 update
(From OE-Core rev: afe343211c3f5d98717e7952e4d332d70a3b992a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-22 18:30:05 +01:00
Richard Purdie b1eff1365c libsdl: Fix ${B} != ${S} issues
Fix out of tree builds by remvoing cwd assumption.

(From OE-Core rev: 4a805f74b8a2ac5db27ed8f3c3232d2391a18842)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-18 13:18:25 +00:00
Otavio Salvador dde7a48135 libsdl: Use 'virtual/nativesdk-libx11' instead of hardcoding nativesdk-libx11
(From OE-Core rev: bb7a913e4a0da450cc85edfe0d8f80bdf4065fad)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-19 08:47:36 -08:00
Robert Yang cc1f50fca8 recipes-graphics: replace virtclass-native(sdk) with class-native(sdk)
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>
2012-11-02 16:18:29 +00:00
Denis 'GNUtoo' Carikli 72d7f8dc27 libsdl: fix inconditional alsa disabling.
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>
2012-10-23 12:28:33 +01:00
Richard Purdie ad23395cd1 nativesdk: Switch to using nativesdk as a prefix, not a suffix
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>
2012-09-02 05:52:06 -07:00
Kang Kai 3882f40e57 libsdl: update to 1.2.15
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>
2012-03-14 13:17:42 +00:00
Andreas Oberritter ce342127ff libsdl: add DirectFB support
* 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>
2012-03-08 11:55:34 -08:00
Paul Eggleton ef36dc896d libsdl: allow building without x11
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>
2012-02-24 17:01:45 +00:00
Koen Kooi 9d6d5e37ab libsdl 1.2.14: regenerate patch so it applies with 'patch' as well as 'git apply'
The '@@ -, +, @@' part upsets plain 'patch'

(From OE-Core rev: 949f4dc6f2bd59aa3e2c782fee87f07438aebd21)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-23 23:50:52 +00:00
Martin Jansa b2a84e717e libsdl: add fix for new _XGetRequest symbol backported to libx11
(From OE-Core rev: d2c96e22de19a649ff7121e5ea0f95797abba93a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-21 17:59:39 +00:00
Koen Kooi 32acddafc9 libsdl 1.2.14: fix packaging
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>
2011-12-19 12:17:58 +00:00
Saul Wold 6036845d1c Patch Upstream Status Updates
(From OE-Core rev: 0eb139619301d0efee330932eba3617dcb39284e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15 14:36:26 +00:00
Richard Purdie 4bdc8b6e37 libsdl: Disable pulseaudio explicitly
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>
2011-12-05 23:03:43 +00:00
Martin Jansa 9c8d335a1e libsdl: enable alsa based on PACKAGECONFIG and respect DISTRO_FEATURES
(From OE-Core rev: 6b1afd1d21a565b8cbb8e5c0579a1ba9299591f1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 13:51:01 +00:00
Martin Jansa e82ae04361 libsdl: replace tabs with spaces
(From OE-Core rev: 6912bd212cf91ead4c5f8c4e4bb86ceb15e414e1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 13:46:28 +00:00
Martin Jansa faf8832607 libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
* 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>
2011-11-29 13:46:28 +00:00
Martin Jansa ee58c9e709 libsdl: rename files dir to libsdl-1.2.14 for faster lookup
(From OE-Core rev: 7bbf48e86b468d31480738e09215b785d6a529a4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 13:46:28 +00:00
Martin Jansa 93ca5851a0 libsdl: drop unused files
(From OE-Core rev: 7783516fe7cb55a267110dc98a7595f34949390b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 13:46:27 +00:00
Kang Kai b4ac21c58a libsdl: update to 1.2.14
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>
2011-10-20 17:13:40 +01:00
Jiajun Xu 9a75040320 libsdl: do not inherit nativesdk
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>
2011-08-23 18:23:34 -07:00
Khem Raj a0dc330b4a recipes: Delete patch=1, its default and replace pnum with striplevel
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>
2011-08-23 18:23:30 -07:00
Jiajun Xu 92b2e942e1 libsdl: enable opengl for libsdl
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>
2011-08-15 15:26:20 +01:00
Jiajun Xu 9939c3664e libsdl: add target version
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>
2011-08-15 15:26:20 +01:00
Yu Ke 7b441c2f3f upstream status: add for libsdl and xserver patches
(From OE-Core rev: 8afcc3551be8d608a2082ab7da7a6bfdba490f15)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-26 15:48:59 +01:00
Saul Wold 0bed0db9db libsdl: add SRC_URI Checksums
(From OE-Core rev: fea759adc52456c890b245a458e9053e94e122d0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-28 10:45:42 +01:00
Koen Kooi 0e8f0f0a03 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
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>
2010-12-30 10:03:10 +00:00
Richard Purdie b089cf9a45 libsdl: Add LIC_FILES_CHKSUM
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-25 19:51:26 +00:00
Richard Purdie d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00