[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (a2bf3b24b130607efe9b1e81aea2021f2b4aee1f)

Juuso Alasuutari scm at mail.sourcemage.org
Sun Sep 17 15:30:31 EDT 2006


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

 audio-creation/rosegarden/BUILD     |   15 +++++++-----
 audio-creation/rosegarden/CONFIGURE |    3 --
 audio-creation/rosegarden/DEPENDS   |   43 +++++++++++++++++++++++++++---------
 audio-creation/rosegarden/DETAILS   |   16 ++++++-------
 audio-creation/rosegarden/HISTORY   |   10 ++++++++
 audio-creation/rosegarden/INSTALL   |    2 -
 6 files changed, 62 insertions(+), 27 deletions(-)

New commits:
commit a2bf3b24b130607efe9b1e81aea2021f2b4aee1f
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    rosegarden: Fixed numerous things.

diff --git a/audio-creation/rosegarden/BUILD b/audio-creation/rosegarden/BUILD
index 5e97fbd..ecc0f31 100755
--- a/audio-creation/rosegarden/BUILD
+++ b/audio-creation/rosegarden/BUILD
@@ -1,9 +1,12 @@
-OPTS="$ROSEGARDEN_ALSA   \
-      $ROSEGARDEN_DSSI   \
-      $ROSEGARDEN_LIRC"  &&
+if [[ "$ROSEGARDEN_SOUND" == n ]]; then
+  OPTS="nosound=1 noalsa=1 nojack=1 nodssi=1 $OPTS"
+fi  &&
+
+echo $OPTS
 
 scons configure prefix=${INSTALL_ROOT}/usr \
 datadir=${INSTALL_ROOT}/usr/share \
-qtincludes=/usr/include/qt \
-$OPTS &&
-scons 
+qtincludes=${TRACK_ROOT}/usr/include/qt \
+$OPTS  &&
+
+scons
diff --git a/audio-creation/rosegarden/CONFIGURE b/audio-creation/rosegarden/CONFIGURE
index 0d25a57..a3472b3 100755
--- a/audio-creation/rosegarden/CONFIGURE
+++ b/audio-creation/rosegarden/CONFIGURE
@@ -1,2 +1 @@
-config_query_option  ROSEGARDEN_DSSI  "Enable DSSI support?"  y  \
-                     ""  "nodssi=1"
+config_query  ROSEGARDEN_SOUND  "Enable sound support?"  y
diff --git a/audio-creation/rosegarden/DEPENDS b/audio-creation/rosegarden/DEPENDS
index e25ceba..dd09e4e 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,18 +1,41 @@
+depends  g++      &&
 depends  scons    &&
-depends  kdelibs  &&
 depends  qt-x11   &&
+depends  kdelibs  &&
+
+if [[ "$ROSEGARDEN_SOUND" == y ]]; then
+
+  optional_depends  alsa-lib                           \
+                    ""                                 \
+                    "noalsa=1"                         \
+                    "for ALSA audio and MIDI support"  &&
+
+  optional_depends  JACK-DRIVER               \
+                    ""                        \
+                    "nojack=1"                \
+                    "for JACK audio support"  &&
+
+  optional_depends  ladspa  ""  ""  "for LADSPA plugin support"  &&
+
+  optional_depends  dssi                       \
+                    ""                         \
+                    "nodssi=1"                 \
+                    "for DSSI plugin support"  &&
+
+  if is_depends_enabled $SPELL ladspa ||
+     is_depends_enabled $SPELL dssi; then
+    optional_depends  liblo  ""  ""  "for audio plugin custom GUI support"  &&
+    optional_depends  liblrdf  ""  ""  "for audio plugin metadata support"
+  fi
 
-optional_depends  JACK-DRIVER               \
-                  ""                        \
-                  "nojack=1"                \
-                  "for JACK audio support"  &&
+fi  &&
 
-optional_depends  alsa-lib            \
-                  ""                  \
-                  "noalsa=1"          \
-                  "for ALSA support"  &&
+.  $GRIMOIRE/FUNCTIONS
+if check_if_xorg_modular_libs qt-x11; then
+  optional_depends  libxft  ""  ""  "for better score rendering quality"
+fi  &&
 
 optional_depends  lirc                 \
                   ""                   \
                   "nolirc=1"           \
-                  "for lirc support?"
+                  "for LIRC support"
diff --git a/audio-creation/rosegarden/DETAILS b/audio-creation/rosegarden/DETAILS
index 5d58e17..ab4cb04 100755
--- a/audio-creation/rosegarden/DETAILS
+++ b/audio-creation/rosegarden/DETAILS
@@ -4,16 +4,16 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:2b54ca042cc124fdbb62a9b62fdc8d70af24e7fb87929f3bb4b88a754115f04d8b4341290be333c0fa14820e04ff2b680cbe9fda49792447194c419d733228b8
-        WEB_SITE=http://rosegarden.sf.net
+        WEB_SITE=http://www.rosegardenmusic.com/
          ENTERED=20020514
-         UPDATED=20030330
+      PATCHLEVEL=1
       LICENSE[0]=GPL
-       BUILD_API=2
         KEYWORDS="music editors audio"
-           SHORT="Music notation"
+           SHORT="A professional audio and MIDI sequencer."
 cat << EOF
-Rosegarden-4 is the new development series of the Rosegarden MIDI and audio sequencer and musical notation editor. It is free software for Unix and X.
-It's a KDE application, which means it needs the KDE libraries, but it can be run within the KDE environment or any other desktop or window manager
-environment.
+Rosegarden is a professional audio and MIDI sequencer, score editor, and 
+general-purpose music composition and editing environment. Rosegarden is 
+an easy-to-learn, attractive application that runs on Linux, ideal for 
+composers, musicians, music students, and small studio or home recording 
+environments.
 EOF
-
diff --git a/audio-creation/rosegarden/HISTORY b/audio-creation/rosegarden/HISTORY
index 5b1037a..2abbc9a 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,13 @@
+2006-09-17 Juuso Alasuutari <iuso at sourcemage.org>
+	* DEPENDS: Added depends g++ and optional_depends ladspa & 
+	  dssi & liblo & liblrdf & libxft, added PATCHLEVEL=1.
+	* CONFIGURE: Removed DSSI query (now in DEPENDS), added sound 
+	  support query.
+	* BUILD: Fixed (had nonexistent OPTS and missing TRACK_ROOT).
+	* DETAILS: Corrected WEB_SITE, removed UPDATED and BUILD_API, 
+	  updated descriptions.
+	* INSTALL: Added missing newline.
+
 2006-07-24 Bearcat M. Sandor <sourcemage at feline-soul.com>
 	* DETAILS: Updated to 1.2.4
 
diff --git a/audio-creation/rosegarden/INSTALL b/audio-creation/rosegarden/INSTALL
index babc987..9f0c0eb 100755
--- a/audio-creation/rosegarden/INSTALL
+++ b/audio-creation/rosegarden/INSTALL
@@ -1 +1 @@
-scons install
\ No newline at end of file
+scons install



More information about the SM-Commit mailing list