From 8f405c5a7e5be3bb55fed0d8800d22404c5ba0a6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Dec 2024 07:48:56 +0100 Subject: [PATCH] virglrenderer: upgrade 1.0.1 -> 1.1.0 drm-msm-experimental option removed upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...001-meson.build-use-python3-directly-for-python.patch | 9 ++++----- ...-Fix-int-conversion-fatal-build-error-with-GCC-.patch | 6 +----- .../{virglrenderer_1.0.1.bb => virglrenderer_1.1.0.bb} | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) rename meta/recipes-graphics/virglrenderer/{virglrenderer_1.0.1.bb => virglrenderer_1.1.0.bb} (90%) 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 3e124959701..f9080d53c51 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 @@ -From dec8cca59124d7f8796b54902482ceb295a71b51 Mon Sep 17 00:00:00 2001 +From 9677f66a240a0513623aa26b47233b49193d0402 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 6 Jan 2020 12:44:42 +0100 Subject: [PATCH] meson.build: use 'python3' directly for python @@ -8,16 +8,15 @@ its configuration). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 9f91ff2f..2391f89d 100644 +index 10be099e..3bb6eec7 100644 --- a/meson.build +++ b/meson.build -@@ -74,7 +74,7 @@ flags = [ +@@ -77,7 +77,7 @@ flags = [ add_project_arguments(cc.get_supported_arguments(flags), language : 'c') @@ -25,4 +24,4 @@ index 9f91ff2f..2391f89d 100644 +prog_python = 'python3' not_found = dependency('', required: false) - libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus')) + 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 9c49ee512a9..67dc4989b5a 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 @@ -From 464deabe4d1bfce6b8f414ab0945d9a62b66ddd4 Mon Sep 17 00:00:00 2001 +From bb129aac12c5aa6e2dd371244b042baa82aff014 Mon Sep 17 00:00:00 2001 From: Purushottam Choudhary Date: Tue, 8 Oct 2024 11:47:21 +0530 Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14 @@ -19,7 +19,6 @@ Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/ Signed-off-by: Purushottam Choudhary Part-of: --- - src/vrend_winsys_egl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -36,6 +35,3 @@ index 9d9f410c..8750f6b2 100644 #endif } else { #ifdef ENABLE_GBM --- -2.34.1 - diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb similarity index 90% rename from meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb index 87f25a34610..07abde1c4f7 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" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" +SRCREV = "1aeaf5e10a9c89096e96d09599aa419d5c50712f" SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ file://0001-meson.build-use-python3-directly-for-python.patch \ file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \ @@ -24,7 +24,6 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers" PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva" PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false" -PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false" PACKAGECONFIG[minigbm_allocation] = "-Dminigbm_allocation=true,-Dminigbm_allocation=false" PACKAGECONFIG[venus-validate] = "-Dvenus-validate=true,-Dvenus-validate=false" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,libcheck" -- 2.47.3