Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (7d8e81cefedafd4096e0b583ff1e3633a5395316)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (7d8e81cefedafd4096e0b583ff1e3633a5395316)
  • Date: Sat, 8 Jul 2006 09:22:57 -0500

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

audio-players/azrael/DEPENDS | 5
audio-players/azrael/HISTORY | 3
audio-players/gxmms2/DEPENDS | 7 -
audio-players/gxmms2/HISTORY | 3
audio-players/xmms2/BUILD | 15 ++
audio-players/xmms2/CONFIGURE | 86 +++++++++-------
audio-players/xmms2/DEPENDS | 186
++++++++++++++++++------------------
audio-players/xmms2/DETAILS | 4
audio-players/xmms2/HISTORY | 8 +
audio-players/xmms2/PRE_SUB_DEPENDS | 15 ++
audio-players/xmms2/SUB_DEPENDS | 11 ++
shell-term-fm/bantam/DETAILS | 9 -
shell-term-fm/bantam/HISTORY | 3
13 files changed, 217 insertions(+), 138 deletions(-)

New commits:
commit 7d8e81cefedafd4096e0b583ff1e3633a5395316
Merge: 5f53ee281d5363652d4a3c269317d2d678d1106c
9e70b78d6e447b33b4bce90a446540658dca11f0
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

Merge with git+ssh://alevstik AT scm.sourcemage.org/smgl/grimoire.git

commit 5f53ee281d5363652d4a3c269317d2d678d1106c
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

azrael: added subdepends on xmms2 CLIENTLIB

commit 3ddbddac3831e2d03fc154899790b7b88c58bf74
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

gxmms2: added subdepends on xmms2 CLIENTLIB

commit dbfac13345aa2da2d315b220515635d43a4554ff
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

xmms2: update to DrEvil and added SUB_DEPENDS

commit f9872e152c126d01c9f60fcb1511e09d162c0bbc
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

bantam: new version 0.4.1

diff --git a/audio-players/azrael/DEPENDS b/audio-players/azrael/DEPENDS
index 900c9ad..8b2be42 100755
--- a/audio-players/azrael/DEPENDS
+++ b/audio-players/azrael/DEPENDS
@@ -1,2 +1,3 @@
-depends xmms2
-depends gtk+2
+depends xmms2 &&
+sub_depends xmms2 CLIENTLIB &&
+depends gtk+2
diff --git a/audio-players/azrael/HISTORY b/audio-players/azrael/HISTORY
index b9804e2..138364d 100644
--- a/audio-players/azrael/HISTORY
+++ b/audio-players/azrael/HISTORY
@@ -1,3 +1,6 @@
+2006-07-08 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added sub_depends on xmms2 CLIENTLIB
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/audio-players/gxmms2/DEPENDS b/audio-players/gxmms2/DEPENDS
index a7b1a6a..dc27600 100755
--- a/audio-players/gxmms2/DEPENDS
+++ b/audio-players/gxmms2/DEPENDS
@@ -1,6 +1,7 @@
-depends xmms2 &&
-depends gtk+2 &&
+depends xmms2 &&
+sub_depends xmms2 CLIENTLIB &&
+depends gtk+2 &&
if [[ "$GXMMS2_KRELL" == "y" ]]
then
- depends gkrellm2
+ depends gkrellm2
fi
diff --git a/audio-players/gxmms2/HISTORY b/audio-players/gxmms2/HISTORY
index cda723d..e433164 100644
--- a/audio-players/gxmms2/HISTORY
+++ b/audio-players/gxmms2/HISTORY
@@ -1,3 +1,6 @@
+2006-07-08 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: added sub_depends xmms2 CLIENTLIB
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/audio-players/xmms2/BUILD b/audio-players/xmms2/BUILD
index 3311a88..05056a7 100755
--- a/audio-players/xmms2/BUILD
+++ b/audio-players/xmms2/BUILD
@@ -1,3 +1,18 @@
+if list_find "$XMMS2_OPTS1" noruby ; then
+ list_remove OPTS ruby
+fi &&
+if list_find "$XMMS2_OPTS1" nopython ; then
+ list_remove OPTS python
+fi &&
+if list_find "$XMMS2_OPTS1" noxmmsclient++ ; then
+ list_remove OPTS xmmsclient++
+fi &&
+if list_find "$XMMS2_OPTS1" noxmmsclient-ecore ; then
+ list_remove OPTS xmmsclient-ecore
+fi &&
+if list_find "$XMMS2_OPTS1" nojava ; then
+ list_remove OPTS java
+fi &&
cd $SOURCE_DIRECTORY/xmms* &&
scons MANDIR=${INSTALL_ROOT}/usr/share/man \
PREFIX=${INSTALL_ROOT}/usr \
diff --git a/audio-players/xmms2/CONFIGURE b/audio-players/xmms2/CONFIGURE
index 2c3b5f8..d7f6e6b 100755
--- a/audio-players/xmms2/CONFIGURE
+++ b/audio-players/xmms2/CONFIGURE
@@ -1,36 +1,50 @@
-config_query_option XMMS2_OPTS \
- "Do you want diskwrite plugin" y \
- "nonedw" "diskwrite" &&
-config_query_option XMMS2_OPTS \
- "Do you want html playlist support" y \
- "nohtml" "html" &&
-config_query_option XMMS2_OPTS \
- "Do you want id3 tag support" y \
- "noid3" "id3v2" &&
-config_query_option XMMS2_OPTS \
- "Do you want equalizer support" y \
- "noequalizer" "equalizer" &&
-config_query_option XMMS2_OPTS \
- "Do you want null output support" y \
- "nonull" "null" &&
-config_query_option XMMS2_OPTS \
- "Do you want m3u playlist support" y \
- "nom3u" "m3u" &&
-config_query_option XMMS2_OPTS \
- "Do you want nulstripper support" y \
- "nonulstripper" "nulstripper" &&
-config_query_option XMMS2_OPTS \
- "Do you want pls playlist support" y \
- "nopls" "pls" &&
-config_query_option XMMS2_OPTS \
- "Do you want file transport support" y \
- "nolib" "file" &&
-config_query_option XMMS2_OPTS \
- "Do you want to build the client lib" y \
- "nofile" "lib" &&
-config_query_option XMMS2_OPTS \
- "Do you want to build the cli client" y \
- "nocli" "cli" &&
-config_query_option XMMS2_OPTS \
- "Do you want to build the et report tool" y \
- "noet" "et"
+message "NOTE: not all of these options might be relevant to your selected"
&&
+message "tree and version but they don't affect anything or in other words"
&&
+message "NOTHING WILL BREAK IF IT ISN'T SUPPORTED" &&
+config_query_option XMMS2_OPTS \
+"Do you want to build the xmms2 daemon(to play music localy)" y \
+ "noxmms" "xmms" &&
+config_query_option XMMS2_OPTS \
+"Do you want to build the client lib for other clients to use RECOMMENDED" y
\
+ "nolib" "lib" &&
+if list_find "$XMMS2_OPTS" noxmms ; then
+ config_query_option XMMS2_OPTS \
+ "Do you want diskwrite plugin" y \
+ "nonedw" "diskwrite" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want html playlist support" y \
+ "nohtml" "html" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want id3 tag support" y \
+ "noid3" "id3v2" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want equalizer support" y \
+ "noequalizer" "equalizer" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want null output support" y \
+ "nonull" "null" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want m3u playlist support" y \
+ "nom3u" "m3u" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want nulstripper support" y \
+ "nonulstripper" "nulstripper" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want pls playlist support" y \
+ "nopls" "pls" &&
+ config_query_option XMMS2_OPTS \
+"Do you want file transport support(to access using file://) RECOMMENDED" \
+ y "nofile" "file"
+else
+ list_add XMMS2_OPTS file pls nulstripper m3u null equalizer id3v2 html
diskwrite
+fi &&
+if list_find "$XMMS2_OPTS" nolib ; then
+ config_query_option XMMS2_OPTS \
+ "Do you want to build the cli client" y \
+ "nocli" "cli" &&
+ config_query_option XMMS2_OPTS \
+ "Do you want to build the et report tool" y \
+ "noet" "et"
+else
+ list_add XMMS2_OPTS cli et
+fi
diff --git a/audio-players/xmms2/DEPENDS b/audio-players/xmms2/DEPENDS
index dd96741..a25e9f0 100755
--- a/audio-players/xmms2/DEPENDS
+++ b/audio-players/xmms2/DEPENDS
@@ -1,103 +1,107 @@
-depends scons &&
-depends sqlite &&
-depends glib2 &&
+depends scons &&
+depends sqlite &&
+depends glib2 &&

#Transport plugins &&
-optional_depends curl \
- "" \
- "curl" \
- "For http transport plugin." &&
-optional_depends libmms \
- "" \
- "mms" \
- "For mms transport plugin." &&
-optional_depends samba \
- "" \
- "samba" \
- "For samba transport plugin." &&
+if list_find "$XMMS2_OPTS" noxmms ; then
+optional_depends curl \
+ "" \
+ "curl" \
+ "For http transport plugin." &&
+optional_depends libmms \
+ "" \
+ "mms" \
+ "For mms transport plugin." &&
+optional_depends samba \
+ "" \
+ "samba" \
+ "For samba transport plugin." &&

#Decoder plugins &&
-optional_depends libmad \
- "" \
- "mad" \
- "For mp3 decoder plugin." &&
-optional_depends libvorbis \
- "" \
- "vorbis" \
- "For ogg/vorbis decoder plugin." &&
-optional_depends libmodplug \
- "" \
- "modplug" \
- "For mod/s3m/etc... decoder plugin." &&
-optional_depends libmpcdec \
- "" \
- "musepack" \
- "For musepack(mpc) decoder plugin." &&
-optional_depends flac \
- "" \
- "flac" \
- "For flac decoder plugin." &&
-optional_depends sidplay-libs \
- "" \
- "sid" \
- "For sid decoder plugin." &&
-optional_depends speex \
- "" \
- "speex" \
- "For speex decoder plugin." &&
-optional_depends faad2 \
- "" \
- "faad" \
- "For AAC/MP4 decoder plugin." &&
-optional_depends LIBAVCODEC \
- "" \
- "wma" \
- "For WMA decoder plugin." &&
+optional_depends libmad \
+ "" \
+ "mad" \
+ "For mp3 decoder plugin." &&
+optional_depends libvorbis \
+ "" \
+ "vorbis" \
+ "For ogg/vorbis decoder plugin." &&
+optional_depends libmodplug \
+ "" \
+ "modplug" \
+ "For mod/s3m/etc... decoder plugin." &&
+optional_depends libmpcdec \
+ "" \
+ "musepack" \
+ "For musepack(mpc) decoder plugin." &&
+optional_depends flac \
+ "" \
+ "flac" \
+ "For flac decoder plugin." &&
+optional_depends sidplay-libs \
+ "" \
+ "sid" \
+ "For sid decoder plugin." &&
+optional_depends speex \
+ "" \
+ "speex" \
+ "For speex decoder plugin." &&
+optional_depends faad2 \
+ "" \
+ "faad" \
+ "For AAC/MP4 decoder plugin." &&
+optional_depends LIBAVCODEC \
+ "" \
+ "wma" \
+ "For WMA decoder plugin." &&

-#Clients &&
-optional_depends sdl_ttf \
- "" \
- "sdl-vis" \
- "For visuialization client support(sdl-vis)." &&
-optional_depends gamin \
- "" \
- "medialib-updater" \
- "For medialib-updater support." &&

#Output plugins &&
-optional_depends alsa-lib \
- "" \
- "alsa" \
- "For alsa output plugin." &&
-optional_depends jack \
- "" \
- "jack" \
- "For jack output plugin." &&
+optional_depends alsa-lib \
+ "" \
+ "alsa" \
+ "For alsa output plugin." &&
+optional_depends jack \
+ "" \
+ "jack" \
+ "For jack output plugin." &&

#Effect plugins &&
-optional_depends libshout \
- "" \
- "ices icymetaint" \
- "Icecast effect plugin" &&
+optional_depends libshout \
+ "" \
+ "ices icymetaint" \
+ "Icecast effect plugin"
+fi &&
+if list_find "$XMMS2_OPTS" nolib ; then
+#Clients &&
+optional_depends sdl_ttf \
+ "" \
+ "sdl-vis" \
+ "For visuialization client support(sdl-vis)." &&
+optional_depends gamin \
+ "" \
+ "medialib-updater" \
+ "For medialib-updater support." &&

#Language bindings &&
-optional_depends pyrex \
- "" \
- "python" \
- "For python bindings." &&
-optional_depends ruby \
- "" \
- "ruby" \
- "For ruby bindings." &&
-optional_depends JAVA \
- "" \
- "java" \
- "For java bindings." &&
-optional_depends ecore \
- "" \
- "xmmsclient-ecore" \
- "For ecore bindings." &&
-optional_depends boost \
- "" \
- "xmmsclient++" \
+optional_depends pyrex \
+ "" \
+ "python" \
+ "For python bindings." &&
+optional_depends ruby \
+ "" \
+ "ruby" \
+ "For ruby bindings." &&
+optional_depends JAVA \
+ "" \
+ "java" \
+ "For java bindings." &&
+optional_depends ecore \
+ "" \
+ "xmmsclient-ecore" \
+ "For ecore bindings." &&
+optional_depends boost \
+ "" \
+ "xmmsclient++" \
"For C++ bindings."
+fi
diff --git a/audio-players/xmms2/DETAILS b/audio-players/xmms2/DETAILS
index d71e6d8..b06a551 100755
--- a/audio-players/xmms2/DETAILS
+++ b/audio-players/xmms2/DETAILS
@@ -14,11 +14,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
FORCE_DOWNLOAD=ON
SOURCE_IGNORE=volatile
else
- VERSION=0.2DrDolittle
+ VERSION=0.2DrEvil
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:48ca9ae0fec99a59e3ceb1c68bd8687d788035612e547af91f86ce8ec2071c611236a5fad188b4e783b64996ffeb4eaedc66f9ec6cef416e27b472928521d371:UPTSREAM_HASH
+
SOURCE_HASH=sha512:245ec9c93d75e1a222edfeb28bdf8db091972067bffa23dbc7461a2c7048c7d4ad7908a716dd00576a2c9bdf396b995d53c182989421bbf17722e5f99263a02e:UPTSREAM_HASH
fi
WEB_SITE=http://wiki.xmms2.xmms.se/index.php/Main_Page
ENTERED=20040527
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index b5f3888..f6adc7a 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,11 @@
+2006-07-08 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: new version DrEvil, also fixes bug #12800
+ * DEPENDS: reorganized
+ * CONFIGURE: reorganized
+ * BUILD: minor fix
+ * PRE_SUB_DEPENDS: added
+ * SUB_DEPENDS: added
+
2006-06-16 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: fixes bug #12702
* BUILD: minor fix
diff --git a/audio-players/xmms2/PRE_SUB_DEPENDS
b/audio-players/xmms2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8184821
--- /dev/null
+++ b/audio-players/xmms2/PRE_SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+ CLIENTLIB) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient.so ];;
+ CLIENTLIB_RUBY) [ -f
$INSTALL_ROOT/usr/lib/ruby/site_ruby/*/*/xmmsclient.so ] ||
+ is_depends_enabled $SPELL ruby && ;;
+ CLIENTLIB_ECORE) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient-ecore.so ] ||
+ is_depends_enabled $SPELL ecore && ;;
+CLIENTLIB_PYTHON) [ -f
$INSTALL_ROOT/usr/lib/python*/site-packages/xmmsclient.so ] ||
+ is_depends_enabled $SPELL pyrex && ;;
+ CLIENTLIB_JAVA) [ -f $INSTALL_ROOT/usr/lib/libxmms2java.so ] ||
+ is_depends_enabled $SPELL JAVA && ;;
+ CLIENTLIB_CXX) [ -f $INSTALL_ROOT/usr/lib/libxmmsclient++.so ]
+ is_depends_enabled $SPELL boost && ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/audio-players/xmms2/SUB_DEPENDS b/audio-players/xmms2/SUB_DEPENDS
new file mode 100755
index 0000000..c0d5182
--- /dev/null
+++ b/audio-players/xmms2/SUB_DEPENDS
@@ -0,0 +1,11 @@
+persistent_add XMMS2_OPTS1
+case "$THIS_SUB_DEPENDS" in
+ CLIENTLIB) list_add XMMS2_OPTS nolib && list_remove XMMS2_OPTS lib ;;
+ CLIENTLIB_RUBY) list_add XMMS2_OPTS1 noruby && depends ruby ;;
+CLIENTLIB_PYTHON) list_add XMMS2_OPTS1 nopython && depends pyrex ;;
+ CLIENTLIB_CXX) list_add XMMS2_OPTS1 noxmmsclient++ && depends boost ;;
+ CLIENTLIB_ECORE) list_add XMMS2_OPTS1 noxmmsclient-ecore && depends ecore ;;
+ CLIENTLIB_JAVA) list_add XMMS2_OPTS1 nojava && depends JAVA ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/shell-term-fm/bantam/DETAILS b/shell-term-fm/bantam/DETAILS
index d6d73fe..cb3d844 100755
--- a/shell-term-fm/bantam/DETAILS
+++ b/shell-term-fm/bantam/DETAILS
@@ -1,13 +1,14 @@
SPELL=bantam
- VERSION=0.4
- SOURCE=bantam-0.4.tar.gz
- SOURCE_URL[0]=http://matt.gushee.net/download/bantam/bantam-0.4.tar.gz
-
SOURCE_HASH=sha512:89df87813756113a5e10752a1930ce42044dfdf7df16cbca218dea6d61b1633c736359632d8e2949498eb501dbc955f90b4e504a1d77e9560e2eb11da7729918
+ VERSION=0.4.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://matt.gushee.net/download/bantam/$SOURCE
+
SOURCE_HASH=sha512:28a553077bb6b77ec038c9fa35c5bb45f59b0ff97a1818fbff5d9cfb83d652ac7a039f69231dfdb5f9bea6aa21d650bd5dbc2ab3b697b91b483d38e2dbc988b9
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://matt.gushee.net/software/bantam/
ENTERED=20060629
UPDATED=20060629
LICENSE[0]=GPL
+ BUILD_API=2
SHORT="A lightweight file manager for X11."
cat << EOF
Bantam is a fast, light file manager for X11. It is targeted at power
diff --git a/shell-term-fm/bantam/HISTORY b/shell-term-fm/bantam/HISTORY
index ef0f2f8..6c40285 100644
--- a/shell-term-fm/bantam/HISTORY
+++ b/shell-term-fm/bantam/HISTORY
@@ -1,2 +1,5 @@
+2006-07-08 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: New version 0.4.1
+
2006-06-29 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS, DEPENDS, PRE_BUILD, BUILD, HISTORY: created spell



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (7d8e81cefedafd4096e0b583ff1e3633a5395316), Andra?? Levstik, 07/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page