aquamarine: update

This commit is contained in:
Markus Volk 2025-07-08 17:27:20 +02:00
parent f608c69728
commit 2f4ee32416
2 changed files with 8 additions and 15 deletions

View File

@ -8,30 +8,22 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
Upstream-Status: Pending
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
1 file changed, 1 insertions(+), 1 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be79bb4..416c792 100644
index 475c744..e5426dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ set(INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR})
set(LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR})
find_package(PkgConfig REQUIRED)
-find_package(OpenGL REQUIRED COMPONENTS "GLES3")
+find_package(OpenGL REQUIRED COMPONENTS EGL GLES3)
find_package(hyprwayland-scanner 0.4.0 REQUIRED)
pkg_check_modules(
deps
@@ -66,7 +66,7 @@ target_include_directories(
@@ -67,7 +67,7 @@ target_include_directories(
PRIVATE "./src" "./src/include" "./protocols" "${CMAKE_BINARY_DIR}")
set_target_properties(aquamarine PROPERTIES VERSION ${AQUAMARINE_VERSION}
SOVERSION 7)
SOVERSION 8)
-target_link_libraries(aquamarine OpenGL::EGL OpenGL::OpenGL PkgConfig::deps)
+target_link_libraries(aquamarine OpenGL::EGL OpenGL::GLES3 PkgConfig::deps)
+target_link_libraries(aquamarine EGL GL PkgConfig::deps)
check_include_file("sys/timerfd.h" HAS_TIMERFD)
pkg_check_modules(epoll IMPORTED_TARGET epoll-shim)
--
2.49.0

View File

@ -13,6 +13,7 @@ DEPENDS = " \
libinput \
seatd \
pixman \
virtual/libgl \
virtual/egl \
virtual/libgbm \
virtual/libgles3 \
@ -24,6 +25,6 @@ DEPENDS = " \
SRC_URI = "git://github.com/hyprwm/aquamarine.git;protocol=https;branch=main"
SRC_URI += "file://0001-CMakeLists.txt-fix-linking-with-opengl.patch"
SRCREV = "dd921421391e75793d0cc674dc15eca16b46a089"
SRCREV = "d04e01e70c8b24f7b8fb340a66464e6922e90b1a"
inherit cmake pkgconfig