summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-30 14:49:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-01 22:33:07 +0100
commitb67cd613ed04ebbcfae06d1a9b765a7f46816d3a (patch)
treedde739ff0e2cbb0a455d6e0386855605d1533a43 /meta/recipes-graphics
parent8099ad5a212bea506aac7de9a5d6f2176115e894 (diff)
downloadpoky-b67cd613ed04ebbcfae06d1a9b765a7f46816d3a.tar.gz
virglrenderer: update 0.7.0 -> 0.8.0
This also allows building virglrenderer without python 2.x (From OE-Core rev: ac1eab26a422136ab12733856de61ce46ca1cdea) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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-Makefile.am-explicitly-link-with-libdrm.patch31
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch38
-rw-r--r--meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb (renamed from meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb)4
3 files changed, 1 insertions, 72 deletions
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch
deleted file mode 100644
index aa8d814845..0000000000
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 12 Feb 2019 12:04:52 +0100
4Subject: [PATCH] Makefile.am: explicitly link with libdrm
5
6Otherwise, a failure happens with gold linker:
7
8../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD'
9
10https://errors.yoctoproject.org/Errors/Details/222046/
11
12Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 src/Makefile.am | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/src/Makefile.am b/src/Makefile.am
19index 9a0a44e..9b668c8 100644
20--- a/src/Makefile.am
21+++ b/src/Makefile.am
22@@ -1,5 +1,6 @@
23 SUBDIRS := gallium/auxiliary
24 AM_LDFLAGS = -lm \
25+ $(LIBDRM_LIBS) \
26 $(GBM_LIBS) \
27 $(EPOXY_LIBS) \
28 $(X11_LIBS) \
29--
302.17.1
31
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch
deleted file mode 100644
index 2b4ffa932d..0000000000
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 18 Jan 2019 13:47:23 +0100
4Subject: [PATCH] vtest: add missing includes
5
6This fixes build failures with musl C library
7
8Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 vtest/util.c | 1 +
12 vtest/vtest_server.c | 1 +
13 2 files changed, 2 insertions(+)
14
15diff --git a/vtest/util.c b/vtest/util.c
16index 0d3c78f..c605253 100644
17--- a/vtest/util.c
18+++ b/vtest/util.c
19@@ -26,6 +26,7 @@
20 #include <stdio.h>
21 #include <string.h>
22 #include <unistd.h>
23+#include <sys/select.h>
24
25 int vtest_wait_for_fd_read(int fd)
26 {
27diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c
28index bc6c95f..010721f 100644
29--- a/vtest/vtest_server.c
30+++ b/vtest/vtest_server.c
31@@ -31,6 +31,7 @@
32 #include <netinet/in.h>
33 #include <sys/un.h>
34 #include <fcntl.h>
35+#include <string.h>
36
37 #include "util.h"
38 #include "vtest.h"
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
index 818d5b6307..d2b11c103a 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb
@@ -5,10 +5,8 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" 5LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
6 6
7DEPENDS = "libdrm mesa libepoxy" 7DEPENDS = "libdrm mesa libepoxy"
8SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" 8SRCREV = "48cc96c9aebb9d0164830a157efc8916f08f00c0"
9SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ 9SRC_URI = "git://anongit.freedesktop.org/virglrenderer \
10 file://0001-vtest-add-missing-includes.patch \
11 file://0001-Makefile.am-explicitly-link-with-libdrm.patch \
12 file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ 10 file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \
13 " 11 "
14 12