Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d552b1d4e092032a8e6e7d44f93179901fed13e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d552b1d4e092032a8e6e7d44f93179901fed13e)
  • Date: Fri, 9 Nov 2018 20:18:33 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

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

New commits:
commit 0d552b1d4e092032a8e6e7d44f93179901fed13e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mupdf: made GLUT dependency optional

diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index 62b08f6..3055e5c 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1 +1,5 @@
+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 ff00fcd..fb685a9 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -1,7 +1,6 @@
depends JPEG &&
depends openjpeg &&
depends freetype2 &&
-depends GLUT &&
depends harfbuzz &&
depends jbig2dec &&
depends zlib &&
@@ -18,7 +17,12 @@ optional_depends curl \
"HAVE_CURL=no" \
"for progressive loading support" &&

-optional_depends glfw \
+optional_depends OPENGL \
"HAVE_GLFW=yes" \
"HAVE_GLFW=no" \
- "for OpenGL-based viewer"
+ "for OpenGL-based viewer" &&
+
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
+ depends GLUT &&
+ depends glfw
+fi
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index a6656ee..88d299f 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2018-11-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, DEPENDS: made GLUT dependency optional, it should be required
+ for mupdf-gl only
+
2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.14.0, switched to sha1 UPSTREAM_HASH
* BUILD, INSTALL: added flag to use system libraries



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0d552b1d4e092032a8e6e7d44f93179901fed13e), Vlad Glagolev, 11/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page