summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch37
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer_1.1.1.bb (renamed from meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb)7
2 files changed, 3 insertions, 41 deletions
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 @@
1From bb129aac12c5aa6e2dd371244b042baa82aff014 Mon Sep 17 00:00:00 2001
2From: Purushottam Choudhary <purushottam27.kumar@lge.com>
3Date: Tue, 8 Oct 2024 11:47:21 +0530
4Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14
5
6Getting below error int conversion during compilation as one the
7platforms where EGLNativeDisplayType is an int instead of a pointer.
8
9| ../git/src/vrend_winsys_egl.c: In function 'virgl_egl_init':
10| ../git/src/vrend_winsys_egl.c:364:62: error: passing argument 2 of 'egl->funcs.epoxy_eglGetPlatformDisplay' makes pointer from
11| 364 | (EGLNativeDisplayType)egl->gbm->device, NULL);
12| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13| | |
14| | int
15| ../git/src/vrend_winsys_egl.c:364:62: note: expected 'void *' but argument is of type 'int'
16
17Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/464deabe4d1bfce6b8f414ab0945d9a62b66ddd4]
18
19Signed-off-by: Purushottam Choudhary <purushottam27.kumar@lge.com>
20Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1440>
21---
22 src/vrend_winsys_egl.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c
26index 9d9f410c..8750f6b2 100644
27--- a/src/vrend_winsys_egl.c
28+++ b/src/vrend_winsys_egl.c
29@@ -361,7 +361,7 @@ struct virgl_egl *virgl_egl_init(EGLNativeDisplayType display_id, bool surfacele
30 #ifdef ENABLE_GBM
31 else
32 egl->egl_display = egl->funcs.eglGetPlatformDisplay(EGL_PLATFORM_GBM_KHR,
33- (EGLNativeDisplayType)egl->gbm->device, NULL);
34+ (EGLNativeDisplayType*)egl->gbm->device, NULL);
35 #endif
36 } else {
37 #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
index 11c3c8c963..89dd25de70 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_1.1.1.bb
@@ -8,11 +8,10 @@ HOMEPAGE = "https://virgil3d.github.io/"
8LICENSE = "MIT" 8LICENSE = "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 python3-pyyaml-native virtual/egl virtual/libgbm"
12SRCREV = "1aeaf5e10a9c89096e96d09599aa419d5c50712f" 12SRCREV = "0f1f43929724a6a414c01a29bc51feccb445c2f0"
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;tag=${PV} \
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 \
16 " 15 "
17 16
18inherit meson pkgconfig features_check 17inherit meson pkgconfig features_check