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 master rev: 161bb3409edee21827cf594cc011fe88185f1496)
(From OE-Core rev: 16b2e5a5af9fadbfe85a9f66be2896d1c7c3b72d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libxcb change removed as it's not valid in fido
Signed-off-by: Joshua Lock <joshua.g.lock@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 master rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f)
(From OE-Core rev: c1b39f145b9e9f65875ec7b46030327741267031)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Joshua Lock <joshua.g.lock@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 master rev: b33e927096292f22f1bd9b2b0f633a6d645fc1eb)
(From OE-Core rev: 45a6ae4cf6b2684ee7e58b8a85f44eb0031fa2b4)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Joshua Lock <joshua.g.lock@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: e5bf7aeac6f6855040e462d0b7cea8c4ea64805a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The commit changed an #ifdef to #if defined(), but the source
code for 10.4 branch of mesa still uses #ifdef.
This reverts OE-Core commit 12e467f436fbc22f274558c753f0ac9756ce1071.
(From OE-Core rev: 3eaaa488c811b6a8f7b855f9f2a666d106dbe433)
Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
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)
(From OE-Core rev: 2ac51bcace97d16ca678d85e0100611fecfd818c)
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)
(From OE-Core rev: 493ecc520202851bba664eaf4f1150ce624bf2b1)
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)
(From OE-Core rev: 1e2a947e65f5fb6e01459c9ddd6515a7131d92c7)
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)
(From OE-Core rev: 7827e9756e82c31707ce87d27c7d0b0392fc0812)
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)
(From OE-Core rev: ddc4889d7028d0388b1521d49ab1d3b8decba524)
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 master rev: f5d189b80a1fd7187f47678935f9a584ccff8d0a)
(From OE-Core rev: 3bbdb42c17222e78e3a4d043f26c9b2dce6d6891)
Signed-off-by: Martin Jansa <Martin.Jansa@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 master rev: 564e2f9732ac4318bb5923dd1ff771514c9afd2f)
(From OE-Core rev: edde2ef38d483888e5daa7c00007cb1b84de6336)
Signed-off-by: Li Zhou <li.zhou@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>
This patch is to solve the following circular dependency problem.
systemd -> dbus -> libsm -> e2fsprogs -> util-linux -> systemd
libsm doesn't have any dependency on e2fsprogs. It might be some dependency
on util-linux's libuuid, controlled by configure options. So e2fsprogs should
be removed from the DEPENDS variable.
Ideally, we should add a PACKAGECONFIG for 'libuuid' for libsm. However, if
libsm depends on util-linux, we would have the circular dependency described
above. That's why this patch explicitly set '--without-libuuid' in EXTRA_OECONF.
libsm would still be working well because it would fall back to an internal
algorithm to do the uuid stuff.
(From OE-Core rev: 5e7d6f40149be69a3e3b17b28ce3f687a93b40fa)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S.
Fix all recipes that only need to set S equals to WORKDIR.
[YOCTO #5627]
(From OE-Core rev: 9d220b1bfe4589736604dd5a7129e3699377d830)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S. Also do some minor adjustment after changing
value of S.
[YOCTO #5627]
(From OE-Core rev: dd7be09318b55a69cb8636e86d2af6e6b8140b31)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without a dm to handle the session management systemd-logind can make it
difficult for X to gain ownership of devices and behave properly.
Since X seems to work without enabling systemd-logind, always disable it for
now, and we can revisit it if we ever want to try to take advantage of
multi-user sessions/seats.
[Yocto # 7100]
(From OE-Core rev: 31c701821e2770e29955d1e1eb45a254f5a0acb8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first
(From OE-Core rev: a5dee19715a1a6997c50abbf59bbbd3767891783)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Drop fixsepbuild.patch which has been merged to 1.7.6
- Drop obsolete rename-no-instrument-function-macro.patch
(From OE-Core rev: 15c0ee00550b9e5aac04da598393a614a45bc8a9)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
