-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
86a9581
commit 8d11723
Showing
5 changed files
with
228 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...freeglut/all/patches/3.2.1-0001-Use-find_package-and-pkg_check_modules-to-find-more.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| From df112bd86e895f4e545e65d71682d417e9b054e2 Mon Sep 17 00:00:00 2001 | ||
| From: Jordan Williams <jordan@jwillikers.com> | ||
| Date: Thu, 2 Nov 2023 15:27:49 -0500 | ||
| Subject: [PATCH] Use find_package and pkg_check_modules to find more | ||
| dependencies | ||
|
|
||
| This commit enhances the use of the FindOpenGL CMake module. | ||
| This requires CMake version 3.10 for the OpenGL::EGL imported target. | ||
|
|
||
| Finds the Wayland and xkbcommon dependencies with pkg_check_modules. | ||
| This works with the pkg-config files provided by the upstream projects. | ||
| --- | ||
| CMakeLists.txt | 20 +++++++++++++------- | ||
| 1 file changed, 13 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 6f403afa..43e36113 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1,5 +1,5 @@ | ||
| -CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR) | ||
| -PROJECT(freeglut) | ||
| +CMAKE_MINIMUM_REQUIRED(VERSION 3.10) | ||
| +PROJECT(freeglut LANGUAGES C) | ||
|
|
||
| # for multiarch LIBDIR support (requires cmake>=2.8.8) | ||
| INCLUDE(GNUInstallDirs) | ||
| @@ -257,17 +257,24 @@ ENDIF() | ||
| # GLES1 and GLES2 libraries are compatible and can be co-linked. | ||
| IF(FREEGLUT_GLES) | ||
| LIST(APPEND PUBLIC_DEFINITIONS -DFREEGLUT_GLES) | ||
| - LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) | ||
| + # todo Use the OpenGL GLES2 component from CMake 3.27 when available. | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS EGL) | ||
| + LIST(APPEND LIBS GLESv2 GLESv1_CM OpenGL::EGL) | ||
| ELSE() | ||
| - FIND_PACKAGE(OpenGL REQUIRED) | ||
| - LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) | ||
| - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS OpenGL) | ||
| + LIST(APPEND LIBS OpenGL::GL) | ||
| ENDIF() | ||
|
|
||
| # For Wayland: compile with -DFREEGLUT_WAYLAND and pull EGL | ||
| IF(FREEGLUT_WAYLAND) | ||
| ADD_DEFINITIONS(-DFREEGLUT_WAYLAND) | ||
| - LIST(APPEND LIBS wayland-client wayland-cursor wayland-egl EGL xkbcommon) | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS EGL) | ||
| + INCLUDE(FindPkgConfig) | ||
| + PKG_CHECK_MODULES(wayland-client REQUIRED IMPORTED_TARGET wayland-client) | ||
| + PKG_CHECK_MODULES(wayland-cursor REQUIRED IMPORTED_TARGET wayland-cursor) | ||
| + PKG_CHECK_MODULES(wayland-egl REQUIRED IMPORTED_TARGET wayland-egl) | ||
| + PKG_CHECK_MODULES(xkbcommon REQUIRED IMPORTED_TARGET xkbcommon) | ||
| + LIST(APPEND LIBS OpenGL::EGL PkgConfig::wayland-client PkgConfig::wayland-cursor PkgConfig::wayland-egl PkgConfig::xkbcommon) | ||
| ENDIF() | ||
|
|
||
| # lib m for math, not needed on windows | ||
| -- | ||
| 2.41.0 | ||
|
|
66 changes: 66 additions & 0 deletions
66
...freeglut/all/patches/3.4.0-0001-Use-find_package-and-pkg_check_modules-to-find-more.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| From d8ce1f40a725742f85c6f5286ca4623307fe6f59 Mon Sep 17 00:00:00 2001 | ||
| From: Jordan Williams <jordan@jwillikers.com> | ||
| Date: Thu, 2 Nov 2023 15:27:49 -0500 | ||
| Subject: [PATCH] Use find_package and pkg_check_modules to find more | ||
| dependencies | ||
|
|
||
| This commit enhances the use of the FindOpenGL CMake module. | ||
| This requires CMake version 3.10 for the OpenGL::EGL imported target. | ||
|
|
||
| Finds the Wayland and xkbcommon dependencies with pkg_check_modules. | ||
| This works with the pkg-config files provided by the upstream projects. | ||
| --- | ||
| CMakeLists.txt | 20 +++++++++++++------- | ||
| 1 file changed, 13 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 832d8672..83cf2927 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1,5 +1,5 @@ | ||
| -CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR) | ||
| -PROJECT(freeglut C) | ||
| +CMAKE_MINIMUM_REQUIRED(VERSION 3.10) | ||
| +PROJECT(freeglut LANGUAGES C) | ||
|
|
||
| # for multiarch LIBDIR support (requires cmake>=2.8.8) | ||
| INCLUDE(GNUInstallDirs) | ||
| @@ -292,7 +292,9 @@ ENDIF() | ||
| # GLES1 and GLES2 libraries are compatible and can be co-linked. | ||
| IF(FREEGLUT_GLES) | ||
| LIST(APPEND PUBLIC_DEFINITIONS -DFREEGLUT_GLES) | ||
| - LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) | ||
| + # todo Use the OpenGL GLES2 component from CMake 3.27 when available. | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS EGL) | ||
| + LIST(APPEND LIBS GLESv2 GLESv1_CM OpenGL::EGL) | ||
| ELSE() | ||
| # On OS X, we need to link against the X11 OpenGL libraries, NOT the Cocoa OpenGL libraries. | ||
| # To do that, you need to manually find two of the libraries before calling FindOpenGL | ||
| @@ -304,15 +306,20 @@ ELSE() | ||
| find_library(OPENGL_glu_LIBRARY NAME GLU HINTS ${X11_LIB_PATH}) | ||
| endif() | ||
|
|
||
| - FIND_PACKAGE(OpenGL REQUIRED) | ||
| - LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) | ||
| - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS OpenGL) | ||
| + LIST(APPEND LIBS OpenGL::GL) | ||
| ENDIF() | ||
|
|
||
| # For Wayland: compile with -DFREEGLUT_WAYLAND and pull EGL | ||
| IF(FREEGLUT_WAYLAND) | ||
| ADD_DEFINITIONS(-DFREEGLUT_WAYLAND) | ||
| - LIST(APPEND LIBS wayland-client wayland-cursor wayland-egl EGL xkbcommon) | ||
| + FIND_PACKAGE(OpenGL REQUIRED COMPONENTS EGL) | ||
| + INCLUDE(FindPkgConfig) | ||
| + PKG_CHECK_MODULES(wayland-client REQUIRED IMPORTED_TARGET wayland-client) | ||
| + PKG_CHECK_MODULES(wayland-cursor REQUIRED IMPORTED_TARGET wayland-cursor) | ||
| + PKG_CHECK_MODULES(wayland-egl REQUIRED IMPORTED_TARGET wayland-egl) | ||
| + PKG_CHECK_MODULES(xkbcommon REQUIRED IMPORTED_TARGET xkbcommon) | ||
| + LIST(APPEND LIBS OpenGL::EGL PkgConfig::wayland-client PkgConfig::wayland-cursor PkgConfig::wayland-egl PkgConfig::xkbcommon) | ||
| ENDIF() | ||
|
|
||
| # lib m for math, not needed on windows | ||
| -- | ||
| 2.41.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters