Commit Graph

127 Commits

Author SHA1 Message Date
Max Eliaser 0e8d6dedcd qemux86-64: xorg.conf: allow X.Org driver to be selected automatically.
A section specifying the driver to use is deleted from the image's xorg.conf,
allowing the X server to automatically select the most appropriate driver.
Testing shows that it does always pick the correct one.

(From OE-Core rev: 5dd70b1917bc60e4ea7bded8f348e46b4551dfb6)

Signed-off-by: Max Eliaser <max.eliaser@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-27 12:12:31 +01:00
Max Eliaser ae54f2b2aa qemux86: xorg.conf: allow X.Org driver to be selected automatically.
A section specifying the driver to use is deleted from the image's xorg.conf,
allowing the X server to automatically select the most appropriate driver.
Testing shows that it does always pick the correct one.

(From OE-Core rev: 1354fdea6e04070fde4cb5a48ef824d0b22f0870)

Signed-off-by: Max Eliaser <max.eliaser@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-27 12:12:30 +01:00
Richard Purdie fe14f996bf xserver-xorg: Fix build determinism problem
We're seeing the warning:

WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps]

We list openssl in DEPENDS so we need to specify that as the sha1 provider
rather that nettle which is autodetected.

(From OE-Core rev: bfc19d81a5992c8b7b725a873dda527c9c9c148d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-17 12:28:51 +01:00
Hongxu Jia fc4c43af9a xserver-xorg.inc: add missing dep for xmlto
Add docbook-xml-dtd4-native and docbook-xsl-stylesheets-native
to PACKAGECONFIG[xmlto]'s dep.

[YOCTO #2416]
(From OE-Core rev: 9a81580cc4e8cd260d863751476534ccd380f11c)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-16 10:20:51 +01:00
Hongxu Jia 79dae067d9 xserver-xorg.inc: add PACKAGECONFIG for xmlto
Support xmlto for documentation generation and disable it by default.

[YOCTO #2416]

(From OE-Core rev: c2d8322b3e3d1c2cb1ed7ccff59c7e86ab7af751)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-10 17:38:35 +01:00
Ross Burton 9192fc10e4 xserver-xorg: fix xshmfence autodetection
Add a PACKAGECONFIG for xshmfence.  If DRI3 is enabled, xshmfence also needs to
be enabled.

[ YOCTO #6507 ]

(From OE-Core rev: ff2e96cacc116cf362d4c5dc36f1b846672f98e0)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-08 11:20:13 +01:00
Ross Burton 6bb1bef66f xserver-xorg: add PACKAGECONFIG for libunwind
The automatic detection of libunwind causes non-deterministic builds, so add a
PACKAGECONFIG option for it.

(From OE-Core rev: 6b1418a2ba1544ea481fd4a89b5aa25111ca20e8)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-08 11:20:13 +01:00
Ross Burton b5f7bb10b3 xorg-xserver: disable DRI3 by default
Add a PACKAGECONFIG for DRI3 but don't enable it yet.

Based on a patch by Valentin Popa <valentin.popa@intel.com>.

[YOCTO #6402]

(From OE-Core rev: 898d60f1901745b861ecab91b3ceceb9a1cfc8b1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-10 17:11:56 +01:00
Paul Barker a6df56dc0a PR bumps to remove PRINC usage from meta-raspberrypi
This allows us to remove the following uses of PRINC in meta-raspberrypi:

recipes-bsp/formfactor/formfactor_0.0.bbappend:
    PRINC = "1"

recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend:
    PRINC := "${@int(PRINC) + 5}"

(From OE-Core rev: cffbd11d915fe8a1399f23c97c4e2ecbdae4d00a)

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-02 22:32:10 +01:00
Laurentiu Palcu 2a63f34d40 xserver-xorg: upgrade to 1.15.1
(From OE-Core rev: 7800dd17e6ff511c9146de2bceea6765b0dc1c2c)

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>
2014-04-30 16:39:08 +01:00
Chunrong Guo cbf460735e bumps to remove PRINC use in meta-fsl-ppc
(From OE-Core rev: 1a91d791a903ab837a7695cfe47828618b8be6a6)

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:20 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Kai Kang 377ce42a6a xorg: Fix for CVE-2013-6424
Integer underflow in the xTrapezoidValid macro in render/picture.h in X.Org
allows context-dependent attackers to cause a denial of service (crash) via
a negative bottom value.

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-6424

(From OE-Core rev: 059dc5f4ef9bcf49cb6520f5f2ab1e739f4d42de)

Signed-off-by: Baogen Shang <baogen.shang@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-01 23:37:01 +01:00
Otavio Salvador 2f9bf7bc97 PR bumps to remove PRINC use in meta-fsl-arm
Those recipes need PR bump so we drop PRINC from meta-fsl-arm layer.

(From OE-Core rev: b60c68a4ea937a647e13d69dfecefb7dcbda95a0)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-07 13:39:11 +00:00
Martin Jansa a01af02025 recipes: bump PRs
* resolves following warnings:
  WARNING: Use of PRINC 17 was detected in the recipe meta-openembedded/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_git.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe meta-smartphone/meta-android/recipes-bsp/chroot-script/chroot-script_1.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-connectivity/bind/bind_9.8.1.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-core/systemd/systemd-serialgetty.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-extended/screen/screen_4.0.3.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-extended/shadow/shadow_4.1.4.3.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb (or one of its .bbappends)
  WARNING: Use of PRINC 1 was detected in the recipe openembedded-core/meta/recipes-support/libcap/libcap_2.22.bb (or one of its .bbappends)
  WARNING: Use of PRINC 11 was detected in the recipe openembedded-core/meta/recipes-bsp/keymaps/keymaps_1.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 11 was detected in the recipe openembedded-core/meta/recipes-core/systemd/systemd-compat-units.bb (or one of its .bbappends)
  WARNING: Use of PRINC 12 was detected in the recipe openembedded-core/meta/recipes-core/initscripts/initscripts_1.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 13 was detected in the recipe openembedded-core/meta/recipes-core/base-files/base-files_3.0.14.bb (or one of its .bbappends)
  WARNING: Use of PRINC 2 was detected in the recipe meta-openembedded/meta-oe/recipes-navigation/navit/navit_svn.bb (or one of its .bbappends)
  WARNING: Use of PRINC 2 was detected in the recipe meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.97.bb (or one of its .bbappends)
  WARNING: Use of PRINC 2 was detected in the recipe openembedded-core/meta/recipes-connectivity/portmap/portmap_6.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 2 was detected in the recipe openembedded-core/meta/recipes-extended/pam/libpam_1.1.6.bb (or one of its .bbappends)
  WARNING: Use of PRINC 2 was detected in the recipe openembedded-core/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe meta-openembedded/meta-efl/recipes-efl/efl/entrance_svn.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe openembedded-core/meta/recipes-bsp/formfactor/formfactor_0.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe openembedded-core/meta/recipes-connectivity/avahi/avahi_0.6.31.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe openembedded-core/meta/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe openembedded-core/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 3 was detected in the recipe openembedded-core/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb (or one of its .bbappends)
  WARNING: Use of PRINC 5 was detected in the recipe meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb (or one of its .bbappends)
  WARNING: Use of PRINC 5 was detected in the recipe openembedded-core/meta/recipes-connectivity/bluez/bluez4_4.101.bb (or one of its .bbappends)
  WARNING: Use of PRINC 6 was detected in the recipe openembedded-core/meta/recipes-core/packagegroups/packagegroup-base.bb (or one of its .bbappends)
  WARNING: Use of PRINC 6 was detected in the recipe openembedded-core/meta/recipes-core/packagegroups/packagegroup-core-boot.bb (or one of its .bbappends)
  WARNING: Use of PRINC 6 was detected in the recipe openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb (or one of its .bbappends)
  WARNING: Use of PRINC 7 was detected in the recipe meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb (or one of its .bbappends)
  WARNING: Use of PRINC 7 was detected in the recipe openembedded-core/meta/recipes-core/udev/udev-extraconf_1.0.bb (or one of its .bbappends)

(From OE-Core rev: c6825ec6e92e20bb64a051d1576f363c16e98d68)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-05 17:36:37 +00:00
Laurentiu Palcu 3bfb713d1c xserver-xorg: upgrade to 1.15.0
License file changed slightly: a new person has been added to the list
of authors.

Add dependency of presentproto.

(From OE-Core rev: b18fb872baa0deb89f1b8250883122fb5f6328c5)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-09 09:42:53 +00:00
Paul Eggleton cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Ross Burton 472e6c48cf xserver: remove unrecognised options
--disable-xorgcfg was removed in 2008.

--with-fontdir was renamed to --with-fontrootdir in 2009 and the default value
is good.

--disable-xf86misc was removed in 2008.

--disable-acfb, -ccfb and -mcfb should have been --disable-afb, -cfb, -mfb, and
were removed in 2008.

(From OE-Core rev: 772f61c829d8199073a0ab0dae5012ce9b52fe34)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-05 14:25:28 +00:00
Ross Burton 32c1180c88 xserver-xorg: upgrade to 1.14.4
The xinerama and dixstruct patches are merged in 1.14.4, so drop them.

Also drop explicit PR statement.

(From OE-Core rev: 60973d0584e2533f0debfcd8e80c5e29beb68e37)

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-11-08 17:31:35 +00:00
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
Richard Purdie de6657ec46 Sync with PRINC removal from meta-intel
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>
2013-06-24 14:58:35 +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
Saul Wold ea89950ba8 Upstream-Status: Correct Capitalization
(From OE-Core rev: 43b2a2f375e2201be7a9bb6a9c5c0a9fc61f3361)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-12 09:37:31 +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 09f0c9d2ed xserver-xf86-config: set DefaultDepth to 16 for qemumips
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>
2013-04-18 21:12:19 +01:00
Andreas Müller 716bf31e0b xserver-xorg: fix segfaults for ARM SoCs
(From OE-Core rev: f45a03b510479f6c27b24a0fd8d0c661674495e1)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-16 16:51:40 +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
Laurentiu Palcu 55cbf61342 xserver-xorg: upgrade to 1.14.0
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>
2013-03-15 01:53:04 +00:00
Ross Burton e723d3b234 xserver-xf86-config: empty generic xorg.conf
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>
2013-02-22 06:09:23 -08:00
Ross Burton 4f977ab120 xserver-xf86-config: don't ship empty xorg.conf
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>
2013-02-22 06:09:22 -08:00
Marcin Juszkiewicz 1a277565b7 xserver-xorg: add AArch64 support
Launchpad bug: https://bugs.launchpad.net/linaro-aarch64/+bug/1092128

(From OE-Core rev: aa2d9049a9a0f73123bf3d7e9221552ff49dab8a)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-07 13:50:38 +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
Laurentiu Palcu 63e789a573 xserver-xorg: upgrade to 1.13.1
(From OE-Core rev: 5d70032c8629c7a1fbc86a4cbb9a9ec5032239db)

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>
2012-12-19 17:54:56 +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
Ross Burton 9d765590cf xserver-xorg: upgrade to 1.11.4
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>
2012-10-18 12:13:34 +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
Ross Burton 629282ecd0 xserver-xorg: merge version-specific .inc into .bb
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>
2012-09-28 11:07:38 +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