[SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (b3086df053710b40e9699fcfcc57692aa963bce7)

Justin Boffemmyer scm at sourcemage.org
Thu Jan 31 04:58:29 EST 2008


GIT changes to master grimoire by Justin Boffemmyer <flux at sourcemage.org>:

 audio-players/cmus/BUILD     |    2 -
 audio-players/cmus/CONFIGURE |    2 +
 audio-players/cmus/DEPENDS   |   67 ++++++++++++++++++++++++++++++++++---------
 audio-players/cmus/DETAILS   |    8 ++---
 audio-players/cmus/HISTORY   |    8 +++++
 5 files changed, 68 insertions(+), 19 deletions(-)

New commits:
commit f4c408acd9cca7c4f7281e8a1a35e26ee24ad77c
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    cmus/DETAILS: Version upgrade from 2.0.0 to 2.2.0
                  modified SOURCE_URL[0], SOURCE_HASH, and WEB_SITE
    
    New changes - cmus now uses a new custom configure system. All of the
    config options are passed to configure via regular environment
    variables. This means --option will not be recognized. Also updated
    support for various options. Finally, cmus has moved to
    sourceforge.net, requiring the changes to WEB_SITE and SOURCE_URL[0].

commit 027370044f85449591d67236b40c054cc95726b8
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    cmus/DEPENDS: modified config options to match new cmus configure
                  and added depends info for all the new options it has

commit e27fc605faefe7dce2e56369a24661d003faf4e7
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    cmus/BUILD: changed --prefix to prefix, added OSS option

commit afb7fadce6c7998eef89381d3c4f7d0a6435288f
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    cmus/CONFIGURE: Added to handle OSS option

diff --git a/audio-players/cmus/BUILD b/audio-players/cmus/BUILD
index 092d8f8..7b4104d 100755
--- a/audio-players/cmus/BUILD
+++ b/audio-players/cmus/BUILD
@@ -1,2 +1,2 @@
-./configure --prefix=${INSTALL_ROOT}/usr $OPTS  &&
+./configure prefix=${INSTALL_ROOT}/usr $CMUS_OSS $OPTS  &&
 make
diff --git a/audio-players/cmus/CONFIGURE b/audio-players/cmus/CONFIGURE
new file mode 100755
index 0000000..763e521
--- /dev/null
+++ b/audio-players/cmus/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option  CMUS_OSS  "Enable OSS support?"  y  \
+                               "CONFIG_OSS=y"  "CONFIG_OSS=n"
diff --git a/audio-players/cmus/DEPENDS b/audio-players/cmus/DEPENDS
index 55474a1..02cd339 100755
--- a/audio-players/cmus/DEPENDS
+++ b/audio-players/cmus/DEPENDS
@@ -1,29 +1,68 @@
-optional_depends  flac                                            \
-                  "--enable-flac"                                 \
-                  "--disable-flac"                                \
+optional_depends  "flac"                                          \
+                  "CONFIG_FLAC=y"                                 \
+                  "CONFIG_FLAC=n"                                 \
                   "for FLAC (Free Lossless Audio Codec) support"  &&
 
 optional_depends  "libmad"                                   \
-                  "--enable-mad"                             \
-                  "--disable-mad"                            \
+                  "CONFIG_MAD=y"                             \
+                  "CONFIG_MAD=n"                             \
                   "for MPEG Audio Decoder (libmad) support"  &&
 
+optional_depends  "libmodplug"                        \
+                  "CONFIG_MODPLUG=y"                  \
+                  "CONFIG_MODPLUG=n"                  \
+                  "for MODPLUG (libmodplug) support"  &&
+
+optional_depends  "mikmod"                          \
+                  "CONFIG_MIKMOD=y"                 \
+                  "CONFIG_MIKMOD=n"                 \
+                  "for MIKMOD (libmikmod) support"  &&
+
 optional_depends  "libmpcdec"        \
-                  "--enable-mpc"     \
-                  "--disable-mpc"    \
+                  "CONFIG_MPC=y"     \
+                  "CONFIG_MPC=n"     \
                   "for MPC support"  &&
 
-optional_depends  libvorbis                 \
-                  "--enable-vorbis"         \
-                  "--disable-vorbis"        \
+optional_depends  "libvorbis"               \
+                  "CONFIG_VORBIS=y"         \
+                  "CONFIG_VORBIS=n"         \
                   "for Ogg/Vorbis support"  &&
 
+optional_depends  "wavpack"              \
+                  "CONFIG_WAVPACK=y"     \
+                  "CONFIG_WAVPACK=n"     \
+                  "for WAVPACK support"  &&
+
+optional_depends  "libmp4v2"         \
+                  "CONFIG_MP4=y"     \
+                  "CONFIG_MP4=n"     \
+                  "for MP4 support"  &&
+
+if is_depends_enabled $SPELL "libmp4v2"  ;  then
+  depends  "faad2"
+fi  &&
+
+optional_depends  "faad2"                      \
+                  "CONFIG_AAC=y"               \
+                  "CONFIG_AAC=n"               \
+                  "for AAC (libfaad) support"  &&
+
+optional_depends  "ffmpeg"              \
+                  "CONFIG_FFMPEG=y"     \
+                  "CONFIG_FFMPEG=n"     \
+                  "for FFMPEG support"  &&
+
 optional_depends  "alsa-lib"          \
-                  "--enable-alsa"     \
-                  "--disable-alsa"    \
+                  "CONFIG_ALSA=y"     \
+                  "CONFIG_ALSA=n"     \
                   "for ALSA support"  &&
 
+optional_depends  "libao"                   \
+                  "CONFIG_AO=y"             \
+                  "CONFIG_AO=n"             \
+                  "for AO (libao) support"  &&
+
 optional_depends  arts                \
-                  "--enable-arts"     \
-                  "--disable-arts"    \
+                  "CONFIG_ARTS=y"     \
+                  "CONFIG_ARTS=n"     \
                   "for ARTS support"
diff --git a/audio-players/cmus/DETAILS b/audio-players/cmus/DETAILS
index dc69539..3d3a70d 100755
--- a/audio-players/cmus/DETAILS
+++ b/audio-players/cmus/DETAILS
@@ -1,10 +1,10 @@
            SPELL=cmus
-         VERSION=2.0.0
+         VERSION=2.2.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://onion.dynserv.net/~timo/files/$SOURCE
-     SOURCE_HASH=sha512:18e66e387c17f85412836e67328c5b3e345853e0ebb7809d551a21afcd26084316b46fbe133595f88a89f91924f387074c63f5fb3dab381a839cc8b0fef058b2
-        WEB_SITE=http://onion.dynserv.net/~timo/cmus.html
+   SOURCE_URL[0]=http://mirror.greaterscope.net/cmus/cmus-2.2.0.tar.bz2
+     SOURCE_HASH=sha512:c708b8626bff84dc6f3a4c84f8521725611f1ed071cd821a7bbdb80906c0e4096f53a67ce729bdb232b4ccc1beb1101fc245b8e721b473cfee4025bdd200fece
+        WEB_SITE=http://cmus.sourceforge.net
          ENTERED=20060116
       LICENSE[0]=GPL
         KEYWORDS="music players player audio"
diff --git a/audio-players/cmus/HISTORY b/audio-players/cmus/HISTORY
index 6ca53b3..f4fe2c1 100644
--- a/audio-players/cmus/HISTORY
+++ b/audio-players/cmus/HISTORY
@@ -1,3 +1,11 @@
+2008-01-30 Justin Boffemmyer <flux at sourcemage.org>
+	* DETAILS: 2.2.0, updated SOURCE_URL[0], SOURCE_HASH, and WEB_SITE
+	* CONFIGURE: Added to handle the OSS option
+	* BUILD: Changed --prefix= to prefix= as per cmus's new configure,
+	         added $CMUS_OSS option to pull OSS option from CONFIGURE
+	* DEPENDS: Changed all --enable-X etc. to CONFIG_X=y/n to match
+	           the new configure system, added all available options
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 



More information about the SM-Commit mailing list