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>