Commit Graph

21 Commits

Author SHA1 Message Date
Khem Raj
f2cf5d3398 xserver-xorg: Fix build with musl
inb/outb are implemented for ARM on glibc but not on linux in general
therefore the conditional has to reflect that

(From OE-Core rev: 8920e520b58118c72c68e739c780efd71c1650d3)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-24 09:40:26 +00:00
Jussi Kukkonen
a1003f5004 xserver-xorg: Upgrade 1.17.2 -> 1.18.0
* Remove glibc-guard patch: xserver no longer uses termio.h on linux
  in any case.
* Remove "--enable-glx-tls": this hasn't done anything since glapi
  was separated from glx
* Note that xserver no longer installs evdev configuration
  (evdev and/or libinput should do it instead)
* Add patch to check for libsystemd correctly
* Add PACKAGECONFIG for libsystemd

(From OE-Core rev: 9057678e75ec09af081b27d5935907ec955c3664)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-11-25 08:08:14 +00:00
Jussi Kukkonen
f8b25377a6 xorg-xserver: Upgrade 1.17.1 -> 1.17.2
Fixes CVE-2015-3164 in Xwayland.

Remove unnecessary patches:
 * fix_open_max_preprocessor_error.patch is no longer needed:
   OPEN_MAX is defined in every case now
 * xorg-CVE-2013-6424.patch was handled in pixman several releases ago
 * other removed patches are included in 1.17.2

(From OE-Core rev: 1d35231d666baee9ac4aaeb482371f3c71998c76)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-27 22:42:54 +01:00
Bruce Ashfield
62136c0e81 xorg: fix VESA int10 error
When falling back to the VESA server, X fails to start due to an error
reading the int10 vec.

We cherry-pick the following commit to fix the error:

   commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
   Author: Jürg Billeter <j@bitron.ch>
   Date:   Sat Feb 7 18:13:21 2015 +0100

       int10: Fix error check for pci_device_map_legacy

       pci_device_map_legacy returns 0 on success.

       Signed-off-by: Jürg Billeter <j@bitron.ch>
       Reviewed-by: Adam Jackson <ajax@redhat.com>
       Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

(From OE-Core rev: e1570e12f92bf359ef34d0e2998b09981bcece18)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-11 23:59:16 +01:00
Jussi Kukkonen
f63e9b30ea xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change)
* Increase OELAYOUT_ABI: this is required because the
  xf86-video-modesetting package moves from its own recipe to
  xserver-xorg and sanity check cannot handle that currently.
  The upgrade will delete old xf86-video-modesetting files from
  sysroots.
* Remove upstreamed xserver-xorg patches
* Remove xf86-video-modesetting recipe: the driver is now included in
  xserver-xorg recipe, which now produces the xf86-video-modesetting
  package. The package version changes from 0.9 to 1.17.1
* Update xserver-xorg license checksum: modesetting license
  info (another MIT one) has been added to the file

(From OE-Core rev: 950846d019ffac21909a96d90af8cf7e5bdd5738)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-03 16:38:48 +01:00
Ross Burton
0321760d77 xserver-xorg: use GCC 5 patch from upstream
Upstream has already fixed the GCC 5 problem, so use the patch from upstream.

(From OE-Core rev: 15b39bfbb1a0263ac194a9833175b72ab7345ebd)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-30 23:04:11 +01:00
Khem Raj
44131ab24e xserver-xorg: Fix build with gcc-5
Backport a patch from fedora details are in patch header

Change-Id: I6b8dfaae3b751071bf8b0d88b15a4f95c19877f6
(From OE-Core rev: 100ab2578bd2025aed940fddce467a4606962695)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-27 14:59:48 +01:00
Khem Raj
7b766abeb6 xserver-xorg: Use __GLIBC__ instread of __linux__ to denote glibc dependent code
Change-Id: Ia899520181feb1c601a76e04a176f4387a331c00
(From OE-Core rev: e9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-13 22:33:23 +01:00
Li Zhou
77a44c253b xorg-server: Security Advisory - xorg-server - CVE-2015-0255
Updated x11-server packages fix security vulnerability:

Olivier Fourdan from Red Hat has discovered a protocol handling issue in
the way the X server code base handles the XkbSetGeometry request, where
the server trusts the client to send valid string lengths. A malicious
client with string lengths exceeding the request length can cause the server
to copy adjacent memory data into the XKB structs. This data is then
available to the client via the XkbGetGeometry request. This can lead to
information disclosure issues, as well as possibly a denial of service if a
similar request can cause the server to crash (CVE-2015-0255).

(From OE-Core rev: 564e2f9732ac4318bb5923dd1ff771514c9afd2f)

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-10 18:10:26 +01:00
Ross Burton
dae9b5fb79 xserver-xorg: don't close already-closed connections
On shutdown xserver was closing connections that were already closed, resulting
in a segfault.

(From OE-Core rev: 04ffd02a14f5e0cd2ce0288b589d4c4a0120e2f4)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-10 10:47:52 +00:00
Jun Zhu
b7d334df3c xserver-xorg: Add the patch to fix subwindow in Xi emulated events
(From OE-Core rev: e82c9e8098326f2ec070471b7a3daed21cc2cd28)

Signed-off-by: Jun Zhu <R01007@freescale.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-29 15:36:50 +00:00
Aníbal Limón
acfb2982e8 xorg-xserver: Upgrade to 1.16.2.
Add PACKAGECONFIG systemd, xserver-xorg now depends in dbus because
adds support for systemd-logind, dbus is used by xserver-xorg to
communicate with systemd.

Add conditional enablement of systemd-logind if DISTRO_FEATURES contains
systemd.

Remove crosscompile, mips64-compile and present-module because are already
in upstream.

(From OE-Core rev: 4c33baa4a95aee26c6bf6fd0c7ec827ff63a9e62)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-11 11:34:55 +00:00
Ross Burton
3ce139b5d6 xserver-xorg: update patch to match upstream
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-10-10 16:44:31 +01:00
Ross Burton
cc2add24f4 xserver-xorg: report DRI3 and Present modules as present
The DRI3 and Present modules are built-in but some drivers (such as
xf86-video-intel) want to query their presence.  Backport a patch from upstream
to stop this causing an error.

[ YOCTO #6583 ]

(From OE-Core rev: d7bb1d8b1a7cd11895037b7984b9aa916efa9733)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-10-10 16:44:31 +01:00
Kai Kang
9ebf982d4a xserver-xorg: remove aarch64.patch
Patch aarch64.patch adds aarch64 support for xserver-xorg 1.13.1 in
header file servermd.h. And aarch64 is supported in version 1.15.1
already and the patch causes redefine error.

So remove aarch64.patch.

(From OE-Core rev: 2d8700bf2250ff4975dad51ee32e8d520fc14a11)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-09-11 17:24:53 +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
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
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
Martin Jansa
4c80e07e6c xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
* 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>
2011-10-11 18:08:35 +01:00
Martin Jansa
4981c2a793 xserver-xorg: drop unused files
(From OE-Core rev: 9ccc192d00931288c88503536ba41252fb94e880)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:35 +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