- split glx into dri, dri2 and glx, to be able to select e.g. dri2 only
- update dependencies to match configure.ac
(From OE-Core rev: 408766da9cc1f2ca80d0b3f13575fea8f33cab3e)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
PRINC usage is removed from meta-intel, bump core PR values to ensure
no version regressions.
(From OE-Core rev: c6108ebe116eafaf0a22b5f22a3eec87c86859f4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently Xvfb has been enabled in openembedded-core. Xvfb is needed
for example in Mauve testsuite.
(From OE-Core rev: 2570d5dcb7bbd50a7b3b8c2345492986be3ed95b)
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
OE-Core commit bdcc5e8f1286d288baf410458efc39a59b68d751 removed xkbcomp
from RDEPENDS for xkeyboard-config but X server still needs it otherwise
it fails to start.
(From OE-Core rev: f2330ebc3071d780cbc6d1ddab5c54bfadf8fffc)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Apparently, the default qemumips color depth was set to 8 and the colors were not
displayed properly. cirrusfb driver doensn't seem to accept color depth
as a kernel parameter, so we have to do it here.
[YOCTO #4340]
(From OE-Core rev: 876e020be334a9350094dbd1a29b9e49eceed603)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rename mesa-dri recipes to just mesa. Also, replace all references to
mesa-dri in all recipes/configs.
The reason for this renaming (quote from bugzilla):
"mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore.
mesa-dri should be renamed to mesa."
[YOCTO #3385]
(From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Aditionally:
* adjust the aarch64.patch because the logic changed and the
lnx_video.c changes are no longer necessary;
* created patch to fix compilation issue when not using xinerama;
(From OE-Core rev: 1204a04c28546aa131d295fe7791f5de3694ad11)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The idea of a generic xorg.conf is meaningless, especially when they specify the
"intel" driver. Empty this file so that unless the BSP specifies it's own
xorg.conf, no xorg.conf file is installed.
(From OE-Core rev: 746b6e90a8403886e6957d33610bbda115de0a0c)
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>
Many hardware platforms can autodetect their hardware and don't need a xorg.conf
at all. Make it easy for BSPs to not ship a xorg.conf by not installing empty
xorg.conf files.
(From OE-Core rev: 4b46149df5f123c7acf4699dbc552cc0e07f709a)
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>
Even though the current xserver in oe-core (1.13) doesn't ship these as
standalone extensions, older X servers required by binary drives
(e.g. meta-intel's 1.9) still install them separately. As the packages didn't
exist in xserver-xorg.inc the extensions were not packaged, and X didn't work.
Revolve this by restoring the package definitions, and moving the upgrade path
dependencies to xserver-xorg_1.13.bb.
(From OE-Core rev: 24b954253dd1aa626835352c4dc8d085a19aae35)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it was enabled when dri2proto was built before xserver-xorg
(From OE-Core rev: 1668b4d4f373292ea4d611712ef56148ededfce5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patch contains several aditional changes:
* removed one backported patch (included in the new release);
* changed mips64-compiler.patch to apply properly;
* licence checksum for COPYING file changed: some copyright years have
been changed;
* bump PR in xorg-driver-common.inc so that all input/video drivers
get rebuilt. That's becaue the ABI changed;
The following external modules are now built-in:
* DBE
* DRI2
* DRI
* RECORD
The extmod module was completely removed.
(From OE-Core rev: 506da0d139dd470475a1d6b2dd3ae62406c36816)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The xserver driver ABIs can and do change in a way that is unrelated to the
version of xserver, so it's entirely possible to build an image that has a
mismatch between the server ABI version and the version that the drivers were
built against. xserver detects this and refuses to load the modules.
By adding RPROVIDEs to the xserver package that describe the ABI versions it has
(such as xorg-abi-video-13, xorg-abi-input-11), drivers can RDEPEND on the
version that they were built against. This means that when the ABIs change,
there will be package dependency errors at image time instead of images that
build fine but don't work.
(From OE-Core rev: 8ef5f205aec04140198d5ba0f5c405ae6e977dbe)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This has been disabled by default upstream since 2007, nothing uses it.
(From OE-Core rev: 06d27cf0fbcc4004e6f456880eca49893c9290bf)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It was removed from xserver in 2008.
(From OE-Core rev: 574843864dcdb65d28bc2c3753339f123a9bc528)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dependency in xserver is spurious and was removed in 2005.
(From OE-Core rev: aad06196254f1d08696ea0fcf50007ce3be933ac)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The XPrint server was removed from Xorg in 2008.
(From OE-Core rev: 5b3748d463a6666c0d8e2624092619da8d8e6328)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This functionality was broken upstream so it was removed.
(From OE-Core rev: 7661d15957525885e5e9b1129da7a99eef19f4be)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc-47-warning.patch was integrated, so drop.
Add pkgconfig-deps.patch, a backport of a commit to fix bad exposed library
dependencies (which resulted in the keyboard driver depending on pixman).
(From OE-Core rev: 723e81af2a5b07024ab744c14cdccc12f554ef12)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When merging the xserver-xorg fix the to use RDEPENDS in
xserver-xorg-module-exa the RCONFLICTS has not been removed by
mistake. This drops the RCONFLICTS to properly fix it.
(From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This fix the installation of xserver-xorg-module-exa package at rootfs
using opkg. It were failing as conflicts where not working properly.
(From OE-Core rev: 8fb19876215a8c7918361e8360c4342d1a933a93)
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>
The version-specific .inc was shared with the xserver-xorg-lite package, but
that doesn't exist anymore.
(From OE-Core rev: 09b1bf350384722127ac9f098a72371cf27c3822)
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>
* it doesn't make much sense with PV, because xserver-xorg-module-exa
was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4)
and (< 1.11.2) is not good enough
* because we don't know how many PRINC are in BSP/DISTRO layers,
then it's safer to RCONFLICTS with every older version then current
EXTENDPKGV
Also fixes whitespace to work correctly with opkg
(From OE-Core rev: ed0216d29fc4355c5220f3ad51df04a63cacb0c3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--
* I haven't really tested this with IPK, since it was changed from
RREPLACES to RCONFLICTS (because of RPM) and all my installed devices
are already upgraded
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fix bad runtime dependency that was causing -exa to be a suitable candidate for xserver-xorg, thus resulting in no X server in some situations
(From OE-Core rev: 467c59495d83748d35846e8b37548182fea99cbf)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.
(From OE-Core rev: 73d02f6b121c8b0ed2d42de0bfd6c227fd4de41f)
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>
Building xserver-xorg and not installing the DRI and GLX modules (and so not
Mesa) results in an increase of 16kb compared to this package.
This isn't worth the effort of maintaining two packages.
(From OE-Core rev: 586835801a11e514a10228be957713e1ce90dd44)
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>
As the file moved from xserver-xorg to xserver-xorg-module-exa, the latter needs
to "replace" the former to ensure a smooth migration when upgrading the
packages.
(From OE-Core rev: 45a4e2064991555570f346e0662a57e61c947acf)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
kdrive is effectively unmaintained upstream (it's only kept for Xephyr).
Apart from two headless machines in meta-yocto (patches sent), every BSP I
looked at (oe-core, meta-intel, meta-oe, meta-ti, meta-smartphone) is using the
traditional X.org X server. Changing kdrive to Xorg means an extra ~200kb of
disk usage but extra features and more importantly continued maintenance.
(From OE-Core rev: f8bc059883a9bae92434bfb74fca352ad1e10199)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
it's being used. Note that it's dynamically loaded so the automatic library
dependencies won't catch this, but as far as I'm aware nothing on oe-core or
meta-oe is using EXA.
(From OE-Core rev: 1a666ee1cda3c0b74daba5881fc5f62e13deec66)
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>
* this patch depends on http://patchwork.openembedded.org/patch/32085/
(From OE-Core rev: 2792569605b50bdad8b2b8398c823dd08006daf1)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mips64 N64 ABI has different size for int and pointer
which means the compiler will complain about conversions
which works fine for 32 bit since sizes are same.
amd64 is taken care of already so we take care of mips64
with this patch by understanding the difference in sizes
in compiler.h
(From OE-Core rev: de21917ba83f104a2d53941f40a9b2b8d35dce49)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Newer versions of GCC uncovered illegal code practice which can cause
runtime failures in the Xext/xace.c code. This problem has been fixed upstream:
http://cgit.freedesktop.org/xorg/xserver/patch/Xext/xace.c?id=6dae7f3792611aace1df0cca63bf50c50d93de43
Subject: xace: Invalid reference to out-of-scope data.
Incorporate this patch into the recipe, with a PR bump.
(From OE-Core rev: 7d1bb144404de650c6e83dfd095d16a796cbcf46)
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xmlto-native is unusable (see YOCTO #2416
xmlto/xsltproc stylesheets cannot be found even when they are installed in sysroot)
* fails like this:
| make[2]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc'
| /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto xhtml-nochunks Xserver-spec.xml
| /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto xhtml-nochunks Xinput.xml
| xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate (status 3)
| xmlto: Fix document syntax or use --skip-validation option
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
| "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
| ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'ldquo' not defined
| btaining a copy of this software and associated documentation files (the “
| ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'rdquo' not defined
| of this software and associated documentation files (the “Software”
| ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'ldquo' not defined
| btaining a copy of this software and associated documentation files (the “
| ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'rdquo' not defined
| of this software and associated documentation files (the “Software”
| ^
| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
| Document /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate
| xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml does not validate (status 3)
| xmlto: Fix document syntax or use --skip-validation option
| make[2]: *** [Xinput.html] Error 13
| make[2]: *** Waiting for unfinished jobs....
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml:4: warning: failed to load external entity "/xserver/doc/xml/xserver.ent"
| <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;
| ^
| Entity: line 1:
| %defs;
| ^
(From OE-Core rev: e8c61491cdd28caa51b567c6ce40155504f9eadb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
WARNING: For recipe xserver-kdrive, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/man
WARNING: /usr/share/man/man5
WARNING: /usr/share/man/man1
WARNING: /usr/share/man/man1/Xephyr.1
WARNING: /usr/share/man/man1/Xserver.1
(From OE-Core rev: 93bd303d4af91769ae943841036a1b956ac2e940)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
WARNING: For recipe xserver-kdrive, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib
WARNING: /usr/lib/xorg
WARNING: /usr/lib/xorg/protocol.txt
WARNING: /usr/share/X11
WARNING: /usr/share/X11/xkb
WARNING: /usr/share/X11/xkb/compiled
WARNING: /usr/share/X11/xkb/compiled/README.compiled
(From OE-Core rev: d036265de1d9931bedb660e01a763d3d1d9e4097)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cross compiling of xserver-kdrive fails if dtrace is enabled. Configure
script enables dtrace automatically if dtrace binary exists. xserver-kdrive
compiling was failed if systemtap package was builded beforehand because
systemtap provides dtrace binary.
(From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee)
Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ross Burton
Andreas Oberritter
Richard Purdie
Riku Voipio
Saul Wold
Stefan Stanacar
Laurentiu Palcu
Andreas Müller
Marcin Juszkiewicz
Constantin Musca
Marko Lindqvist
Martin Jansa
Otavio Salvador
Khem Raj
Gary Thomas
Lauri Hintsala