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 f9080d53c5..b1a3264a74 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 9677f66a240a0513623aa26b47233b49193d0402 Mon Sep 17 00:00:00 2001 +From 55ebcfcc3dcb90fa4900773b489a3e957f117551 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 @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 10be099e..3bb6eec7 100644 +index cd1953c3..7af920b1 100644 --- a/meson.build +++ b/meson.build @@ -77,7 +77,7 @@ flags = [ 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 deleted file mode 100644 index 67dc4989b5..0000000000 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - -Getting below error int conversion during compilation as one the -platforms where EGLNativeDisplayType is an int instead of a pointer. - -| ../git/src/vrend_winsys_egl.c: In function 'virgl_egl_init': -| ../git/src/vrend_winsys_egl.c:364:62: error: passing argument 2 of 'egl->funcs.epoxy_eglGetPlatformDisplay' makes pointer from -| 364 | (EGLNativeDisplayType)egl->gbm->device, NULL); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| | | -| | int -| ../git/src/vrend_winsys_egl.c:364:62: note: expected 'void *' but argument is of type 'int' - -Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/464deabe4d1bfce6b8f414ab0945d9a62b66ddd4] - -Signed-off-by: Purushottam Choudhary -Part-of: ---- - src/vrend_winsys_egl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c -index 9d9f410c..8750f6b2 100644 ---- a/src/vrend_winsys_egl.c -+++ b/src/vrend_winsys_egl.c -@@ -361,7 +361,7 @@ struct virgl_egl *virgl_egl_init(EGLNativeDisplayType display_id, bool surfacele - #ifdef ENABLE_GBM - else - egl->egl_display = egl->funcs.eglGetPlatformDisplay(EGL_PLATFORM_GBM_KHR, -- (EGLNativeDisplayType)egl->gbm->device, NULL); -+ (EGLNativeDisplayType*)egl->gbm->device, NULL); - #endif - } else { - #ifdef ENABLE_GBM diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.1.bb similarity index 90% rename from meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_1.1.1.bb index 07abde1c4f..d959de2ee3 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.1.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "1aeaf5e10a9c89096e96d09599aa419d5c50712f" +SRCREV = "0f1f43929724a6a414c01a29bc51feccb445c2f0" 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 \ " S = "${WORKDIR}/git"