Skip to Content.
Sympa Menu

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

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 (410c329eba6bb8373ff905a96e7fdd1121a996a3)
  • Date: Sat, 10 Nov 2018 01:17:35 +0000

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

doc/mupdf/BUILD | 4 ----
doc/mupdf/DEPENDS | 11 +++++------
doc/mupdf/HISTORY | 4 ++++
3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 410c329eba6bb8373ff905a96e7fdd1121a996a3
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/mupdf: reworked GLUT optional dependency

diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index 3055e5c..62b08f6 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1,5 +1 @@
-if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
- LDFLAGS="-lglfw -lGL ${LDFLAGS}"
-fi &&
-
CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes USE_SYSTEM_LIBS=yes
diff --git a/doc/mupdf/DEPENDS b/doc/mupdf/DEPENDS
index fb685a9..f155d53 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -17,12 +17,11 @@ optional_depends curl \
"HAVE_CURL=no" \
"for progressive loading support" &&

-optional_depends OPENGL \
- "HAVE_GLFW=yes" \
- "HAVE_GLFW=no" \
+optional_depends GLUT \
+ "HAVE_GLUT=yes" \
+ "HAVE_GLUT=no" \
"for OpenGL-based viewer" &&

-if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
- depends GLUT &&
- depends glfw
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} GLUT); then
+ depends OPENGL
fi
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 88d299f..03ab1ea 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2018-11-09 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DEPENDS: made GLUT dependency optional, (cont'ed), removed
+ glfw completely
+
2018-11-09 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD, DEPENDS: made GLUT dependency optional, it should be required
for mupdf-gl only



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (410c329eba6bb8373ff905a96e7fdd1121a996a3), Pavel Vinogradov, 11/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page