recipes-graphics: xserver: Update recipes to new BSP release imx_5.4.70_2.3.0
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
This commit is contained in:
parent
b27527bf53
commit
288b6f012f
|
|
@ -0,0 +1,36 @@
|
||||||
|
From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Fri, 1 Mar 2019 09:47:57 -0800
|
||||||
|
Subject: [PATCH] test/xtest: Initialize array with braces
|
||||||
|
|
||||||
|
Fixes an error when extra warnings are enabled, this is caught with clang
|
||||||
|
|
||||||
|
test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
|
||||||
|
WindowRec root = {0};
|
||||||
|
^
|
||||||
|
{}
|
||||||
|
1 error generated.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
test/xtest.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/xtest.c b/test/xtest.c
|
||||||
|
index fc5e433..d7e6620 100644
|
||||||
|
--- a/test/xtest.c
|
||||||
|
+++ b/test/xtest.c
|
||||||
|
@@ -61,7 +61,7 @@ xtest_init_devices(void)
|
||||||
|
{
|
||||||
|
ScreenRec screen = {0};
|
||||||
|
ClientRec server_client = {0};
|
||||||
|
- WindowRec root = {0};
|
||||||
|
+ WindowRec root = {{0}};
|
||||||
|
WindowOptRec optional = {0};
|
||||||
|
|
||||||
|
/* random stuff that needs initialization */
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: California Sullivan <california.l.sullivan@intel.com>
|
||||||
|
Date: Fri, 16 Mar 2018 17:23:11 -0700
|
||||||
|
Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware
|
||||||
|
|
||||||
|
Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting
|
||||||
|
Author: Timo Aaltonen <tjaalton@debian.org>
|
||||||
|
|
||||||
|
Instead of defaulting to the Intel driver for all Intel hardware, only
|
||||||
|
default it for older hardware for which it has shown to be better for.
|
||||||
|
|
||||||
|
Others fall through to the -modesetting default.
|
||||||
|
|
||||||
|
Upstream-Status: Pending [Debian/Fedora patch
|
||||||
|
https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d]
|
||||||
|
|
||||||
|
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
|
||||||
|
---
|
||||||
|
hw/xfree86/common/xf86pciBus.c | 18 +++++++++++++++++-
|
||||||
|
1 file changed, 17 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
|
||||||
|
index e61ae0cd4..d70c99197 100644
|
||||||
|
--- a/hw/xfree86/common/xf86pciBus.c
|
||||||
|
+++ b/hw/xfree86/common/xf86pciBus.c
|
||||||
|
@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
|
||||||
|
case 0x0bef:
|
||||||
|
/* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */
|
||||||
|
break;
|
||||||
|
- default:
|
||||||
|
+ /* Default to intel only on pre-gen4 chips */
|
||||||
|
+ case 0x3577:
|
||||||
|
+ case 0x2562:
|
||||||
|
+ case 0x3582:
|
||||||
|
+ case 0x358e:
|
||||||
|
+ case 0x2572:
|
||||||
|
+ case 0x2582:
|
||||||
|
+ case 0x258a:
|
||||||
|
+ case 0x2592:
|
||||||
|
+ case 0x2772:
|
||||||
|
+ case 0x27a2:
|
||||||
|
+ case 0x27ae:
|
||||||
|
+ case 0x29b2:
|
||||||
|
+ case 0x29c2:
|
||||||
|
+ case 0x29d2:
|
||||||
|
+ case 0xa001:
|
||||||
|
+ case 0xa011:
|
||||||
|
driverList[0] = "intel";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
|
Date: Thu, 20 Sep 2018 20:12:24 +0100
|
||||||
|
Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
|
||||||
|
|
||||||
|
Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
|
||||||
|
simply get all of the CFLAGS. Aside from completeness, this helps builds in
|
||||||
|
sysroots as pkg-config knows what to do with --cflags but doesn't remap
|
||||||
|
arbitrary variables.
|
||||||
|
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
---
|
||||||
|
xorg-server.m4 | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/xorg-server.m4 b/xorg-server.m4
|
||||||
|
index 18255b91a..195bda5d8 100644
|
||||||
|
--- a/xorg-server.m4
|
||||||
|
+++ b/xorg-server.m4
|
||||||
|
@@ -31,7 +31,7 @@ dnl
|
||||||
|
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||||
|
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||||
|
SAVE_CFLAGS="$CFLAGS"
|
||||||
|
- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
|
||||||
|
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
|
#include "xorg-server.h"
|
||||||
|
#if !defined $1
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
|
Date: Thu, 1 Aug 2019 15:24:51 +0100
|
||||||
|
Subject: [PATCH] sdksyms.sh: don't embed the build path
|
||||||
|
|
||||||
|
This script generates a header that has a comment containing the build path for
|
||||||
|
no real reason. As this source can end up deployed on targets in debug packages
|
||||||
|
this means there is both potentially sensitive information leakage about the
|
||||||
|
build environment, and a source of change for reproducible builds.
|
||||||
|
---
|
||||||
|
hw/xfree86/sdksyms.sh | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
|
||||||
|
index 39e33711d..bdf47a71a 100755
|
||||||
|
--- a/hw/xfree86/sdksyms.sh
|
||||||
|
+++ b/hw/xfree86/sdksyms.sh
|
||||||
|
@@ -302,13 +302,16 @@ LC_ALL=C
|
||||||
|
export LC_ALL
|
||||||
|
${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
|
||||||
|
${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
|
||||||
|
+function basename(file) {
|
||||||
|
+ sub(".*/", "", file)
|
||||||
|
+ return file
|
||||||
|
+}
|
||||||
|
BEGIN {
|
||||||
|
sdk = 0;
|
||||||
|
print("/*");
|
||||||
|
print(" * These symbols are referenced to ensure they");
|
||||||
|
print(" * will be available in the X Server binary.");
|
||||||
|
print(" */");
|
||||||
|
- printf("/* topdir=%s */\n", topdir);
|
||||||
|
print("_X_HIDDEN void *xorg_symbols[] = {");
|
||||||
|
|
||||||
|
printf("sdksyms.c:") > "sdksyms.dep";
|
||||||
|
@@ -337,7 +340,7 @@ BEGIN {
|
||||||
|
# remove quotes
|
||||||
|
gsub(/"/, "", $3);
|
||||||
|
line = $2;
|
||||||
|
- header = $3;
|
||||||
|
+ header = basename($3);
|
||||||
|
if (! headers[$3]) {
|
||||||
|
printf(" \\\n %s", $3) >> "sdksyms.dep";
|
||||||
|
headers[$3] = 1;
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
|
|
@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
inherit features_check
|
inherit distro_features_check
|
||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
|
LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
require xserver-xorg.inc
|
require xserver-xorg.inc
|
||||||
|
|
||||||
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-graphics/xorg-xserver/xserver-xorg:"
|
|
||||||
|
|
||||||
SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
|
SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
|
||||||
file://pkgconfig.patch \
|
file://pkgconfig.patch \
|
||||||
file://0001-test-xtest-Initialize-array-with-braces.patch \
|
file://0001-test-xtest-Initialize-array-with-braces.patch \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue