Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (91c8c7208382d0e4a8d0ad5931f9aec42dc8d8ab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (91c8c7208382d0e4a8d0ad5931f9aec42dc8d8ab)
  • Date: Tue, 8 Aug 2006 05:56:02 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

x11-toolkits/fltk/BUILD | 2 +-
x11-toolkits/fltk/CONFIGURE | 6 ++++++
x11-toolkits/fltk/DEPENDS | 25 ++++++++++++++++++++++++-
x11-toolkits/fltk/DETAILS | 15 +++++----------
x11-toolkits/fltk/HISTORY | 9 +++++++++
5 files changed, 45 insertions(+), 12 deletions(-)

New commits:
commit 91c8c7208382d0e4a8d0ad5931f9aec42dc8d8ab
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

fltk: added missing configure options & optional depends

diff --git a/x11-toolkits/fltk/BUILD b/x11-toolkits/fltk/BUILD
index 4032896..9271d91 100755
--- a/x11-toolkits/fltk/BUILD
+++ b/x11-toolkits/fltk/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --enable-shared --enable-xft" &&
+OPTS="$FLTK_SHARED $FLTK_THREADS $FLTK_XDBE $FLTK_XFT $OPTS" &&
default_build
diff --git a/x11-toolkits/fltk/CONFIGURE b/x11-toolkits/fltk/CONFIGURE
new file mode 100755
index 0000000..333f175
--- /dev/null
+++ b/x11-toolkits/fltk/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_option FLTK_SHARED "Build shared libraries?" y \
+ "--enable-shared" "--disable-shared" &&
+config_query_option FLTK_THREADS "Enable multithreading support?" n \
+ "--enable-threads" "--disable-threads" &&
+config_query_option FLTK_XDBE "Enable the X double-buffer extensions?" n
\
+ "--enable-xdbe" "--disable-xdbe"
diff --git a/x11-toolkits/fltk/DEPENDS b/x11-toolkits/fltk/DEPENDS
index 2e80397..ce2a467 100755
--- a/x11-toolkits/fltk/DEPENDS
+++ b/x11-toolkits/fltk/DEPENDS
@@ -1,3 +1,26 @@
+. $GRIMOIRE/FUNCTIONS &&
+
depends g++ &&
depends X11-LIBS &&
-optional_depends "jpeg" "" "" "for jpeg support"
+
+optional_depends OPENGL "--enable-gl" "--disable-gl" \
+ "for OpenGL support" &&
+optional_depends jpeg "--enable-localjpeg" "--disable-localjpeg" \
+ "to use the system JPEG library" &&
+optional_depends zlib "--enable-localzlib" "--disable-localzlib" \
+ "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"
+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"
+fi
diff --git a/x11-toolkits/fltk/DETAILS b/x11-toolkits/fltk/DETAILS
index 0607cd8..ae7cd6f 100755
--- a/x11-toolkits/fltk/DETAILS
+++ b/x11-toolkits/fltk/DETAILS
@@ -3,21 +3,16 @@

SOURCE_HASH=sha512:8e4854968bb61a974669766718311c9028bb5abafed58d52f49aabb26249924cf848e554247dcf6e30a916f3fc0bb002f043739b6a006c738a7294bc11bc5aaa
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.easysw.com/pub/fltk/$VERSION/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/fltk/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.fltk.org/
ENTERED=20011129
- UPDATED=20030909
KEYWORDS="x11 libs"
SHORT="fltk is a fast light graphical toolkit for X11."
cat << EOF
-From the fltk home page:
-
-FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface
-toolkit for X (UNIX?), OpenGL, and WIN32 (Microsoft? Windows? 95,
-98, ME, NT 4.0, and 2000). It is currently maintained by a small group
-of developers across the world with a central repository on
-SourceForge.
-
+FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
+UNIX??/Linux?? (X11), Microsoft?? Windows??, and MacOS?? X. FLTK provides
+modern GUI functionality without the bloat and supports 3D graphics
+via OpenGL?? and its built-in GLUT emulation.
EOF
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 7ed66dd..551a73b 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,12 @@
+2006-08-08 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Added. Queries for shared libs, multithreading, dbe.
+ * DEPENDS: optional_depends OPENGL, zlib, libpng, xinerama.
+ Optionally depend on libxft if X11-LIBS is xorg-modular,
+ otherwise present config_query_option for Xft support.
+ * BUILD: Add options in OPTS.
+ * DETAILS: Removed UPDATED, substituted with $SPELL in
+ SOURCE_URL, updated long description.
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide





Archive powered by MHonArc 2.6.24.

Top of Page