Skip to Content.
Sympa Menu

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

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 (c7b7b815b96eab37e4be9b8432121dea8ca1e31a)
  • Date: Thu, 15 Mar 2007 16:21:06 -0500

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

x11-toolkits/fltk2/BUILD | 10 ++++++++--
x11-toolkits/fltk2/DEPENDS | 19 ++++++++++++++-----
x11-toolkits/fltk2/HISTORY | 6 ++++++
3 files changed, 28 insertions(+), 7 deletions(-)

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

fltk2: Fix Xinerama dependecy/query

diff --git a/x11-toolkits/fltk2/BUILD b/x11-toolkits/fltk2/BUILD
index 689855c..abdf0ff 100755
--- a/x11-toolkits/fltk2/BUILD
+++ b/x11-toolkits/fltk2/BUILD
@@ -1,2 +1,8 @@
-OPTS="$FLTK_SHARED $FLTK_THREADS $FLTK_XDBE $FLTK_XFT $OPTS" &&
-default_build
+OPTS="$FLTK_SHARED \
+ $FLTK_THREADS \
+ $FLTK_XDBE \
+ $FLTK_XFT \
+ $FLTK_XINERAMA \
+ $OPTS" &&
+
+default_build
diff --git a/x11-toolkits/fltk2/DEPENDS b/x11-toolkits/fltk2/DEPENDS
index 2f37084..0e1a438 100755
--- a/x11-toolkits/fltk2/DEPENDS
+++ b/x11-toolkits/fltk2/DEPENDS
@@ -11,19 +11,28 @@ 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" &&

optional_depends cairo "--enable-cairo" "--disable-cairo" \
"Cairo graphics 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/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index bbbd0e6..75fa933 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/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
+
2007-03-11 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 2.0.x-r5734




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

Archive powered by MHonArc 2.6.24.

Top of Page