summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
Commit message (Collapse)AuthorAgeFilesLines
* xserver-xorg: disable dri2 too when building without glx PACKAGECONFIGMartin Jansa2013-02-141-1/+1
| | | | | | | | | | | * it was enabled when dri2proto was built before xserver-xorg (From OE-Core rev: 6014223d1527a6fd870b68cbefb9194a079a5d2c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg: Remove RCONFLICTS against xserver-xorgOtavio Salvador2012-09-281-1/+0
| | | | | | | | | | | 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>
* xserver-xorg: Use rdepends to ensure xserver-xorg-module-exa match versionOtavio Salvador2012-09-281-0/+1
| | | | | | | | | | | 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>
* xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exaMartin Jansa2012-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* xserver-xorg: Modify RREPLACES for RCONFLICTSSaul Wold2012-09-191-1/+1
| | | | | | | | | 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>
* xserver-xorg: make DRI/GLX options respect opengl distro featureRoss Burton2012-09-101-12/+4
| | | | | | | | | | | 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>
* xserver-xorg-lite: removeRoss Burton2012-09-101-4/+134
| | | | | | | | | | | | | 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>
* xorg-*: disable xmlto where it was failingMartin Jansa2012-01-171-0/+1
| | | | | | | | | | | | | | * meta-oe now provides xmlto-native http://git.openembedded.org/meta-openembedded/commit/?id=ab8f876ca8fa223c183e3db2029cce88f3435a27 but not the stylesheets for buildhosts without them it's unusable and fails, because xorg macros autodetecting xmlto available, see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-December/037066.html after adding xmlto-native and stylesheets-native to DEPENDS we can enable it again (From OE-Core rev: 58f18f04d7783cc75127f7f1c0921051431dcd8c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg: Add mesa-dri to depends instead of virtual/libglKhem Raj2011-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* xserver-xorg: remove glx-use-tls againMartin Jansa2011-10-171-2/+1
| | | | | | | | | * 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>
* xserver-xorg: remove COMPATIBLE_HOSTMartin Jansa2011-10-111-3/+0
| | | | | | | | | | * 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>
* xserver-xorg: move shared EXTRA_OECONF entries to shared .incMartin Jansa2011-10-111-18/+4
| | | | | | | | | | | * 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>
* xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which ↵Martin Jansa2011-10-111-1/+2
| | | | | | | | | doesn't enable it for uClibc (From OE-Core rev: 9e5c8cb78fcc5d26e1b91172aa6e98890d9ea75c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ↵Martin Jansa2011-10-111-2/+0
| | | | | | | | | ${bindir} in FILES_ defined in shared .inc (From OE-Core rev: 623f4feb86c2587c9a5bdac833671a91fbfbbf72) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .incMartin Jansa2011-10-111-2/+0
| | | | | | | (From OE-Core rev: 7c380db374381ae71cf6b1398a77654b3eebf512) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from ↵Martin Jansa2011-10-111-5/+2
| | | | | | | | | | | | xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc * 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>
* xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-liteMartin Jansa2011-10-111-0/+36
* 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>