Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3137e7a9829f0c6643f51001f17b37fbc9e5cef4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3137e7a9829f0c6643f51001f17b37fbc9e5cef4)
  • Date: Sat, 23 Jul 2022 01:45:08 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

utils/slop/HISTORY | 3 +++
utils/slop/PRE_BUILD | 4 +++-
utils/slop/patches/glew.patch | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 3137e7a9829f0c6643f51001f17b37fbc9e5cef4
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

utils/slop: added a patch to fix building with glew

diff --git a/utils/slop/HISTORY b/utils/slop/HISTORY
index c2b0649..ce8b4a4 100644
--- a/utils/slop/HISTORY
+++ b/utils/slop/HISTORY
@@ -1,3 +1,6 @@
+2022-07-22 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/glew.patch: added a patch to fix building with
glew
+
2022-06-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 7.6

diff --git a/utils/slop/PRE_BUILD b/utils/slop/PRE_BUILD
index fdd7cc6..985db8c 100755
--- a/utils/slop/PRE_BUILD
+++ b/utils/slop/PRE_BUILD
@@ -4,4 +4,6 @@ cd "${SOURCE_DIRECTORY}" &&
if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
-fi
+fi &&
+
+apply_patch_dir patches
diff --git a/utils/slop/patches/glew.patch b/utils/slop/patches/glew.patch
new file mode 100644
index 0000000..bbb7eb1
--- /dev/null
+++ b/utils/slop/patches/glew.patch
@@ -0,0 +1,37 @@
+From 811b7e44648b9dd6c1da1554e70298cf4157e5fe Mon Sep 17 00:00:00 2001
+From: Danilo Spinella <danyspin97 AT protonmail.com>
+Date: Fri, 5 Jun 2020 21:51:05 +0200
+Subject: [PATCH] Fix linking of GLEW library
+
+FindGLEW.cmake Module silently tries to include glew-config.cmake.
+If it succeeds, then it stop and return to the caller.
+However, glew-config.cmake only sets GLEW::GLEW, resulting in
+missing glew shared library at link time.
+
+Credits to Eduardo Suarez-Santana for discovering the build error and
providing the fix.
+https://gitlab.exherbo.org/DanySpin97/danyspin97-exheres/-/issues/2
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28d8b88..4c6e4be 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,14 +87,14 @@ target_link_libraries(${LIBRARY_NAME} ${X11_LIBRARIES}
+
+ if ( SLOP_OPENGL )
+ include_directories( ${XEXT_INCLUDE_DIR}
+- ${GLEW_INCLUDE_DIR}
++ GLEW::GLEW
+ ${XRENDER_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR} )
+ target_link_libraries(${LIBRARY_NAME} ${OPENGL_LIBRARIES}
+ ${XRENDER_LIBRARY}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${GLX_LIBRARY}
+- ${GLEW_LIBRARIES})
++ GLEW::GLEW)
+ endif()
+
+ target_link_libraries(${EXECUTABLE_NAME} ${LIBRARY_NAME} )



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3137e7a9829f0c6643f51001f17b37fbc9e5cef4), Pavel Vinogradov, 07/22/2022

Archive powered by MHonArc 2.6.24.

Top of Page