summaryrefslogtreecommitdiffstats
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-08-30 22:25:20 +0100
commitac1eab26a422136ab12733856de61ce46ca1cdea (patch)
treed2b2a5bd792aa03dbcbb8a200dedbd27449a717c
parent13f9182e7235843290809027b4456ad2fe5e4c40 (diff)
downloadopenembedded-core-contrib-ac1eab26a422136ab12733856de61ce46ca1cdea.tar.gz
virglrenderer: update 0.7.0 -> 0.8.0
This also allows building virglrenderer without python 2.x Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 aa8d814845e..00000000000
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 12 Feb 2019 12:04:52 +0100
-Subject: [PATCH] Makefile.am: explicitly link with libdrm
-
-Otherwise, a failure happens with gold linker:
-
-../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD'
-
-https://errors.yoctoproject.org/Errors/Details/222046/
-
-Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- src/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9a0a44e..9b668c8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,6 @@
- SUBDIRS := gallium/auxiliary
- AM_LDFLAGS = -lm \
-+ $(LIBDRM_LIBS) \
- $(GBM_LIBS) \
- $(EPOXY_LIBS) \
- $(X11_LIBS) \
---
-2.17.1
-
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 2b4ffa932de..00000000000
--- a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 18 Jan 2019 13:47:23 +0100
-Subject: [PATCH] vtest: add missing includes
-
-This fixes build failures with musl C library
-
-Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- vtest/util.c | 1 +
- vtest/vtest_server.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/vtest/util.c b/vtest/util.c
-index 0d3c78f..c605253 100644
---- a/vtest/util.c
-+++ b/vtest/util.c
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/select.h>
-
- int vtest_wait_for_fd_read(int fd)
- {
-diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c
-index bc6c95f..010721f 100644
---- a/vtest/vtest_server.c
-+++ b/vtest/vtest_server.c
-@@ -31,6 +31,7 @@
- #include <netinet/in.h>
- #include <sys/un.h>
- #include <fcntl.h>
-+#include <string.h>
-
- #include "util.h"
- #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 818d5b63077..d2b11c103a3 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"
LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10"
DEPENDS = "libdrm mesa libepoxy"
-SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c"
+SRCREV = "48cc96c9aebb9d0164830a157efc8916f08f00c0"
SRC_URI = "git://anongit.freedesktop.org/virglrenderer \
- file://0001-vtest-add-missing-includes.patch \
- file://0001-Makefile.am-explicitly-link-with-libdrm.patch \
file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \
"