Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (2a3c8311efff8721992c91d90f87f2aa054d35b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (2a3c8311efff8721992c91d90f87f2aa054d35b5)
  • Date: Thu, 15 Mar 2007 16:07:46 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-toolkits/fltk/BUILD | 8 +++++++-
x11-toolkits/fltk/DEPENDS | 19 ++++++++++++++-----
x11-toolkits/fltk/HISTORY | 6 ++++++
3 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 2a3c8311efff8721992c91d90f87f2aa054d35b5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

fltk: Fix Xinerama dependency/query

diff --git a/x11-toolkits/fltk/BUILD b/x11-toolkits/fltk/BUILD
index 9271d91..abdf0ff 100755
--- a/x11-toolkits/fltk/BUILD
+++ b/x11-toolkits/fltk/BUILD
@@ -1,2 +1,8 @@
-OPTS="$FLTK_SHARED $FLTK_THREADS $FLTK_XDBE $FLTK_XFT $OPTS" &&
+OPTS="$FLTK_SHARED \
+ $FLTK_THREADS \
+ $FLTK_XDBE \
+ $FLTK_XFT \
+ $FLTK_XINERAMA \
+ $OPTS" &&
+
default_build
diff --git a/x11-toolkits/fltk/DEPENDS b/x11-toolkits/fltk/DEPENDS
index ce2a467..c3ccc39 100755
--- a/x11-toolkits/fltk/DEPENDS
+++ b/x11-toolkits/fltk/DEPENDS
@@ -11,16 +11,25 @@ optional_depends zlib "--enable-localz
"to use the system ZLIB library" &&
optional_depends libpng "--enable-localpng" "--disable-localpng" \
"to use the system PNG library" &&
-optional_depends xinerama "--enable-xinerama" "--disable-xinerama" \
- "for multi-head display support" &&

if check_if_xorg_modular_libs; then
- optional_depends libxft "--enable-xft" "--disable-xft" \
- "for anti-aliased fonts support"
+ optional_depends libxft \
+ "--enable-xft" \
+ "--disable-xft" \
+ "for anti-aliased fonts support" &&
+
+ optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "for multi-head display support"
else
# This is here because we don't know yet in CONFIGURE if X11-LIBS is
# xorg-modular.
config_query_option FLTK_XFT \
"Enable the Xft library (anti-aliased fonts)?" n \
- "--enable-xft" "--disable-xft"
+ "--enable-xft" "--disable-xft" &&
+
+ config_query_option FLTK_XINERAMA \
+ 'Enable multi-head display support?' n \
+ '--enable-xinerama' '--disable-xinerama'
fi
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 1846616..b9ed937 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,9 @@
+2007-03-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: xinerama -> libxinerama
+ Optionally depend on libxinerama only if using xorg_modular,
+ otherwise query for Xinerama support.
+ * BUILD: Add FLTK_XINERAMA flag to OPTS
+
2006-08-08 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE: Added. Queries for shared libs, multithreading, dbe.
* DEPENDS: optional_depends OPENGL, zlib, libpng, xinerama.



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (2a3c8311efff8721992c91d90f87f2aa054d35b5), Eric Sandall, 03/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page