Commit Graph

33 Commits

Author SHA1 Message Date
Ross Burton ab9e266ab9 xserver-xorg: change mesa dependency to virtual/mesa
(From OE-Core rev: 57197949a980e8578cb5d758feb0e595e1f721e4)

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>
2013-09-17 19:34:55 +01:00
Andreas Oberritter f8bee41377 xserver-xorg: extend packageconfig and dependencies
- 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>
2013-07-13 18:23:32 +01:00
Riku Voipio e10352e614 xserver-xorg: enable xvfb
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>
2013-05-24 14:14:41 +01:00
Stefan Stanacar 814d89bcba xserver-xorg: Add xkbcomp to RRECOMMENDS
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>
2013-05-09 08:51:13 +01:00
Laurentiu Palcu e66deb0156 mesa: rename mesa-dri recipe to just mesa
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>
2013-03-22 17:07:16 +00:00
Constantin Musca 5be92d4f06 xserver-xorg: enable multilib
[YOCTO #3438]

(From OE-Core rev: 4c49e76b793bd80422d7b9566d218ca7d087905b)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-31 09:43:25 +00:00
Marko Lindqvist 47d6d15c40 xserver-xorg: add libgcrypt dependency
Build failed because of missing libgcrypt.

(From OE-Core rev: 93ee5dd7c0cc0eddaad9bc9ebb31c00e97df64cb)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-17 17:24:57 +00:00
Ross Burton da6c266b11 xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions
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>
2012-12-03 16:38:35 +00:00
Martin Jansa 957b835f2a xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG
* 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>
2012-11-24 15:12:32 +00:00
Laurentiu Palcu 69f1b45915 xserver-xorg: upgrade to 1.13.0
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>
2012-11-20 15:31:53 +00:00
Ross Burton bc41dfb9cd xserver-xorg: add runtime provides for the driver ABI version
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>
2012-10-23 12:28:32 +01:00
Ross Burton 8ce23f5695 xorg: remove XF86 BigFont extension
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>
2012-10-22 14:59:30 +01:00
Ross Burton aee0f321ef xorg-proto: remove evieext
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>
2012-10-18 12:13:43 +01:00
Ross Burton 9b9fad3c5f xorg: remove xf86rushproto
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>
2012-10-18 12:13:43 +01:00
Ross Burton d6dc72c048 xorg: remove all traces of XPrint
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>
2012-10-18 12:13:36 +01:00
Ross Burton f29e000832 xserver-xorg: use INC_PR in PR
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:36 +01:00
Ross Burton 1e533aec87 xorg: remove XTrap
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>
2012-10-18 12:13:36 +01:00
Otavio Salvador 1ed2073a01 xserver-xorg: Remove RCONFLICTS against xserver-xorg
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>
2012-09-28 15:19:43 +01:00
Otavio Salvador b0f4a5bc23 xserver-xorg: Use rdepends to ensure xserver-xorg-module-exa match version
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>
2012-09-28 11:07:42 +01:00
Martin Jansa 6d7e9d42eb xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa
* 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>
2012-09-27 15:21:54 +01:00
Saul Wold d72ed271e7 xserver-xorg: Modify RREPLACES for RCONFLICTS
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>
2012-09-19 17:56:28 +01:00
Ross Burton 9b92449de1 xserver-xorg: make DRI/GLX options respect opengl distro feature
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>
2012-09-10 13:01:51 +01:00
Ross Burton 887a731468 xserver-xorg-lite: remove
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>
2012-09-10 13:01:51 +01:00
Martin Jansa 5fabe90808 xorg-*: disable xmlto where it was failing
* 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>
2012-01-17 14:53:20 +00:00
Khem Raj 8e14ceee59 xserver-xorg: Add mesa-dri to depends instead of virtual/libgl
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>
2011-10-24 17:27:17 +01:00
Martin Jansa 9448de61c0 xserver-xorg: remove glx-use-tls again
* 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>
2011-10-17 14:10:39 +01:00
Martin Jansa 927c92288d xserver-xorg: remove COMPATIBLE_HOST
* 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>
2011-10-11 18:08:34 +01:00
Martin Jansa 4d0fbb1ff0 xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
* 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>
2011-10-11 18:08:34 +01:00
Martin Jansa 8c4b9ae0bd xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which 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>
2011-10-11 18:08:33 +01:00
Martin Jansa 3476f1548e xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${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>
2011-10-11 18:08:33 +01:00
Martin Jansa 73cfa3e166 xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc
(From OE-Core rev: 7c380db374381ae71cf6b1398a77654b3eebf512)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:33 +01:00
Martin Jansa fbf9e2fd49 xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from 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>
2011-10-11 18:08:32 +01:00
Martin Jansa c09f0eb561 xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* 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>
2011-10-11 18:08:31 +01:00