mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
Markus Volk
f8e7a3d98a
- Add a packageconfig for jpegxl. This is done because it is requested by default and do_configure fails because we dont have a recipe for it in meta-oe - Refresh patches with devtool - Remove check-GST_GL_HAVE_PLATFORM_GLX.patch. The file has been reworked and it should hopefully not be needed anymore Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 69d8e34f60e6a124f699365101e854076cfe0f1b Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Tue, 27 Oct 2015 16:02:19 +0200
|
|
Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
|
|
from pkg-config with PKG_CONFIG_SYSROOT_DIR
|
|
|
|
See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
|
|
reasons why this is not approproiate for upstream submission.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
Source/cmake/FindGI.cmake | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
|
|
index fdc56b21..d42eca52 100644
|
|
--- a/Source/cmake/FindGI.cmake
|
|
+++ b/Source/cmake/FindGI.cmake
|
|
@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
|
|
endif ()
|
|
endif ()
|
|
|
|
+set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}")
|
|
+set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}")
|
|
+
|
|
find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner)
|
|
find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler)
|
|
|