sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (5f52c1a4bd4b2334f9b43bed55b185d24bdbaba8)

From: Arjan Bouter <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (5f52c1a4bd4b2334f9b43bed55b185d24bdbaba8)
Date: Sat, 25 Jul 2009 12:15:35 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

x11/xscreensaver/BUILD | 17 +++---------
x11/xscreensaver/CONFIGURE | 10 +++----
x11/xscreensaver/DEPENDS | 60
++++++++++++++++++++++++++++++++++++---------
x11/xscreensaver/HISTORY | 9 ++++++
4 files changed, 66 insertions(+), 30 deletions(-)

New commits:
commit 15be93a17c3369269605682ff7d175c8b340d826
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xscreensaver: selectable help browser, option to always accept the rootpw
to unlock,
screen locking no optional.
added optional deps on gdm2, libgnome ,libxpm, libxext, a web-browser,
libxrandr,
libxinerama. switched from gdk-pixbuf to gtk+2.
Also, optionally depend on libgle, not gle (different lib).

diff --git a/x11/xscreensaver/BUILD b/x11/xscreensaver/BUILD
index 1a307c3..e26658c 100755
--- a/x11/xscreensaver/BUILD
+++ b/x11/xscreensaver/BUILD
@@ -1,18 +1,11 @@
#sedit "6690s/Screensaver/Screensaver Properties/" po/es.po &&

-OPTS="--with-dpms-ext $OPTS"
-OPTS="--with-xinerama-ext $OPTS"
-OPTS="--with-xf86vmode-ext $OPTS"
-OPTS="--with-xf86gamma-ext $OPTS"
-OPTS="--with-randr-ext $OPTS"
OPTS="--with-proc-interrupts $OPTS"
-OPTS="--with-xshm-ext $OPTS"
-OPTS="--with-xdbe-ext $OPTS"
OPTS="--with-readdisplay $OPTS"
-OPTS="--enable-locking $OPTS"
OPTS="--without-motif $OPTS"
-if [ "$XSCSV" == "n" ]; then
- OPTS="--without-gtk --without-xml $OPTS"
-fi &&
-
+if ! (is_depends_enabled $SPELL WEB-BROWSER); then
+ OPTS="--without-browser $OPTS"
+else
+ OPTS="--with-browser=$(get_spell_provider $SPELL WEB-BROWSER) $OPTS"
+fi &&
default_build
diff --git a/x11/xscreensaver/CONFIGURE b/x11/xscreensaver/CONFIGURE
index 745f3de..92bae29 100755
--- a/x11/xscreensaver/CONFIGURE
+++ b/x11/xscreensaver/CONFIGURE
@@ -1,6 +1,4 @@
-message "${MESSAGE_COLOR}The xscreensaver demo program allows you to" \
- "browse among the different effects available in xscreensaver." \
- "Enabling this adds dependencies on gtk+2 and" \
- "libglade2${DEFAULT_COLOR}" &&
-
-config_query XSCSV_GTK "Enable xscreensaver-demo?" y
+config_query_option XSCSV_LOCK "Enable screen locking?" y \
+ --enable-locking --disable-locking &&
+config_query_option XSCSV_ROOT "Enable unlocking with root passwd?" y \
+ --enable-root-passwd --disable-root-passwd
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index 2e600c9..7e5cab3 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -2,11 +2,10 @@ depends bc &&
depends zlib &&
depends xorg-libs &&

-if [ "$XSCSV_GTK" == "y" ]; then
- depends gtk+2 '--with-gtk' &&
- depends libxml2 '--with-xml' &&
- depends libglade2
-fi &&
+message "${MESSAGE_COLOR}The xscreensaver demo program allows you to" \
+ "browse among the different effects available in xscreensaver." \
+ "${DEFAULT_COLOR}" &&
+optional_depends libglade2 '' '' 'Enable xscreensaver demo?' &&

optional_depends linux-pam \
"--with-pam" \
@@ -23,30 +22,66 @@ optional_depends shadow
\
"--without-shadow" \
"for shadow password authentication support" &&

+optional_depends gdm2 \
+ "--with-login-manager" \
+ "--without-login-manager" \
+ "for login manager support" &&
+
+optional_depends libgnome \
+ "" \
+ "" \
+ "use gnome-open to open stuff?" &&
+
optional_depends GLUT \
"--with-gl" \
"--without-gl" \
- "for OpenGL demos which require GLUT" &&
+ "for OpenGL/GLUT screensavers" &&

-optional_depends gle \
+optional_depends libgle \
"--with-gle" \
"--without-gle" \
- "Enable GLE extentions" &&
+ "Enable GLE OpenGL tubing and extrusion" &&

optional_depends fortune \
"--with-fortune" \
"--without-fortune" \
"for fortune text messages" "games" &&

+optional_depends GTK2 \
+ "--with-gtk --with-pixbuf" \
+ "--without-gtk --without-pixbuf" \
+ "for GDK-Pixbuf image support and a gtk interface" &&
+
+optional_depends libxpm \
+ "--with-xpm" \
+ "--without-xpm" \
+ "Include support for XPM files? (Not needed if Pixbuf is
used)?" &&
+
optional_depends jpeg \
"--with-jpeg" \
"--without-jpeg" \
"for JPEG image support" &&

-optional_depends gdk-pixbuf \
- "--with-pixbuf" \
- "--without-pixbuf" \
- "for GDK-Pixbuf image support" &&
+optional_depends WEB-BROWSER \
+ "" \
+ "" \
+ "Which browser to use for help" &&
+
+optional_depends libxext \
+ "--with-dpms-ext --with-xshm-ext --with-xdbe-ext" \
+ "--without-dpms-ext --with-xshm-ext --with-xdbe-ext" \
+ "Enable power mgmt, shared mem and double buffer support?"
&&
+
+optional_depends libxrandr \
+ "--with-randr-ext" \
+ "--without-randr-ext" \
+ "Include support for the X Resize+Rotate extension?" &&
+
+optional_depends libxinerama \
+ "--with-xinerama-ext" \
+ "--without-xinerama-ext" \
+ "Enable Xinerama multihead support?" &&
+
suggest_depends xplanet \
"" \
"" \
@@ -71,3 +106,4 @@ suggest_depends electricsheep
\
"" \
"" \
"support for ElectricSheep screensaver"
+
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index c0009f4..557e2e3 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,12 @@
+2009-07-25 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD: added logic to optionally select a help browser
+ * CONFIGURE: moved libglade2, libxml2 and gtk+2 to DEPENDS,
+ compressed to 1 optional_depends on libglade2.
+ Added questions about accepting rootpw and screen locking
+ * DEPENDS: added optional deps on gdm2, libgnome ,libxpm, libxext,
+ a web-browser, libxrandr, libxinerama. switched from gdk-pixbuf to
+ gtk+2. Also, it optionally depends on libgle, not gle (different
lib).
+
2009-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.08

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (5f52c1a4bd4b2334f9b43bed55b185d24bdbaba8), Arjan Bouter, 07/25/2009