diff options
4 files changed, 89 insertions, 0 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4e3fc103af..f5e6343904 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -700,6 +700,7 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <akuster808@gmail.com>" | |||
| 700 | RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kanavin@gmail.com>" | 700 | RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kanavin@gmail.com>" |
| 701 | RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kanavin@gmail.com>" | 701 | RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kanavin@gmail.com>" |
| 702 | RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <alex.kanavin@gmail.com>" | 702 | RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <alex.kanavin@gmail.com>" |
| 703 | RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <alex.kanavin@gmail.com>" | ||
| 703 | RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>" | 704 | RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>" |
| 704 | RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>" | 705 | RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>" |
| 705 | RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <ross.burton@intel.com>" | 706 | RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <ross.burton@intel.com>" |
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 new file mode 100644 index 0000000000..aa8d814845 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 12 Feb 2019 12:04:52 +0100 | ||
| 4 | Subject: [PATCH] Makefile.am: explicitly link with libdrm | ||
| 5 | |||
| 6 | Otherwise, a failure happens with gold linker: | ||
| 7 | |||
| 8 | ../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD' | ||
| 9 | |||
| 10 | https://errors.yoctoproject.org/Errors/Details/222046/ | ||
| 11 | |||
| 12 | Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153] | ||
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 14 | --- | ||
| 15 | src/Makefile.am | 1 + | ||
| 16 | 1 file changed, 1 insertion(+) | ||
| 17 | |||
| 18 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 19 | index 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 | -- | ||
| 30 | 2.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 new file mode 100644 index 0000000000..2b4ffa932d --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 18 Jan 2019 13:47:23 +0100 | ||
| 4 | Subject: [PATCH] vtest: add missing includes | ||
| 5 | |||
| 6 | This fixes build failures with musl C library | ||
| 7 | |||
| 8 | Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] | ||
| 9 | Signed-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 | |||
| 15 | diff --git a/vtest/util.c b/vtest/util.c | ||
| 16 | index 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 | { | ||
| 27 | diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c | ||
| 28 | index 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.7.0.bb new file mode 100644 index 0000000000..500ed4f2d8 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | SUMMARY = "VirGL virtual OpenGL renderer" | ||
| 2 | HOMEPAGE = "https://virgil3d.github.io/" | ||
| 3 | |||
| 4 | LICENSE = "MIT" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" | ||
| 6 | |||
| 7 | DEPENDS = "libdrm mesa libepoxy" | ||
| 8 | SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" | ||
| 9 | SRC_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 | " | ||
| 13 | |||
| 14 | S = "${WORKDIR}/git" | ||
| 15 | |||
| 16 | inherit autotools pkgconfig | ||
| 17 | |||
| 18 | BBCLASSEXTEND = "native nativesdk" | ||
| 19 | |||
