From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- ...1-Makefile.am-explicitly-link-with-libdrm.patch | 31 ++++++++++++++++++ .../0001-vtest-add-missing-includes.patch | 38 ++++++++++++++++++++++ .../virglrenderer/virglrenderer_0.7.0.bb | 22 +++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch create mode 100644 poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch create mode 100644 poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb (limited to 'poky/meta/recipes-graphics/virglrenderer') diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch new file mode 100644 index 000000000..aa8d81484 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch @@ -0,0 +1,31 @@ +From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch new file mode 100644 index 000000000..2b4ffa932 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch @@ -0,0 +1,38 @@ +From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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 + #include + #include ++#include + + 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 + #include + #include ++#include + + #include "util.h" + #include "vtest.h" diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb new file mode 100644 index 000000000..225a0b8b0 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "VirGL virtual OpenGL renderer" +HOMEPAGE = "https://virgil3d.github.io/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" + +DEPENDS = "libdrm mesa libepoxy" +SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ + file://0001-vtest-add-missing-includes.patch \ + file://0001-Makefile.am-explicitly-link-with-libdrm.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig distro_features_check + +BBCLASSEXTEND = "native nativesdk" + +REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES_class-native = "" +REQUIRED_DISTRO_FEATURES_class-nativesdk = "" -- cgit v1.2.3