summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-12-04 07:48:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-05 17:07:10 +0000
commit958124a53ddd4a0e7c43eb2e3e2ba0ca2d14e873 (patch)
tree19c7eb3cb8e6ac395ec6c66b7800cae455e77c35
parentfd467c0d6094de5b03b478f4664e4d80136eb25c (diff)
downloadpoky-958124a53ddd4a0e7c43eb2e3e2ba0ca2d14e873.tar.gz
virglrenderer: upgrade 1.0.1 -> 1.1.0
drm-msm-experimental option removed upstream. (From OE-Core rev: 8f405c5a7e5be3bb55fed0d8800d22404c5ba0a6) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch9
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch6
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb (renamed from meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb)3
3 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
index 3e12495970..f9080d53c5 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch
@@ -1,4 +1,4 @@
1From dec8cca59124d7f8796b54902482ceb295a71b51 Mon Sep 17 00:00:00 2001 1From 9677f66a240a0513623aa26b47233b49193d0402 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 6 Jan 2020 12:44:42 +0100 3Date: Mon, 6 Jan 2020 12:44:42 +0100
4Subject: [PATCH] meson.build: use 'python3' directly for python 4Subject: [PATCH] meson.build: use 'python3' directly for python
@@ -8,16 +8,15 @@ its configuration).
8 8
9Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12--- 11---
13 meson.build | 2 +- 12 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/meson.build b/meson.build 15diff --git a/meson.build b/meson.build
17index 9f91ff2f..2391f89d 100644 16index 10be099e..3bb6eec7 100644
18--- a/meson.build 17--- a/meson.build
19+++ b/meson.build 18+++ b/meson.build
20@@ -74,7 +74,7 @@ flags = [ 19@@ -77,7 +77,7 @@ flags = [
21 20
22 add_project_arguments(cc.get_supported_arguments(flags), language : 'c') 21 add_project_arguments(cc.get_supported_arguments(flags), language : 'c')
23 22
@@ -25,4 +24,4 @@ index 9f91ff2f..2391f89d 100644
25+prog_python = 'python3' 24+prog_python = 'python3'
26 25
27 not_found = dependency('', required: false) 26 not_found = dependency('', required: false)
28 libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus')) 27 gbm_dep = not_found
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch
index 9c49ee512a..67dc4989b5 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch
@@ -1,4 +1,4 @@
1From 464deabe4d1bfce6b8f414ab0945d9a62b66ddd4 Mon Sep 17 00:00:00 2001 1From bb129aac12c5aa6e2dd371244b042baa82aff014 Mon Sep 17 00:00:00 2001
2From: Purushottam Choudhary <purushottam27.kumar@lge.com> 2From: Purushottam Choudhary <purushottam27.kumar@lge.com>
3Date: Tue, 8 Oct 2024 11:47:21 +0530 3Date: Tue, 8 Oct 2024 11:47:21 +0530
4Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14 4Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14
@@ -19,7 +19,6 @@ Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/
19Signed-off-by: Purushottam Choudhary <purushottam27.kumar@lge.com> 19Signed-off-by: Purushottam Choudhary <purushottam27.kumar@lge.com>
20Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1440> 20Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1440>
21--- 21---
22
23 src/vrend_winsys_egl.c | 2 +- 22 src/vrend_winsys_egl.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
25 24
@@ -36,6 +35,3 @@ index 9d9f410c..8750f6b2 100644
36 #endif 35 #endif
37 } else { 36 } else {
38 #ifdef ENABLE_GBM 37 #ifdef ENABLE_GBM
39--
402.34.1
41
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb
index 87f25a3461..07abde1c4f 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" 9LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
10 10
11DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" 11DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm"
12SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" 12SRCREV = "1aeaf5e10a9c89096e96d09599aa419d5c50712f"
13SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ 13SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \
14 file://0001-meson.build-use-python3-directly-for-python.patch \ 14 file://0001-meson.build-use-python3-directly-for-python.patch \
15 file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \ 15 file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \
@@ -24,7 +24,6 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '',
24PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers" 24PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers"
25PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva" 25PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva"
26PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false" 26PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false"
27PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false"
28PACKAGECONFIG[minigbm_allocation] = "-Dminigbm_allocation=true,-Dminigbm_allocation=false" 27PACKAGECONFIG[minigbm_allocation] = "-Dminigbm_allocation=true,-Dminigbm_allocation=false"
29PACKAGECONFIG[venus-validate] = "-Dvenus-validate=true,-Dvenus-validate=false" 28PACKAGECONFIG[venus-validate] = "-Dvenus-validate=true,-Dvenus-validate=false"
30PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,libcheck" 29PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,libcheck"