Skip to Content.
Sympa Menu

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

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 (6a05a96202beb8f54260c191b7428c0b22444c9b)
  • Date: Tue, 8 Oct 2013 08:44:30 -0500

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

x11/xlockmore/BUILD | 9 +--------
x11/xlockmore/CONFIGURE | 19 +++++++++++++++----
x11/xlockmore/DEPENDS | 35 +++++++++++++++++++++++++++++++++--
x11/xlockmore/HISTORY | 5 +++++
4 files changed, 54 insertions(+), 14 deletions(-)

New commits:
commit 01f245c836cf92be78b75ec78e8e22f4e966a40c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xlockmore: added missing dependencies

diff --git a/x11/xlockmore/BUILD b/x11/xlockmore/BUILD
index 19b4d4c..2637718 100755
--- a/x11/xlockmore/BUILD
+++ b/x11/xlockmore/BUILD
@@ -1,11 +1,4 @@
-if list_find $XLOCKMORE_BO "--enable-blank-only"; then
- OPTS="--without-opengl \
- --without-mesa \
- --without-freetype \
- $OPTS"
-fi &&
-
-OPTS="$XLOCKMORE_BO $OPTS"
+OPTS="$XLOCKMORE_OPTS $OPTS"

make_single &&
default_build &&
diff --git a/x11/xlockmore/CONFIGURE b/x11/xlockmore/CONFIGURE
index 3d72253..3c1c50a 100755
--- a/x11/xlockmore/CONFIGURE
+++ b/x11/xlockmore/CONFIGURE
@@ -1,4 +1,15 @@
-config_query_option XLOCKMORE_BO \
- "Use only blank mode (boring)?" n \
- "--enable-blank-only" \
- "--disable-blank-only"
+# backporting legacy options
+if [[ -n "$XLOCKMORE_BO" ]]; then
+ persistent_add XLOCKMORE_OPTS &&
+ list add "XLOCKMORE_OPTS" "$XLOCKMORE_BO" &&
+
+ persistent_remove XLOCKMORE_BO
+fi &&
+
+config_query_option XLOCKMORE_OPTS "Use only blank mode (boring)?" n \
+ "--enable-blank-only" \
+ "--disable-blank-only" &&
+
+config_query_option XLOCKMORE_OPTS "Enable Xmb function series (otherwise
will only display ASCII)?" y \
+ "--enable-mb" \
+ "--disable-mb"
diff --git a/x11/xlockmore/DEPENDS b/x11/xlockmore/DEPENDS
index 6de88ce..216547d 100755
--- a/x11/xlockmore/DEPENDS
+++ b/x11/xlockmore/DEPENDS
@@ -1,4 +1,6 @@
-if list_find $XLOCKMORE_BO "--disable-blank-only"; then
+depends libx11 &&
+
+if list_find $XLOCKMORE_OPTS "--disable-blank-only"; then
optional_depends mesalib \
"--with-mesa" \
"--without-mesa" \
@@ -12,9 +14,24 @@ if list_find $XLOCKMORE_BO "--disable-blank-only"; then
optional_depends freetype2 \
"--with-freetype" \
"--without-freetype" \
- "for FreeType mode(s)"
+ "for FreeType mode(s)" &&
+
+ optional_depends libxpm \
+ "--with-xpm" \
+ "--without-xpm" \
+ "for color pixmap XPM mode(s)"
+else
+ list_add XLOCKMORE_OPTS "--without-mesa" &&
+ list_add XLOCKMORE_OPTS "--without-opengl" &&
+ list_add XLOCKMORE_OPTS "--without-freetype" &&
+ list_add XLOCKMORE_OPTS "--without-xpm"
fi &&

+optional_depends libxinerama \
+ "--with-xinerama" \
+ "--without-xinerama" \
+ "for Xinerama support" &&
+
optional_depends gltt \
"--with-gltt" \
"--without-gltt" \
@@ -50,6 +67,20 @@ optional_depends gtk+2 \
"--without-gtk2" \
"for GTK+2 support (xglock build)" &&

+if is_depends_enabled $SPELL gtk+2; then
+ list_add XLOCKMORE_OPTS "--without-gtk"
+else
+ optional_depends gtk+ \
+ "--with-gtk" \
+ "--without-gtk" \
+ "for GTK+ support (xglock build)"
+fi &&
+
+optional_depends imagemagick \
+ "--with-magick" \
+ "--without-magick" \
+ "for ImageMagick support" &&
+
optional_depends SYSTEM-LOGGER \
"--enable-syslog" \
"--disable-syslog" \
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index 0bd3856..6881c6e 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,8 @@
+2013-10-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, CONFIGURE: deprecate XLOCKMORE_BO
+ * DEPENDS: added missing dependencies (required: libx11; optional:
+ libxpm, libxinerama, gtk+, imagemagick)
+
2013-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.43




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6a05a96202beb8f54260c191b7428c0b22444c9b), Vlad Glagolev, 10/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page