summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-12-21 09:55:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-22 23:05:50 +0000
commit4e935952b663dbf288d6b6f740515b2ddc680872 (patch)
tree2b0dc78c07c8d2877816fe196e102e774158cfaf /meta/recipes-graphics
parent663c631776b818ca28bea53bfeab11dfe4b6a4ae (diff)
downloadpoky-4e935952b663dbf288d6b6f740515b2ddc680872.tar.gz
virglrenderer: Replace lseek64 with lseek
Fix build with musl (From OE-Core rev: 677e979255ea84933a9e91d993171b207ff3deb6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch45
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb1
2 files changed, 46 insertions, 0 deletions
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
new file mode 100644
index 0000000000..a0278abd28
--- /dev/null
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Replace-lseek64-with-lseek.patch
@@ -0,0 +1,45 @@
1From a60f0658001d2e8e15ad980731d4130808d37d56 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 15 Dec 2022 12:58:57 -0800
4Subject: [PATCH] Replace lseek64 with lseek
5
6meson defined _FILE_OFFSET_BITS=64 unconditionally, this implies that
7lseek and lseek64 are both same since they are using 64bit off_t,
8replacing lseek64 with lseek also helps in compiling with latest musl C
9library which has removed these from _GNU_SOURCE namespace unlike glibc
10where _GNU_SOURCE also implies _LARGEFILE64_SOURCE and the definition of
11lseek64 is still available.
12
13Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1003]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/proxy/proxy_context.c | 2 +-
17 src/venus/vkr_context.c | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/src/proxy/proxy_context.c b/src/proxy/proxy_context.c
21index f2a035b..f20f7c8 100644
22--- a/src/proxy/proxy_context.c
23+++ b/src/proxy/proxy_context.c
24@@ -319,7 +319,7 @@ validate_resource_fd_shm(int fd, uint64_t expected_size)
25 return false;
26 }
27
28- const uint64_t size = lseek64(fd, 0, SEEK_END);
29+ const uint64_t size = lseek(fd, 0, SEEK_END);
30 if (size != expected_size) {
31 proxy_log("failed to validate shm size(%" PRIu64 ") expected(%" PRIu64 ")", size,
32 expected_size);
33diff --git a/src/venus/vkr_context.c b/src/venus/vkr_context.c
34index 9ecb9cd..1e5dc68 100644
35--- a/src/venus/vkr_context.c
36+++ b/src/venus/vkr_context.c
37@@ -359,7 +359,7 @@ vkr_context_get_blob_locked(struct virgl_context *base,
38 return ret;
39
40 if (fd_type == VIRGL_RESOURCE_FD_DMABUF &&
41- (uint64_t)lseek64(fd, 0, SEEK_END) < blob_size) {
42+ (uint64_t)lseek(fd, 0, SEEK_END) < blob_size) {
43 close(fd);
44 return -EINVAL;
45 }
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb
index 3480eb954d..5d483431a7 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb
@@ -12,6 +12,7 @@ DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm"
12SRCREV = "0922041ec6730122e0fec11404e6859e2efc4bc0" 12SRCREV = "0922041ec6730122e0fec11404e6859e2efc4bc0"
13SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \ 13SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \
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-Replace-lseek64-with-lseek.patch \
15 " 16 "
16 17
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"