NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libglfw: fix wayland build

Browse Source 
Fix the following build failure raised since bump to version 3.3.6 in
commit 3cd9bb4f2a:

CMake Error at CMakeLists.txt:252 (find_package):
  Could not find a package configuration file provided by "ECM" with any of
  the following names:

    ECMConfig.cmake
    ecm-config.cmake

Fixes:
 - http://autobuild.buildroot.org/results/0d7420aff7392c294614fd12e65ac7cd57787e98

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2022-03-06 11:27:22 +01:00 committed by Yann E. MORIN
parent d1debbb4c7
commit 0bbb12eff3
4 changed files with 160 additions and 1 deletions

121
package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch Normal file
View File

@ -0,0 +1,121 @@
From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001
From: Joel Winarske <joel.winarske@gmail.com>
Date: Mon, 28 Sep 2020 22:23:02 -0700
Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency
Fixes #1774.
[Retrieved (and backported) from:
https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.gitignore | 4 ---
CMakeLists.txt | 16 ++++++------
src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------
3 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42bfa1806d..394827520b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,20 +191,18 @@ endif()
# Use Wayland for window creation
#--------------------------------------------------------------------
if (_GLFW_WAYLAND)
- find_package(ECM REQUIRED NO_MODULE)
- list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}")
- find_package(Wayland REQUIRED Client Cursor Egl)
- find_package(WaylandScanner REQUIRED)
- find_package(WaylandProtocols 1.15 REQUIRED)
+ include(FindPkgConfig)
+ pkg_check_modules(Wayland REQUIRED
+ wayland-client>=0.2.7
+ wayland-cursor>=0.2.7
+ wayland-egl>=0.2.7
+ xkbcommon)
list(APPEND glfw_PKG_DEPS "wayland-client")
list(APPEND glfw_INCLUDE_DIRS "${Wayland_INCLUDE_DIRS}")
- list(APPEND glfw_LIBRARIES "${Wayland_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
-
- find_package(XKBCommon REQUIRED)
- list(APPEND glfw_INCLUDE_DIRS "${XKBCOMMON_INCLUDE_DIRS}")
+ list(APPEND glfw_LIBRARIES "${Wayland_LINK_LIBRARIES}" "${CMAKE_THREAD_LIBS_INIT}")
include(CheckIncludeFiles)
include(CheckFunctionExists)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f2bdd883d..e834506c6c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND)
posix_time.c posix_thread.c xkb_unicode.c
egl_context.c osmesa_context.c)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml"
- BASENAME xdg-shell)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml"
- BASENAME xdg-decoration)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml"
- BASENAME viewporter)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml"
- BASENAME relative-pointer-unstable-v1)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml"
- BASENAME pointer-constraints-unstable-v1)
- ecm_add_wayland_client_protocol(glfw_SOURCES
- PROTOCOL
- "${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml"
- BASENAME idle-inhibit-unstable-v1)
+ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
+ pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15)
+ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
+
+ macro(wayland_generate protocol_file output_file)
+ add_custom_command(OUTPUT ${output_file}.h
+ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header
+ < ${protocol_file} > ${output_file}.h
+ DEPENDS ${protocol_file})
+ list(APPEND glfw_SOURCES ${output_file}.h)
+
+ add_custom_command(OUTPUT ${output_file}.c
+ COMMAND ${WAYLAND_SCANNER_EXECUTABLE} private-code
+ < ${protocol_file} > ${output_file}.c
+ DEPENDS ${protocol_file})
+ list(APPEND glfw_SOURCES ${output_file}.c)
+ endmacro()
+
+ set(GLFW_WAYLAND_PROTOCOL_SOURCES)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/stable/xdg-shell/xdg-shell.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-xdg-shell-client-protocol)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-xdg-decoration-client-protocol)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/stable/viewporter/viewporter.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-viewporter-client-protocol)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-relative-pointer-unstable-v1-client-protocol)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-pointer-constraints-unstable-v1-client-protocol)
+ wayland_generate(
+ ${WAYLAND_PROTOCOLS_BASE}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
+ ${CMAKE_BINARY_DIR}/src/wayland-idle-inhibit-unstable-v1-client-protocol)
+
elseif (_GLFW_OSMESA)
set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h
posix_time.h posix_thread.h osmesa_context.h)

32
package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch Normal file
View File

@ -0,0 +1,32 @@
From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 4 Mar 2022 17:59:19 +0100
Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir
Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR}
(needed when cross-compiling)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/glfw/glfw/pull/2053]
---
src/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 01f191c9..475ce882 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND)
include(FindPkgConfig)
find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15)
- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
+ if (NOT WAYLAND_PROTOCOLS_BASE)
+ pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
+ endif()
macro(wayland_generate protocol_file output_file)
add_custom_command(OUTPUT "${output_file}.h"
--
2.34.1

2
package/libglfw/Config.in
View File

@ -2,6 +2,8 @@ config BR2_PACKAGE_LIBGLFW
bool "libglfw"
depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_XORG7

6
package/libglfw/libglfw.mk
View File

@ -29,7 +29,11 @@ LIBGLFW_DEPENDENCIES += libgles
endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
LIBGLFW_CONF_OPTS += -DGLFW_USE_WAYLAND=1
LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols
# Override pkg-config pkgdatadir variable, it needs the prefix
LIBGLFW_CONF_OPTS += \
-DGLFW_USE_WAYLAND=1 \
-DWAYLAND_PROTOCOLS_BASE=$(STAGING_DIR)/usr/share/wayland-protocols
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)