mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

webkitgtk: fix gstreamer include paths

Browse Source 
* fixes:
  http://errors.yoctoproject.org/Errors/Details/671441/

  cc1plus: error: include location "/usr/include/gstreamer-1.0" is unsafe for cross-compilation [-Werror=poison-system-directories]

(From OE-Core rev: 53365112e6e848b6867d350a38800eed9e19872b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2022-09-07 14:30:51 +02:00
committed by Richard Purdie
parent 69ff1c755d
commit 840fda5a06
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-sato/webkit/webkitgtk/fix-gstreamer-include-paths.patch Normal file
View File

@@ -0,0 +1,51 @@
From 25efd1478b48b5406fdab3b7b9c1f7e0ef95a7ed Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Mon, 27 Jun 2022 16:56:04 -0700
Subject: [PATCH] Fix include gstreamer path on cross compiler toolchains
https://bugs.webkit.org/show_bug.cgi?id=241483
Reviewed by Adrian Perez de Castro.
Set the include paths for the gstreamer components to the full path
using the find_path(). This function relies in CMAKE_FIND_ROOT_PATH to
find the right place where the includes they are. This fixes possible
warnings/errors on cross toolchains using -Wpoison-system-directories
and -Werror=poison-system-directories.
* Source/cmake/FindGStreamer.cmake:
Canonical link: https://commits.webkit.org/251895@main
Upstream-Status: Backport [2.37.1 https://github.com/WebKit/WebKit/commit/25efd1478b48b5406fdab3b7b9c1f7e0ef95a7ed]
---
Source/cmake/FindGStreamer.cmake | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/Source/cmake/FindGStreamer.cmake b/Source/cmake/FindGStreamer.cmake
index 3216f6974b53..b65a11f30871 100644
--- a/Source/cmake/FindGStreamer.cmake
+++ b/Source/cmake/FindGStreamer.cmake
@@ -75,12 +75,20 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
# ${includedir}/gstreamer-1.0 which remains correct. The issue here is that
# we don't rely on the `Cflags`, cmake fails to generate a proper
# `.._INCLUDE_DIRS` variable in this case. So we need to do it here...
+
+ # Populate the list initially from the _INCLUDE_DIRS result variable.
+ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS})
+
set(_include_dir "${PC_${_component_prefix}_INCLUDEDIR}")
string(REGEX MATCH "(.*)/gstreamer-1.0" _dummy "${_include_dir}")
+
if ("${CMAKE_MATCH_1}" STREQUAL "")
- set(${_component_prefix}_INCLUDE_DIRS "${_include_dir}/gstreamer-1.0;${PC_${_component_prefix}_INCLUDE_DIRS}")
- else ()
- set(${_component_prefix}_INCLUDE_DIRS "${PC_${_component_prefix}_INCLUDE_DIRS}")
+ find_path(${_component_prefix}_RESOLVED_INCLUDEDIR NAMES "${_include_dir}/gstreamer-1.0")
+ # Only add the resolved path from `_INCLUDEDIR` if found.
+ if (${_component_prefix}_RESOLVED_INCLUDEDIR)
+ list(APPEND ${_component_prefix}_INCLUDE_DIRS
+ "${${_component_prefix}_RESOLVED_INCLUDEDIR}")
+ endif ()
endif ()
find_library(${_component_prefix}_LIBRARIES

1
meta/recipes-sato/webkit/webkitgtk_2.36.7.bb
View File

@@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-without-opengl-or-es.patch \
file://reproducibility.patch \
file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
file://fix-gstreamer-include-paths.patch \
"
SRC_URI[sha256sum] = "0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743"