diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-01-09 13:20:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-12 23:08:59 +0000 |
commit | 8f5df1a446cf49819d5c9612e557ec78a17142e9 (patch) | |
tree | d5d47f7dd1d3b644783286c91bcda73fcea79bb5 /meta/recipes-graphics | |
parent | 2c6d12ec3a4d053c996b7dc6293d7a8eeee3b61e (diff) | |
download | poky-8f5df1a446cf49819d5c9612e557ec78a17142e9.tar.gz |
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 <wangmy@fujitsu.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.patch | 45 | ||||
-rw-r--r-- | meta/recipes-graphics/virglrenderer/virglrenderer_0.10.4.bb (renamed from meta/recipes-graphics/virglrenderer/virglrenderer_0.10.3.bb) | 3 |
2 files changed, 1 insertions, 47 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 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 @@ | |||
1 | From a60f0658001d2e8e15ad980731d4130808d37d56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Dec 2022 12:58:57 -0800 | ||
4 | Subject: [PATCH] Replace lseek64 with lseek | ||
5 | |||
6 | meson defined _FILE_OFFSET_BITS=64 unconditionally, this implies that | ||
7 | lseek and lseek64 are both same since they are using 64bit off_t, | ||
8 | replacing lseek64 with lseek also helps in compiling with latest musl C | ||
9 | library which has removed these from _GNU_SOURCE namespace unlike glibc | ||
10 | where _GNU_SOURCE also implies _LARGEFILE64_SOURCE and the definition of | ||
11 | lseek64 is still available. | ||
12 | |||
13 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1003] | ||
14 | Signed-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 | |||
20 | diff --git a/src/proxy/proxy_context.c b/src/proxy/proxy_context.c | ||
21 | index 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); | ||
33 | diff --git a/src/venus/vkr_context.c b/src/venus/vkr_context.c | ||
34 | index 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.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" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" |
10 | 10 | ||
11 | DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" | 11 | DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" |
12 | SRCREV = "0922041ec6730122e0fec11404e6859e2efc4bc0" | 12 | SRCREV = "88b9fe3bfc64b23a701e4875006dbc0e769f14f6" |
13 | SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=master;protocol=https \ | 13 | SRC_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 \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |