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>
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>
* 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>
A number of calls to REGION_INIT() use a static box which is flagged
as an error with -Werror=address. This patch works around the problem,
but should not be considered a final solution.
Upstream-Status: Inappropriate
(From OE-Core rev: 605f6b89b9948351601af1ef37510f7dee77895b)
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Xorg VESA driver calls DGAInit enforcing this symbol to be available
to the driver to work so we revert back to only disable DGA for lite
flavor of Xorg.
(From OE-Core rev: f5546a175384de338edc23a248b19a23fb7d7017)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes the compile problems e.g.
| checking for GL... yes
| checking for DRIPROTO... yes
| checking for DRI... no
| configure: error: Package requirements (glproto >= 1.4.14 dri >=
7.8.0) were not met:
|
| No package 'dri' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
(From OE-Core rev: 966f28c29a149dca3035e2c37ccf54ed82713bdf)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* khem confirmed that uclibc does support it now
(From OE-Core rev: 629bea96ae07d9f3129a5da488682851a4e09d52)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* to provide upgrade path for meta-oe users, where it had PE = 2 already
(From OE-Core rev: c38cb00a359a0015bc485edf9632efe295c58533)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
< Upstream-Status: Pending
---
> Upstream-Status: Inappropriate [embedded specific]
(From OE-Core rev: aaa137f54c246b61a94b62a731de67f09e688a2a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ie om-gta02 has mesa-dri module too
so this should be limited in mesa-dri only
(From OE-Core rev: 64d27e31f474ea9656af0f9fa19c819730ace2d9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* after this xserver-xorg-lite.inc is disabling only dri/glx
and xserver-xorg.inc is forcing dri/dri2 enabled
the rest is defined in xserver-xorg-common.inc
(From OE-Core rev: eb381e05ff24ee2fed0b4e9675bd01dce662da07)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* when someone is using hal or udev explicitly, then he doesn't need xserver-xf86-config
* add xkeyboard-config to RDEPENDS_${PN}-xvfb
(From OE-Core rev: aa0ee22d8504560e5aa0a5ddf67082b0744cd180)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)
(From OE-Core rev: f7fb209cd447418e72c421ab473c35430ee46893)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* add ${bindir} and protocol.txt to ${PN}
* SecurityPolicy is now in ${PN}-security-policy
* package .la files to ${PN}-dev
* README.compiled is lately in ${localstatedir}/lib/xkb so add it too to ${PN}-doc
(From OE-Core rev: 4499728e5ec94783ab44d302a871d44ae0a2e2d3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* old value was actually from xserver-kdrive, use the same as
xserver-xorg-1.10.1 and newer has
./xserver-kdrive.inc:LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
./xserver-xorg-lite_1.10.1.bb:LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
(From OE-Core rev: 5c32d388d788e0d35a384e84765c2b66ccd593e4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
