diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-09-20 21:13:29 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-09-29 09:27:55 +0200 |
| commit | 137ab75fb86696cbffd1cee23f4d90c4ac2973c7 (patch) | |
| tree | 95020a8981185de31ebad3d95015356bee9a1b50 /arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff | |
| parent | f6a3277957fc0e5d0a00dde49d7e7eee72b6d750 (diff) | |
| download | tde-packaging-137ab75fb86696cbffd1cee23f4d90c4ac2973c7.tar.gz tde-packaging-137ab75fb86696cbffd1cee23f4d90c4ac2973c7.zip | |
ArchLinux: Update tdepim, tdemultimedia, tdenetwork, tdegraphics and tdegames to R14.0.10.
Backport patches to tdegraphics to resolve FTBFS.
Switch tdemultimedia to CMake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6beb7211c30f0b4feeb7e487dc25899507ae72b3)
Diffstat (limited to 'arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff')
| -rw-r--r-- | arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff new file mode 100644 index 000000000..3508d7437 --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff @@ -0,0 +1,63 @@ +From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz> +Date: Thu, 8 Jul 2021 19:46:45 +0200 +Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves + FTBFS on FreeBSD 13. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Slávek Banko <slavek.banko@axis.cz> +--- + kpovmodeler/CMakeLists.txt | 4 ++-- + kpovmodeler/ConfigureChecks.cmake | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt +index 6ec98ae4..b589117f 100644 +--- a/kpovmodeler/CMakeLists.txt ++++ b/kpovmodeler/CMakeLists.txt +@@ -19,7 +19,7 @@ include_directories( + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +- ${GLU_INCLUDE_DIRS} ++ ${OPENGL_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} + ) + +@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC + pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp + pmpartiface.skel + VERSION 0.0.0 +- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES} ++ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} + ) + +diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake +index f4fdd1c0..a55045d4 100644 +--- a/kpovmodeler/ConfigureChecks.cmake ++++ b/kpovmodeler/ConfigureChecks.cmake +@@ -10,13 +10,14 @@ + ################################################# + + # glu +-pkg_search_module( GLU glu ) +-if( NOT GLU_FOUND ) ++set( OpenGL_GL_PREFERENCE LEGACY ) ++find_package( OpenGL ) ++if( NOT OPENGL_FOUND ) + check_include_file ( GL/glu.h HAVE_GLU ) + if( NOT HAVE_GLU ) +- tde_message_fatal( "glu is required, but was not found on your system" ) ++ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" ) + endif ( ) +- set( GLU_LIBRARIES "-lGL -lGLU" ) ++ set( OPENGL_LIBRARIES "-lGL -lGLU" ) + endif( ) + + +-- +cgit v1.2.1 + |