mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

mesa: Upgrade 18.1.3 -> 18.1.7

Browse Source 
This upgrades mesa to the 18.1.7 stable release.

The changes can be found at:

 https://www.mesa3d.org/relnotes/18.1.4.html
 https://www.mesa3d.org/relnotes/18.1.5.html
 https://www.mesa3d.org/relnotes/18.1.6.html
 https://www.mesa3d.org/relnotes/18.1.7.html

(From OE-Core rev: a77eb44bb1ff2ece9dcff1f7b5fe671ea3ae034d)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Otavio Salvador
2018-08-30 14:27:37 -03:00
committed by Richard Purdie
parent 76956f0057
commit 3ad9909e59
10 changed files with 59 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch → meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
+5 -4
View File
@@ -1,7 +1,7 @@
From 425c19542f9343e7b6a5b8aea26e1f2897484bc1 Mon Sep 17 00:00:00 2001
From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 15 Nov 2016 15:20:49 +0200
Subject: [PATCH 2/8] Simplify wayland-scanner lookup
Subject: [PATCH 1/6] Simplify wayland-scanner lookup
Organization: O.S. Systems Software LTDA.
Don't use pkg-config to lookup the path of a binary that's in the path.
@@ -11,15 +11,16 @@ PKG_CONFIG_SYSROOT_DIR.
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
configure.ac | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 49fa3e8c51..3a8f04bd12 100644
index 14f1af2b2f..916d0bd207 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1810,12 +1810,7 @@ for plat in $platforms; do
@@ -1825,12 +1825,7 @@ for plat in $platforms; do
PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch → meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch
+3 -2
View File
@@ -1,7 +1,7 @@
From 7701d24b775de9f7b74eaa1ff80c8a6d3fb09c71 Mon Sep 17 00:00:00 2001
From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Aug 2017 18:58:20 -0700
Subject: [PATCH 3/8] winsys/svga/drm: Include sys/types.h
Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h
Organization: O.S. Systems Software LTDA.
vmw_screen.h uses dev_t which is defines in sys/types.h
@@ -12,6 +12,7 @@ system headers
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
src/gallium/winsys/svga/drm/vmw_screen.h | 1 +
1 file changed, 1 insertion(+)
meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch → meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
+5 -5
View File
@@ -1,7 +1,7 @@
From a240a803529225dda630b8f57ca7dfcad61ccd85 Mon Sep 17 00:00:00 2001
From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 5 Jun 2018 11:11:10 -0300
Subject: [PATCH 5/8] Properly get LLVM version when using LLVM Git releases
Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases
Organization: O.S. Systems Software LTDA.
$ llvm-config-host --version
@@ -18,10 +18,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3a8f04bd12..59226823ca 100644
index 916d0bd207..dd172f1ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,7 +1089,7 @@ strip_unwanted_llvm_flags() {
@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() {
llvm_set_environment_variables() {
if test "x$LLVM_CONFIG" != xno; then
@@ -30,7 +30,7 @@ index 3a8f04bd12..59226823ca 100644
LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir`
LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
@@ -2793,7 +2793,7 @@ detect_old_buggy_llvm() {
@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() {
dnl ourselves.
dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch → meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
+3 -3
View File
@@ -1,7 +1,7 @@
From 66b512e72e164a0da13c1cfffe988188cc2b4988 Mon Sep 17 00:00:00 2001
From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 29 Dec 2017 10:27:59 -0200
Subject: [PATCH 6/8] Use Python 3 to execute the scripts
Subject: [PATCH 4/6] Use Python 3 to execute the scripts
Organization: O.S. Systems Software LTDA.
The MESA build system uses Python 2 but as OE-Core has moved away from
@@ -15,7 +15,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 59226823ca..711cb8b82c 100644
index dd172f1ebe..40cac36ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch → meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From 23305c16e4444f5aa289f126f040ed061de292c0 Mon Sep 17 00:00:00 2001
From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 6 Jun 2018 09:50:35 -0300
Subject: [PATCH 7/8] dri: i965: Add missing time.h include
Subject: [PATCH 5/6] dri: i965: Add missing time.h include
Organization: O.S. Systems Software LTDA.
This fixes a build error when using musl:
meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch → meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
+20 -7
View File
@@ -1,19 +1,29 @@
use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 29 Aug 2018 22:10:30 -0300
Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
Organization: O.S. Systems Software LTDA.
This allows to override the wayland-protocols pkgdatadir with the
WAYLAND_PROTOCOLS_DATADIR from environment.
pkgconfig would return an absolute path in /usr/share/wayland-protocols
pkgconfig would return an absolute path in
/usr/share/wayland-protocols
for the pkgdatadir value, which is not suitable for cross-compiling.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: mesa-18.1.2/configure.ac
===================================================================
--- mesa-18.1.2.orig/configure.ac
+++ mesa-18.1.2/configure.ac
@@ -1808,7 +1808,7 @@ for plat in $platforms; do
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 40cac36ac2..728bbdcbc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1823,7 +1823,7 @@ for plat in $platforms; do
PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
@@ -22,3 +32,6 @@ Index: mesa-18.1.2/configure.ac
AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
--
2.18.0
meta/recipes-graphics/mesa/files/0008-egl-fix-build-race-in-automake.patch
-41
View File
@@ -1,41 +0,0 @@
From b2aae4b8c6661424c1809d3e7b43f266e35385a6 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 28 Jun 2018 23:01:59 +0100
Subject: [PATCH 8/8] egl: fix build race in automake
Organization: O.S. Systems Software LTDA.
There is a parallel make build issue in src/egl/drivers/dri2/
for wayland builds. Can be reproduced with:
$ rm src/egl/drivers/dri2/*.h src/egl/drivers/dri2/platform_wayland.lo
$ make -C src/egl/ drivers/dri2/platform_wayland.lo
../../../mesa-18.1.2/src/egl/drivers/dri2/platform_wayland.c:50:10: fatal error: linux-dmabuf-unstable-v1-client-protocol.h: No such file or directory
This patch adds the missing dependency.
Fixes: 02cc359372773800de817 "egl/wayland: Use linux-dmabuf interface for buffers"
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Upstream-Status: Backport [18.2.0]
[Eric: fixed up the commit title]
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
src/egl/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 086a4a1e63..116ed4ebf5 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -80,6 +80,7 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
if HAVE_PLATFORM_WAYLAND
drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
+drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
--
2.18.0
meta/recipes-graphics/mesa/mesa-gl_18.1.3.bb → meta/recipes-graphics/mesa/mesa-gl_18.1.7.bb
View File
meta/recipes-graphics/mesa/mesa_18.1.3.bb
-22
View File
@@ -1,22 +0,0 @@
require ${BPN}.inc
SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0002-Simplify-wayland-scanner-lookup.patch \
file://0003-winsys-svga-drm-Include-sys-types.h.patch \
file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
file://0006-Use-Python-3-to-execute-the-scripts.patch \
file://0007-dri-i965-Add-missing-time.h-include.patch \
file://0008-egl-fix-build-race-in-automake.patch \
file://cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch \
"
SRC_URI[md5sum] = "b34273403a605f6f98ead00f0bdf8e0b"
SRC_URI[sha256sum] = "54f08deeda0cd2f818e8d40140040ed013de7852573002453b7f50da9ea738ce"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
do_install_append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
fi
}
meta/recipes-graphics/mesa/mesa_18.1.7.bb
+21
View File
@@ -0,0 +1,21 @@
require ${BPN}.inc
SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-Simplify-wayland-scanner-lookup.patch \
file://0002-winsys-svga-drm-Include-sys-types.h.patch \
file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
file://0004-Use-Python-3-to-execute-the-scripts.patch \
file://0005-dri-i965-Add-missing-time.h-include.patch \
file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
"
SRC_URI[md5sum] = "17d8a7e7ecbe146a7dc439e8b6eb02e9"
SRC_URI[sha256sum] = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
do_install_append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
fi
}