The additional autotooling patched into glew claims the version is 1.9.0
whilst we are building 1.12.0. The version in the autotooling is used to
set the version number in the pkgconfig file, this results in the
configuration of packages which depend on glew > 1.9.0 failing.
This patch updates the version number used in the patches to match that of
the version being built.
(From OE-Core rev: 0ef7c0f30456cc242de331b273b92c1dfe835350)
Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The Xorg libraries use REQUIRED_DISTRO_FEATURES to stop building on
distributions without the x11 feature but this stops people building native
tooling that uses libX11, such as libsdl-native.
(From OE-Core rev: f2970211690be3cb99ef7404f98010f3fecae45d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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: 66205c6096ce9d8bc828bf9b61d927cb495f69b1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
(From OE-Core master rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If there are multiple builds on the same machine then piglit writing it's
generated sources to /tmp will race. Instead, export TEMP to tell the tempfile
module to use a temporary directory under ${B}.
(From OE-Core rev: 226a26e51eb0789686509d3e22a3766e2e3e8666)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without an explicit license, cairo-script-interpreter inherits
the default LICENSE and isn't packaged in builds which blacklist
GPLv3.
(From OE-Core master rev: cb8f84218b065fed88a8c36f3c78065e8ab726bf)
(From OE-Core rev: 6d0cf8ebde4eaa2c868dac8d0dac498c4210ec05)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The Wayland support requires GLES2 to be enabled as otherwise the EGL support
code in SDL2 isn't enabled.
| In file included from .../SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.c:34:0:
| .../SDL2-2.0.3/src/video/wayland/SDL_waylandvideo.c: In function 'Wayland_CreateDevice':
| .../SDL2-2.0.3/src/video/wayland/SDL_waylandopengles.h:38:38: error: 'SDL_EGL_GetSwapInterval' undeclared (first use in this function)
| #define Wayland_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
Solve this by adding gles2 to the Wayland PACKAGECONFIG option.
(From OE-Core rev: 0f7f15ed02ec0f7b08b9ef62f6eca6c0c1e5a73f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch fixes a deadlock that occurs between the main
thread and rendering threads of the sharedtex_mt demo.
(From OE-Core rev: f3566af923a9559fa77c1fb0cd22557afb724835)
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The gettext 0.16.1 doesn't install any m4 files to sysroot, please see
the following commit:
commit 9e10db5bdf
Author: Christopher Larson <kergoth@gmail.com>
Date: Mon Mar 17 18:10:54 2014 +0000
gettext-0.16.1: kill target m4 macros from sysroot
This is aim for using gettext-native's macros(gettext-native-0.19.4),
but when we set:
PREFERRED_VERSION_gettext = "0.16.1"
And build the recipes like pcmanfm, we would get errors when
do_configure:
configure:5164: error: possibly undefined macro: AM_NLS
This is because autotools_copy_aclocals doesn't copy the native macros
for target unless they're direct dependencies.
Add gettext-native to DEPENDS will fix the problem.
(From OE-Core rev: 48c168334bb60937653ab782026948d139603f8e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The FE_DIVBYZERO is missing on nios2 , add a small patch to pixman
which checks for the presence of FE_DIVBYZERO and disables the test
which depends on it.
(From OE-Core rev: a88733677a6d809c2fca8dc5ec14c7cb4a869ea7)
Signed-off-by: Marek Vasut <marex@denx.de>
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 must have been a typo which is a bug infact we should have used
bitwise & in first place.
(From OE-Core rev: 697c6cba6a3d8d2b942c4758a115a063f65febe9)
(From OE-Core rev: f64a18a1c0fb9f3cd1bde2dc4b55d721ae06ca1d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.
(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specify a value via PACKAGECONFIG[gui]. The default is
--diable-event-gui.
(From OE-Core rev: d80babce1ed23f647d118ad4ce3860c0e9f6fec2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
No-update reasons and manual version checks should be in the recipes
themselves because otherwise they're prone to getting out of date.
(From OE-Core rev: b384345d9a693cbc3fd0dbeed9edd8c24618259d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
What I'm guessing is an updated systemd exposes less system headers, so
xf86-video-intel was using fstat() without the required includes.
Backport a patch from upstream to fix this problem.
(From OE-Core rev: 3f38c912384d7398516f689bc5934d36cbfdd4d0)
(From OE-Core rev: e3d182740355d9df206af01bc9ebff43a433f059)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
XvMC extends the X Video extension (Xv) and enables hardware rendered
motion compensation support. In a test build enabling this feature
increased the size of the xf86-video-intel package from 1386841 to
1847154 bytes.
When we enable the xvmc feature in xf86-video-intel we see the
following QA issue reported:
QA Issue: xf86-video-intel rdepends on xcb-util, but it isn't
a build dependency?
We fix this by ensuring the build dependencies are set correctly when
the xvmc feature is enabled.
(From OE-Core rev: 9f625c2e6cc5c42d047ad33d5354522c18f2d6b7)
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream, xz has been the only format for some time now, so let's
make it the default and adjust recipes that package old stuff.
(From OE-Core rev: 0f9ea90dde8f63aace19531e066580e41bf3d7cc)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The previous upstream is no longer available. Debian git repository
is one commit behind the original repository, so that commit is added
as a patch.
(From OE-Core rev: e7601797f2dee95f6658962f9aae4d9fb8d0689d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The original fix is upstream already so mark as a backport, and update the patch
with another race fix.
(From OE-Core rev: ab9d3c4e2bfb68d3a67a85d5a8e799216103978a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'vg' support should depends on virtual/libopenvg. There is no
provider for libvg in OE-Core so this option seems untested being safe
to change.
(From OE-Core rev: 1bb1e73200003703545ac7ec77b6b4c3b28e4fae)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Removed openvg references in PACKAGECONFIG, FILES and PACKAGES since OpenVG
support was removed in mesa 10.6
* Tested with X11 :
* xf86-video-freedreno on IFC6410 and DragonBoard 410c
* softpipe on DragonBoard 410c
* using meta-qualcomm BSP
(From OE-Core rev: 8c7803683bee780f0bc8913cc32653ff173329b7)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libinput uses pkg-config to check and decide whether to build
with libunwind, which causes undeterministic builds or error:
| tmp/work/core2-64-wrs-linux/libinput/0.18.0-r0/libinput-0.18.0/test/litest.c:77:23:
| fatal error: libunwind.h: No such file or directory
So add configure arg and PACKAGECONFIG for libunwind to make
deterministic build, but libunwind is disabled by default.
(From OE-Core rev: 3ffbceb4394a54c4b02fa66525b2a00832d4e7f1)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In commit a117fd5ecd,
from OE-Core rev: 88d60e70da0890184922056cef1f20171f716ace
"libdrm: Upgrade to 2.4.62" we managed to break X like this:
[3602662.736] (--) intel(0): Integrated Graphics Chipset: Intel(R) HD Graphics 4600
[3602662.736] (--) intel(0): CPU: x86-64, sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2
[3602662.736] (II) intel(0): Creating default Display subsection in Screen section
"Default Screen Section" for depth/fbbpp 24/32
[3602662.736] (==) intel(0): Depth 24, (--) framebuffer bpp 32
[3602662.736] (==) intel(0): RGB weight 888
[3602662.736] (==) intel(0): Default visual is TrueColor
[3602662.736] (EE)
[3602662.736] (EE) Backtrace:
[3602662.736] (EE) 0: /usr/bin/X (xorg_backtrace+0x49) [0x56ae09]
[3602662.736] (EE) 1: /usr/bin/X (0x400000+0x16ecd9) [0x56ecd9]
[3602662.736] (EE) 2: /lib64/libpthread.so.0 (0x3330600000+0x105e0) [0x33306105e0]
[3602662.736] (EE)
[3602662.736] (EE) Segmentation fault at address 0x0
[3602662.736] (EE)
Fatal server error:
[3602662.736] (EE) Caught signal 11 (Segmentation fault). Server aborting
A mix of a ~1 month old (working) image and the failing image led me
to determine /usr/lib64/xorg/modules/drivers/intel_drv.so was bad.
However nothing changed the parent package xf86-video-intel in
yocto for months.
So brute force bisecting yocto leads to the above commit. Inserting
libdrm as git and then bisecting the 2.4.59 --> 2.4.62 uprev content
leads to libdrm commit 8576527cfacaf42af8316e1030c192193e94225a
("intel: Merge latest i915_drm.h") -- specifically, the part of that
commit that adds __u64 flags to drm_i915_gem_mmap lands in our sysroot
and is used by the compile of xf86-video-intel.
With the specific trigger finally pinpointed, the final leap was to
correlate that trigger to the upstream xf86-video-intel commit that
accounts for the fallout of this libdrm header change, that we did
not yet have here. Fun times. Hopefully this complete description
here will ensure nobody else has to retrace these steps again.
Cc: Damien Lespiau <damien.lespiau@intel.com>
Cc: Neil Roberts <neil@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Steffen Pankratz <steffen.pankratz@elektrobit.com>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: c1df1da2a71aeb5956952e44c5f4ad669b6e770f)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current approach used by the Makefile ends up installing
weston.desktop twice and can give build failures when using
parallel make flags. Change to just have one DATA reference.
(From OE-Core rev: 5191ab6962712908e1aa1dca0d4253fb278366c2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The last commit introduced a build failure in the multilib case:
| WARNING: /media/data1/build1/poky/build/tmp/work/x86-pokymllib32-linux/lib32-builder/0.1-r6/temp/run.do_install.781:1 exit 1 from
| chown lib32-builder.lib32-builder /media/data1/build1/poky/build/tmp/work/x86-pokymllib32-linux/lib32-builder/0.1-r6/image/etc/mini_x/session.d/builder_hob_start.sh
so fix the chown to use the correct user.
(From OE-Core rev: 288c76a41aebaf54c7fca3782160830df462b9e4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When build lib32-builder, it would create the user lib32-builder which
was incorrect.
(From OE-Core rev: 8e1723eaa4c2dad4d02f7e18d05a1a3239f82ef1)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The scripts use argparse which is only in Python 3.2 onwards, so to avoid
failures on hosts using 3.0 or 3.1 just look for Python 2.
(From OE-Core rev: da889e86bac55178e06b6e2328ddf9415698fd79)
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Set glu_enabled when pkg-config detects GLU. This is needed so
that HAVE_GLU is properly set to enable the GLU based demos.
(From OE-Core rev: 72192d55cc6b213b6304dc805566c60a78d96b02)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae
Author: Valentin Popa <valentin.popa@intel.com>
Date: Tue Feb 18 13:32:16 2014 +0200
Subject: mesa: upgrade to 9.2.5
introduced this do_install_append, but doesn't explain why it doesn't
respect MESA_EGL_NO_X11_HEADERS flag anymore.
Not respecting MESA_EGL_NO_X11_HEADERS breaks any build which is using
qtdeclarative+egl in distribution which has x11 in mesa PACKAGECONFIG
(e.g. my bitbake world builds).
The problem is that qtdeclarative is using "None" symbol in
QSGTexture::Filtering enum, it's possible to rename it in qtdeclarative,
but it's quite invasive and changes qtdeclarative public APIs, see:
31aa85787a
so it was rejected by upstream and I don't want to maintain it in
meta-qt5 - changing public API in OE build is even worse than if upstream
does it.
* This change returns MESA_EGL_NO_X11_HEADERS flag so it's relatively
easy to resolve this conflict in such setups by preventing Xlib.h
inclusion.
(From OE-Core rev: 9c746017af381884cc20c7cd563fc429c2c66112)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is no ac_cv_file__usr_share_sgml_X11_defs_ent in configure, can't
find it in config.log after remove, either.
(From OE-Core rev: 27bd0a27a879cfc31062fbb2b1a04431d5541c55)
(From OE-Core rev: f63f6c9b28c5ffd7f391d7a657b7f43a9782a374)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix hb-coretext with trailing whitespace in right-to-left.
New API: hb_buffer_reverse_range().
Allow implementing atomic ops in config.h.
Fix hb_language_t in language bindings.
Misc fixes.
(From OE-Core rev: 64733935306d6b484db40b15e6e4938fbabf1d65)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
