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>
71158fa1a623125[fix floating dependence on freeglut] is incomplete,
so continue by removing glut.h header file when not enable freeglut
(From OE-Core rev: e53d09e265a217928e1436208e0f9057aa8ef7ae)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
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>
* 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>
* Update test TAP output patch
(From OE-Core rev: 3926c63c027d932abcb9deafde7c83ea3b9f1907)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Backport patch that fixes build with GLES2
(From OE-Core rev: 9d38fb232deaa2e7e46d3c442d1598e13bba9c0a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ncurses have already provided clear,so rename it to clear.mesa-demos.
[ RB - check that clear exists before moving ]
(From OE-Core rev: a9c174fd4bfabbae00d947738b06e72d7809eab3)
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The git recipe hasn't been touched since 2012 and is out of date, so simplify
the recipe by removing the git form and merging the remaining bb and inc file.
(From OE-Core rev: f71909f5eacc23d8533f1860ab890892d4f93f29)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
By passing --disable-scanner to use a native wayland-scanner binary a target
wayland-scanner binary isn't built, which is a problem if you want to use it on
the target or in a SDK.
Instead, always build a target wayland-scanner binary, and have an option to
control whether that binary or a host-provided binary is used at build time.
[ YOCTO #7931 ]
(From OE-Core rev: 7aeeaf287169d4d7de5349626caa93a3941c2c35)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes warnings such as:
WARNING: mesa: invalid PACKAGECONFIG: r600
when building with the r600 configuration.
(From OE-Core rev: 430dd1437a4196c11973cf9ef0d2dad1f2063a7f)
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>
Upgrade is also required for wayland/weston 1.8.x
libinput license changes are
- COPYING: note that having linux/input.h in the tree does not make libinput GPL
- Updated to 2015 where appropriate, added where missing.
- filter: add Simon's copyright
This code was largely lifted from the X server in
bb25b2ad297891430606c367bfabc but didn't take the copyright messages
that applied to that code.
- Change MIT X11 to MIT Expat license
see
http://cgit.freedesktop.org/wayland/libinput/commit/?id=bc9f16b40e23a1d25c105a4207b97d65253f0d98
(From OE-Core rev: c06b0743115d1ae75302679d8f5dfe0c88069b91)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop upstreamed patch
backport portablility fixes from upstream
Add a fix to not use io function on ARM they dont work
(From OE-Core rev: d70678477f142eb90c6bba6631e7485d6fe20fbf)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes CVE-2015-3164 in Xwayland.
Remove unnecessary patches:
* fix_open_max_preprocessor_error.patch is no longer needed:
OPEN_MAX is defined in every case now
* xorg-CVE-2013-6424.patch was handled in pixman several releases ago
* other removed patches are included in 1.17.2
(From OE-Core rev: 1d35231d666baee9ac4aaeb482371f3c71998c76)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cmake can not handle "ifdef" and make floating dependence on freeglut_ext.h
when make_depend, so remove to include freeglut_ext.h from header file if
freegult is not in PACKAGECONFIG to fix this issue
(From OE-Core rev: 71158fa1a623125dae82c64c27e81dcdb2369e2d)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use $libexecdir and $libdir as appropriate so the files are packaged correctly
when libexecdir != $libdir/$BPN.
(From OE-Core rev: a5dc3bf1dc4a65b748c32344570dc4faf381f201)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The EGL tests rely on Xutil.h being included. Some EGL implementation
does not explitly include it by default and than the build fail.
This fixes the build in imx53qsb board, of meta-fsl-arm, but is a
generic fix.
(From OE-Core rev: 8fe5ca4c6ed49f3f4b0dc67d0932e010bc32051b)
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>
The way this code was working, the m4 file is hardlinked to the
copies which would be packaged and could lead to the native m4
file being used in the target packages.
By removing the file first the hardlink is broken and this avoids
corruption (since cp uses open to change the file contents).
(From OE-Core rev: 8f3be1925b9da20526a722149b03f697247ea1bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to 126c7d from December 2014. Still not the latest but it's got no
added build dependencies and importantly handles installs out of the box instead
of us having to hack and kludge, and builds with cmake 3.x.
The usage has changed: now there's a "piglit" binary that has run/resume/summary
subcommands, for example:
$ piglit run quick quick-results/
For reference the quick test suite on a IvyBridge NUC results in:
[27714/27714] crash: 3, fail: 326, pass: 18275, skip: 9107, warn: 3 -
(From OE-Core rev: 562c8907d6afcf50695f8964cdebd05fc1085742)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When falling back to the VESA server, X fails to start due to an error
reading the int10 vec.
We cherry-pick the following commit to fix the error:
commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
Author: Jürg Billeter <j@bitron.ch>
Date: Sat Feb 7 18:13:21 2015 +0100
int10: Fix error check for pci_device_map_legacy
pci_device_map_legacy returns 0 on success.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(From OE-Core rev: e1570e12f92bf359ef34d0e2998b09981bcece18)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 70c6fba5be00c1f9e24fd4257b41b2710aa87d99)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop what remains of the patch the removed some GPLv3 content: both
eu and ph layout licenses have been corrected.
(From OE-Core rev: fdc7f529be77be49b6c43cd24a4600ed97a35ed5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use last release instead of slightly older git revision, drop the
upstreamed patch.
(From OE-Core rev: b1b566375c7b4d4621bd16d17573ad11040e5b8c)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
DRI2 is more abstract than the original DRI and isn't tied to OpenGL or any
other rendering system, and as such is being used by more than OpenGL support in
xserver. In particular, the new modesettings driver uses DRI2 to accelerate
drawing, so enable DRI2 by default.
This was spotted because the "nodistro" DISTRO doesn't enable OpenGL, so xserver
failed to build as dri2proto wasn't built.
(From OE-Core rev: e0c526017e895d768e8a4d09999242286b1f6ee9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Increase OELAYOUT_ABI: this is required because the
xf86-video-modesetting package moves from its own recipe to
xserver-xorg and sanity check cannot handle that currently.
The upgrade will delete old xf86-video-modesetting files from
sysroots.
* Remove upstreamed xserver-xorg patches
* Remove xf86-video-modesetting recipe: the driver is now included in
xserver-xorg recipe, which now produces the xf86-video-modesetting
package. The package version changes from 0.9 to 1.17.1
* Update xserver-xorg license checksum: modesetting license
info (another MIT one) has been added to the file
(From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If reboot was called from inside the Xserver there could happen a race
condition where chvt would never end, and therefore the whole system was
stalled.
The user could not recover the system by ssh the machine or using the
keyboard.
Running chvt in background fixes the issue.
Also move sleep 1s inside stop to give time for killproc xinit for
fix issue when chvt 1 don't work because X server is still running.
(From OE-Core rev: 19eaf4a59f4545e049f525d0b0446a9c08d18f0f)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Among other things fixes a bug that prevents Weston from starting
on i965.
(From OE-Core rev: 943f6fdd0bc20060b5e120ad22f80cb8534153fd)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Now that upstream has relicensed the Philippines symbols to remove the GPLv3
license, backport the patch instead of removing the file.
(From OE-Core rev: fc6ad42cb6079bb4a8dbe1671a4dcfd40e0a47bc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Update SRC_URI to waffle-gl.org
* Add new cmake files to -dev package
* Inherit lib_package so the new wflinfo binary is packaged properly
* Fix PACKAGECONFIG line for gbm
* Add the not-found configuration for all PACKAGECONFIG options to make
builds reproducible (the default builds if dependencies are there)
(From OE-Core rev: f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Make glx part configurable by PACKAGECONFIG enabled by 'x11' distro feature
* Major upstream enhancement is using pkgconfig for egl. This should make
those egl implementations happy that require compiler extra options for their
egl headers.
Example: meta-fsl-arm/imx-gpu-viv sets -DLINUX (and others) in egl.pc. These
are mandatory for proper builds.
(From OE-Core rev: 7bbd34c0efd0f7d65edb7187abdde695e45f62e2)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libxdmcp can optionally use arc4random_buf() from libbsd instead of it's own
random key generation code. As this is an optional dependency add a
PACKAGECONFIG for it and default to not using libbsd.
(From OE-Core rev: fe7780a9bbbfa4dcbbe457618a0842e91a3c6a0e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This also makes it GStreamer 1.0 compatible
https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294
(From OE-Core rev: 4a2f9e7eebcfe106738af17917a700d769acf03b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
xkeyboard-config is intended to be MIT licensed, so backport a patch from
upstream to relicense one file and temporarily delete another.
(From OE-Core rev: dd80d50a7943da4b58896b908b47a4aeed120075)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove the custom compile logic as upstream now detects cross-compilation and
uses CC_FOR_BUILD.
(From OE-Core rev: a16b6b8658cf511a7e271ca70ed5a6f6a78d1133)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove the backported patches as they're integrated in this release.
(From OE-Core rev: 425096a81afcf1f60dad8e74e10b2fe36d72a854)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License checksums updated as the Unicode license was modified (wording only).
(From OE-Core rev: 07878124fd65f10fec58767ea3062dfaab539425)
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>
They can't be built withou x11 in DISTRO_FEATURES.
(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)
Signed-off-by: Robert Yang <liezhi.yang@windriver.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>
It requires libGL.so which is provided by mesa when x11 in
DISTRO_FEATURES.
(From OE-Core rev: 89ad0fb281d71404b311e2fefb3cfc6c6cad0ac0)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed when no x11 in DISTRO_FEATURES:
checking for GL/glu.h... no
configure: error: GLU not found
The GL/glu.h is provided by libglu, and libglu requires libGL.so which
is provided by mesa, but mesa doesn't build out libGL.so without x11 in
DISTRO_FEATURES, so only enable glu when x11 in DISTRO_FEATURES.
(From OE-Core rev: 3905be16940ea642244935517f121a84e28aac0f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Look for OPTARGS variable in /etc/default/weston
and set it as weston's service default options.
This can be used to force system's supported backend.
Change-Id: I0562c9326df5b46226093199873ef58d77aeae75
(From OE-Core rev: 8ffcdcc53bac64c62478fbb72d817c842dde8b28)
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If xinerara can be selected via PACKAGECONFIG, xserver-xorg recipe can
be easier modified via bbappend.
xinerama is needed by the fglrx driver (from AMD).
(From OE-Core rev: 350c488883ccf5cc8ccfdd36f93052a8cd43d4b6)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix builds of directfb on systems with dash as /bin/sh
(From OE-Core rev: 8848517fb4c81b9e9cfc985dd20b9baf374764c0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The problem with filter_out is that it expands the variable meaning overrides
to sub components can get lost. This has happening to the security flags
meaning directfb failed in lsb builds.
Use _remove instead of filter_out since it gives much more predictable results.
(From OE-Core rev: 9484fb04c0ed8b3e08c6773662dc7a0f01cb39a8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove patches that are no longer needed
* git build depends on python module mako. Inherit pythonnative
for this
* source directory changed: default S is now correct in mesa recipe,
but still needs to be set in mesa-gl
(From OE-Core rev: b3035cac6f505fda2bea31da63ab381b104cfd2e)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream has already fixed the GCC 5 problem, so use the patch from upstream.
(From OE-Core rev: 15b39bfbb1a0263ac194a9833175b72ab7345ebd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bdfReadCharacters: ensure metrics fit into xCharInfo struct
We use 32-bit ints to read from the bdf file, but then try to stick
into a 16-bit int in the xCharInfo struct, so make sure they won't
overflow that range.
(From OE-Core rev: 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bdfReadCharacters: bailout if a char's bitmap cannot be read
Previously would charge on ahead with a NULL pointer in ci->bits, and
then crash later in FontCharInkMetrics() trying to access the bits.
(From OE-Core rev: 2c7a15a074501beb6b8a4c7bdf30604b1a432a6b)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bdfReadProperties: property count needs range check
Avoid integer overflow or underflow when allocating memory arrays
by multiplying the number of properties reported for a BDF font.
(From OE-Core rev: 0ff9f2bf0e44a7b47a98234a12714c780825e286)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* default value of PACKAGECONFIG is set from DISTRO_FEATURES,
but in the end we should respect what user sets in PACKAGECONFIG
(From OE-Core rev: 684eaa7f87d321c7965d1393cc5da2190c4acac5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because usr/share/X11/xkb/symbols/eu and usr/share/X11/xkb/symbols/ph are GPLv3.
So add GPLv3 in the license.
(From OE-Core rev: cab517bb1d7628fd8c1080f12462b86928ca720b)
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
LIC_FILES_CHKSUM change is due to shifting of
the hunk to different line numbers, checksum remains same still
Change-Id: I0ce0cc96d39c801e57394f7a839a01d11a6f3979
(From OE-Core rev: 87749a627d0d34f7338ecc55a377a273c66562f3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch from fedora details are in patch header
Change-Id: I6b8dfaae3b751071bf8b0d88b15a4f95c19877f6
(From OE-Core rev: 100ab2578bd2025aed940fddce467a4606962695)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 7082c51f2a01de64eb490c6d062a0cce4b0eab8c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because the license of cairo-trace is GPLv3(util/cairo-trace/COPYING).
So pickup cairo-trace,and modified the license to GPLv3.
(From OE-Core rev: 9e29a8bec3e6bcba38cf097181e50f1266b33221)
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed do_configure error:
configure: error: libX11 headers (libx11-dev) required to build with GLX support
and do_compile error:
../include/epoxy/egl_generated.h:10:29: fatal error: EGL/eglplatform.h: No such file or directory
#include "EGL/eglplatform.h"
The dependencies form its README.md:
* automake
* libegl1-mesa-dev
* xutils-dev
(From OE-Core rev: 04193b96fa6e41f9de7ea5eb15be133ac63b1ecc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
musl does not support BIND_LAZY intentionally, which means
dlopen will always complain about missing symbols which is what
X does when loading graphics drivers, here we preload the needed
drivers for all emulator machines if libc is musl
Change-Id: I908c94c30db8a5e872922e1a677126d82fa17145
(From OE-Core rev: 92be71296e1b7ed1e6387ae381942072aa3bb4f3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There should be only one dev and dbg package
(From OE-Core rev: fbb0aa87fb178fd89c8828d8611b618bf21e5799)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There should be only one dev and dbg package.
(From OE-Core rev: e6be75c98edf878f73e530bc6e63b3c50bf365cc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Libepoxy is a OpenGL function pointer management library required by
GTK 3.16.
(From OE-Core rev: 9c3ed6ed0e432291109242fb3aebca232944a7ee)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
backport needed patches
add a patch to use _NP macros only on glibc
based linux and not on all linux
Change-Id: Ib43bec9d222856f8e7acb9f0143b406517f049c8
(From OE-Core rev: 7dcd8f532fef71e711bf11a00f0e246a36b6138a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updated x11-server packages fix security vulnerability:
Olivier Fourdan from Red Hat has discovered a protocol handling issue in
the way the X server code base handles the XkbSetGeometry request, where
the server trusts the client to send valid string lengths. A malicious
client with string lengths exceeding the request length can cause the server
to copy adjacent memory data into the XKB structs. This data is then
available to the client via the XkbGetGeometry request. This can lead to
information disclosure issues, as well as possibly a denial of service if a
similar request can cause the server to crash (CVE-2015-0255).
(From OE-Core rev: 564e2f9732ac4318bb5923dd1ff771514c9afd2f)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* merge postinst_prologue with the append in the do_split_packages call
Now we can call correct pango-querymodules binary and respect D
variable, otherwise we're trying to regenerate it on host which fails:
pango-module-basic-fc.postinst: line 17: /usr/bin/pango-querymodules:
No such file or directory
(From OE-Core rev: f5d189b80a1fd7187f47678935f9a584ccff8d0a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The fixes are not specific to musl, however they came
to surface due to musl, these are generic problems which
should be fixed in components
Change-Id: If9aa95968d9dec9c16e3e5819955befcaa38937c
(From OE-Core rev: 24fd4959aea55829c6095c81138daee2c5b5107f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: b500d5581d2ab802eb8e7de640b5ab253f01c3f6)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When X is stopped it remains in the same vt that was launched,
change to vt1 instead to avoid manual vt switch.
[YOCTO #5336]
(From OE-Core rev: 6cf330bfbbb8ab7f9506bbed59ce6c2d90a0c1a2)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch was part of the 1.8.1 release.
(From OE-Core rev: aa5377fc4cf93678b2fdae86855ea1d6f39fa148)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
base.bbclass already sets EXTRA_OECMAKE when cmake.bbclass is inherited.
(From OE-Core rev: c9959f2a69e7edfe8b9e4a7bc99f0d77f03aff73)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On shutdown xserver was closing connections that were already closed, resulting
in a segfault.
(From OE-Core rev: 04ffd02a14f5e0cd2ce0288b589d4c4a0120e2f4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's not complete, but recipes depending on virtual/libx11 are easiest
to spot, I've long list of PNBLACKLIST for all recipes which cannot
be built in distro without x11 in DISTRO_FEATURES
(From OE-Core rev: 78d269fa9a586e24ef058ba5315c696f15935f56)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Given that bitbake.conf sets the default values:
BP = "${BPN}-${PV}"
S = "${WORKDIR}/${BP}"
there are a number of recipes that set the variable S completely
superfluously, so get rid of them.
(From OE-Core rev: ebe8578df3f162045086cd60a129eb7ac3eacf4c)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The xorg font builds use `pkg-config --variable=mapdir fontutil` to
locate encoding maps. This variable ought to be sysroot-relative, but
neither pkg-config nor font-util nor the fonts themselves provide any
facility to add the sysroot back in.
We're presently adding the sysroot by by twiddling MAPFILES_PATH in
configure.ac. This is broken; it's actually defined in aclocal.m4,
because the definition is provided by fontutil.m4. Another (more
speculative) criticism is that it also hardcodes a build-specific
absolute path into builds which might (incorrectly) encode it into
target-installable packages.
A somewhat more robust, focused, and clear solution is to override
UTIL_DIR on the make command line. (UTIL_DIR, not MAPFILES_PATH, is what
is actually referenced in the build.)
(From OE-Core rev: 5cd320d8d21cd784b32f12a6944dc647a75abf94)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
MAPFILES_PATH is a configuration variable that is used by packages using
font-util, which tells those packages how to compute it in fontutil.m4.
Presently, we're manually twiddling things so that MAPFILES_PATH will
consult the native sysroot, when building under *any* architecture.
This complicates building other packages immensely, and also generates
broken on-target packages, because the contents of font-util-dev will
reference the native sysroot on the build machine (!).
We don't even need to twiddle MAPFILES_PATH anymore so just delete it.
This code also had a path bug (referencing /usr/lib/pkg-config instead
of /usr/lib/pkgconfig) which is also fixed by deletion.
(From OE-Core rev: 4199703db82d79408e0575e1332ad79375e14c39)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
font-util installs encoding maps into /usr/share/fonts/X11. This path
may not exist on the host (many distros install these into
/usr/share/fonts/util) so they must exist in the sysroot in order for
e.g. `pkg-config --variable=mapdir fontutil` to work correctly. However,
currently /usr/share/fonts is explicitly not installed into sysroots, so
the encoding maps were not getting found.
Fix this by explicitly staging ${datadir}/fonts/ into the sysroot.
(From OE-Core rev: a1598266c828ad0b73df971b22d6a2e3e1dd5cab)
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.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>
Add packageconfig for systemd-logind instead of hard disable in
EXTRA_OECONF this allows users to use packageconfig also add
dependency of dbus because systemd-logind require it for communicate
with systemd.
(From OE-Core rev: ce4035ee635decab83e08a8c77ae7b077a029096)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As per the Mesa 10.2 release notes, "--with-llvm-shared-libs"
has been renamed to "--enable-llvm-shared-libs".
http://www.mesa3d.org/relnotes/10.2.html
(From OE-Core rev: 34fe51e9b381e99d664a7e567a3267bcee991084)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Refreshed installtests.patch
* Removed --enable-freedreno-experimental-api, since it is now enabled by
default upstream
Tested on Snapdragon 600 with freedreno and X11.
(From OE-Core rev: 9ab2d19d4c320cc37f71bba25caa7585caf9679e)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It doesn't work:
| checking whether to include DRI1 support... no
| configure: error: DRI1 requested but prerequisites not found
And there is a xf86-video-intel_2.99.917.bb which is MIT-X.
(From OE-Core rev: b2feaf0d542047b28abaf946bf7ad6fcdcaf6784)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It doesn't work:
ERROR: matchbox-wm: Recipe file does not have license file information (LIC_FILES_CHKSUM)
ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix
And there is a matchbox-wm_git.bb, they have the same GPLv2+ license.
(From OE-Core rev: 5b74b2c129ded8d8d8e2843ff7b86e1053c81ba7)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
flags for EGL and GBM Gallium had been removed in 10.4,
so remove these flags, files or packages.
(From OE-Core rev: ba079975fa984f53fde5b4e8131d0f3877323e6c)
Signed-off-by: Pengyu Ma <pengyu.ma@windriver.com>
Tested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* there is some pending work to resolve this unnecessary x11
dependency, this can be reverted together with x11 dependency
removal
(From OE-Core rev: bc4d051c2fa56acb0479330b4342a39396de30d4)
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>
Jussi Kukkonen
Ross Burton
Otavio Salvador
Nicolas Dechesne
Jackie Huang
Paul Gortmaker
Richard Purdie
Robert Yang
Alexander Kanavin
Gary Thomas
Cristian Iorga
Drew Moseley
Roy Li
Martin Jansa
Steffen Pankratz
Li xin
Khem Raj
Andreas Müller
Bruce Ashfield
Ricardo Ribalda Delgado
Alexander Kanavin
Joshua Lock
Philippe Coval
Li Zhou
Lei Maohui
Andre McCurdy
Aníbal Limón
Paul Eggleton
Robert P. J. Day
Richard Tollerton
Ben Shelton
Pengyu Ma
Saul Wold