summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/recipes-graphics
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:54:52 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:54:52 +0100
commitb6dc44f585b839ab1a2f0133b74958037fe1cb64 (patch)
tree5025d5422e79e229c255e886cf1bd177ec11f37d /meta-agl-bsp/recipes-graphics
parent88a162a657936f14e8e1ac5d6a0c3b368d0e9a45 (diff)
parent07d0d613cbca9619e3ad5361d39ae0feafbcb168 (diff)
Merge remote-tracking branch 'agl/sandbox/locust2001/rocko' into HEAD
* agl/sandbox/locust2001/rocko: (33 commits) most: remove skb_put_data patch from SRC_URI linux-linaro-qcomlt: update to kernel 4.14 dragonboard-410c: update 96boards-tools recipe dragonboard-410c: remove ACCEPT_EULA setting 00_local.conf.agl.inc: Disable GObject Introspection Data linux-ti-staging: Remove linux-dtb.inc geoclue: Remove unnecessary dependency u-boot-ota: Fix build error with gcc7 linux-firmware: Remove duplicated lines Change image type to wic.vmdk glibc: Arrange patch file netboot.bbclass: Remove image_types_uboot inheritance meta-agl-bsp/classes: Remove bbclass files rygel: Arrange rocko security-manager: Fix build error that causes gcc v7.0 cynara: Fix build error that causes gcc v7.0 libcap: Fix warning mesa: Arrange the recipe libmicrohttpd: Remove the recipe connman: Arrange patch file ... Bug-AGL: SPEC-1181 Change-Id: I8fa84553664fd3d7495b42c7198744f05eebcce0 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/recipes-graphics')
-rw-r--r--meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend (renamed from meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.1.bbappend)0
-rw-r--r--meta-agl-bsp/recipes-graphics/mesa/mesa/0001-Use-llvm_prefix-variable-directly.patch25
-rw-r--r--meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend4
3 files changed, 0 insertions, 29 deletions
diff --git a/meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.1.bbappend b/meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend
index db50df5d9..db50df5d9 100644
--- a/meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.1.bbappend
+++ b/meta-agl-bsp/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bbappend
diff --git a/meta-agl-bsp/recipes-graphics/mesa/mesa/0001-Use-llvm_prefix-variable-directly.patch b/meta-agl-bsp/recipes-graphics/mesa/mesa/0001-Use-llvm_prefix-variable-directly.patch
deleted file mode 100644
index 4f1905492..000000000
--- a/meta-agl-bsp/recipes-graphics/mesa/mesa/0001-Use-llvm_prefix-variable-directly.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0b316ee830765eb1d68cdece5fd4c991e9fba96c Mon Sep 17 00:00:00 2001
-From: Changhyeok Bae <changhyeok.bae@gmail.com>
-Date: Sat, 8 Jul 2017 15:22:09 +0900
-Subject: [PATCH] Use $llvm_prefix variable directly
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ac110e8..d094ca6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -896,7 +896,7 @@ fi
-
- if test -z "$LLVM_CONFIG"; then
- if test -n "$llvm_prefix"; then
-- AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
-+ AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix"])
- else
- AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
- fi
---
-1.9.1
-
diff --git a/meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend b/meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend
index 13273792b..49e527707 100644
--- a/meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-agl-bsp/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,7 +1,3 @@
-FILESEXTRAPATHS_prepend_qemux86-64 := "${THISDIR}/${BPN}:"
-SRC_URI_append_qemux86-64 = " file://0001-Use-llvm_prefix-variable-directly.patch"
-EXTRA_OECONF_qemux86-64 = "--enable-shared-glapi --with-llvm-prefix=${STAGING_BINDIR_CROSS}"
-
# The gallium-llvm is recommended as software 3D graphics renderer
GALLIUM_LLVM = "gallium-llvm"
PACKAGECONFIG_append_qemux86 = " gallium ${GALLIUM_LLVM}"