From: Wang Mingyu <[email protected]> 0001-Replace-lseek64-with-lseek.patch removed since it's included in 0.10.4
Signed-off-by: Wang Mingyu <[email protected]> --- .../0001-Replace-lseek64-with-lseek.patch | 45 ------------------- ...erer_0.10.3.bb => virglrenderer_0.10.4.bb} | 3 +- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch rename meta/recipes-graphics/virglrenderer/{virglrenderer_0.10.3.bb => virglrenderer_0.10.4.bb} (93%) 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 <[email protected]> -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 <[email protected]> ---- - 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.4.bb similarity index 93% rename from meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb rename to meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb index 5d483431a7..f76e7cb1b9 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "0922041ec6730122e0fec11404e6859e2efc4bc0" +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 \ - file://0001-Replace-lseek64-with-lseek.patch \ " S = "${WORKDIR}/git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175666): https://lists.openembedded.org/g/openembedded-core/message/175666 Mute This Topic: https://lists.openembedded.org/mt/96146706/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
