mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

xorg-xserver: Upgrade to 1.16.2.

Browse Source 
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>
This commit is contained in:
Aníbal Limón
2014-12-04 14:58:26 -06:00
committed by Richard Purdie
parent 993989f033
commit acfb2982e8
5 changed files with 7 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
View File

@@ -116,7 +116,9 @@ EXTRA_OECONF += "--with-fop=no \
ac_cv_file__usr_share_sgml_X11_defs_ent=no \
"
PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}"
PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
@@ -126,6 +128,7 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua
PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[systemd] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,dbus-lib"
do_install_append () {
# Its assumed base-files creates this for us

22
meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
View File

@@ -1,22 +0,0 @@
Upstream-Status: Inappropriate [configuration]
diff --git a/configure.ac b/configure.ac
index b3b752c..600500b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
dnl compiling, assume default font path uses standard FONTROOTDIR directories.
DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
-if test "$cross_compiling" != yes; then
- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
- [case $host_os in
+ case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- esac])
-fi
+ esac
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
[ FONTPATH="$withval" ],
[ FONTPATH="${DEFAULT_FONT_PATH}" ])

29
meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
View File

@@ -1,29 +0,0 @@
on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
so we end up with incompatible conversion errors
This patch choses the right values for mips64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
===================================================================
--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300
+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200
@@ -101,6 +101,7 @@
#if defined(NO_INLINE) || defined(DO_PROTOTYPES)
#if !defined(__arm__)
#if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
+ && !defined(__mips64) \
&& !(defined(__alpha__) && defined(linux)) \
&& !(defined(__ia64__) && defined(linux)) \
@@ -721,7 +722,7 @@
}
#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#ifdef __arm32__
+#if defined (__arm32__) || defined (__mips64)
#define PORT_SIZE long
#else
#define PORT_SIZE short

66
meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
View File

@@ -1,66 +0,0 @@
[ YOCTO #6583 ]
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 28 May 2014 08:13:59 +0100
Subject: xfree86: Report DRI3 as a built-in module
This is so that drivers can do a runtime check that DRI3 is available,
similar to existing runtime checks performed by the drivers for DRI and
DRI2.
v2: Only add DRI3 to the list if the module was actually built into the
server (Mark Kettenis).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mark Kettenis <mark.kettenis@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 092bf57..f92ad8d 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = {
"extmod",
"dri",
"dri2",
+#if DRI3
+ "dri3",
+#endif
NULL
};
--
cgit v0.10.2
From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 28 May 2014 08:14:00 +0100
Subject: xfree86: Report Present as a built-in module
This is so that drivers can do a runtime check that Present is available,
similar to existing runtime checks performed by the drivers for DRI.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index f92ad8d..e1f649a 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = {
#if DRI3
"dri3",
#endif
+#if PRESENT
+ "present",
+#endif
NULL
};
--
cgit v0.10.2

9
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb → meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.2.bb
View File

@@ -1,16 +1,13 @@
require xserver-xorg.inc
# Misc build failure for master HEAD
SRC_URI += "file://crosscompile.patch \
file://fix_open_max_preprocessor_error.patch \
file://mips64-compiler.patch \
SRC_URI += "file://fix_open_max_preprocessor_error.patch \
file://xorg-CVE-2013-6424.patch \
file://xshmfence-option.patch \
file://present-module.patch \
"
SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227"
SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2"
SRC_URI[md5sum] = "89620960b13515db8d0a8dbb92a1378a"
SRC_URI[sha256sum] = "446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.