From 8f5df1a446cf49819d5c9612e557ec78a17142e9 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 9 Jan 2023 13:20:22 +0800 Subject: virglrenderer: upgrade 0.10.3 -> 0.10.4 0001-Replace-lseek64-with-lseek.patch removed since it's included in 0.10.4 (From OE-Core rev: 9150a20880c08a32b71a1307cb55829a8f35f4c1) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-Replace-lseek64-with-lseek.patch | 45 ---------------------- .../virglrenderer/virglrenderer_0.10.3.bb | 34 ---------------- .../virglrenderer/virglrenderer_0.10.4.bb | 33 ++++++++++++++++ 3 files changed, 33 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb (limited to 'meta/recipes-graphics/virglrenderer') diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch deleted file mode 100644 index a0278abd28..0000000000 --- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a60f0658001d2e8e15ad980731d4130808d37d56 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 15 Dec 2022 12:58:57 -0800 -Subject: [PATCH] Replace lseek64 with lseek - -meson defined _FILE_OFFSET_BITS=64 unconditionally, this implies that -lseek and lseek64 are both same since they are using 64bit off_t, -replacing lseek64 with lseek also helps in compiling with latest musl C -library which has removed these from _GNU_SOURCE namespace unlike glibc -where _GNU_SOURCE also implies _LARGEFILE64_SOURCE and the definition of -lseek64 is still available. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1003] -Signed-off-by: Khem Raj ---- - src/proxy/proxy_context.c | 2 +- - src/venus/vkr_context.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/proxy/proxy_context.c b/src/proxy/proxy_context.c -index f2a035b..f20f7c8 100644 ---- a/src/proxy/proxy_context.c -+++ b/src/proxy/proxy_context.c -@@ -319,7 +319,7 @@ validate_resource_fd_shm(int fd, uint64_t expected_size) - return false; - } - -- const uint64_t size = lseek64(fd, 0, SEEK_END); -+ const uint64_t size = lseek(fd, 0, SEEK_END); - if (size != expected_size) { - proxy_log("failed to validate shm size(%" PRIu64 ") expected(%" PRIu64 ")", size, - expected_size); -diff --git a/src/venus/vkr_context.c b/src/venus/vkr_context.c -index 9ecb9cd..1e5dc68 100644 ---- a/src/venus/vkr_context.c -+++ b/src/venus/vkr_context.c -@@ -359,7 +359,7 @@ vkr_context_get_blob_locked(struct virgl_context *base, - return ret; - - if (fd_type == VIRGL_RESOURCE_FD_DMABUF && -- (uint64_t)lseek64(fd, 0, SEEK_END) < blob_size) { -+ (uint64_t)lseek(fd, 0, SEEK_END) < blob_size) { - close(fd); - return -EINVAL; - } diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb deleted file mode 100644 index 5d483431a7..0000000000 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "VirGL virtual OpenGL renderer" -DESCRIPTION = "Virgil is a research project to investigate the possibility of \ -creating a virtual 3D GPU for use inside qemu virtual machines, that allows \ -the guest operating system to use the capabilities of the host GPU to \ -accelerate 3D rendering." -HOMEPAGE = "https://virgil3d.github.io/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" - -DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "0922041ec6730122e0fec11404e6859e2efc4bc0" -SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \ - file://0001-meson.build-use-python3-directly-for-python.patch \ - file://0001-Replace-lseek64-with-lseek.patch \ - " - -S = "${WORKDIR}/git" - -inherit meson pkgconfig features_check - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus-experimental', '', d)}" - -PACKAGECONFIG[venus-experimental] = "-Dvenus-experimental=true,-Dvenus-experimental=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" - -BBCLASSEXTEND = "native nativesdk" - -REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb new file mode 100644 index 0000000000..f76e7cb1b9 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb @@ -0,0 +1,33 @@ +SUMMARY = "VirGL virtual OpenGL renderer" +DESCRIPTION = "Virgil is a research project to investigate the possibility of \ +creating a virtual 3D GPU for use inside qemu virtual machines, that allows \ +the guest operating system to use the capabilities of the host GPU to \ +accelerate 3D rendering." +HOMEPAGE = "https://virgil3d.github.io/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" + +DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" +SRCREV = "88b9fe3bfc64b23a701e4875006dbc0e769f14f6" +SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \ + file://0001-meson.build-use-python3-directly-for-python.patch \ + " + +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus-experimental', '', d)}" + +PACKAGECONFIG[venus-experimental] = "-Dvenus-experimental=true,-Dvenus-experimental=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" + +BBCLASSEXTEND = "native nativesdk" + +REQUIRED_DISTRO_FEATURES = "opengl" -- cgit v1.2.3-54-g00ecf