Skip to Content.
Sympa Menu

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

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 (939e438e55cb3da9e0bc0ea8d1e8c72abe269f3e)
  • Date: Tue, 20 Feb 2007 15:52:58 -0600

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

audio-creation/rosegarden/BUILD | 14 ------
audio-creation/rosegarden/CONFIGURE | 1
audio-creation/rosegarden/DEPENDS | 81
+++++++++++++++++++++---------------
audio-creation/rosegarden/DETAILS | 6 +-
audio-creation/rosegarden/HISTORY | 9 ++++
audio-creation/rosegarden/INSTALL | 2
6 files changed, 63 insertions(+), 50 deletions(-)

New commits:
commit 939e438e55cb3da9e0bc0ea8d1e8c72abe269f3e
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

rosegarden: updated to 1.5.0, added xorg-modular deps, converted from
scons to cmake

diff --git a/audio-creation/rosegarden/BUILD b/audio-creation/rosegarden/BUILD
index ecc0f31..cdadd49 100755
--- a/audio-creation/rosegarden/BUILD
+++ b/audio-creation/rosegarden/BUILD
@@ -1,12 +1,2 @@
-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=${TRACK_ROOT}/usr/include/qt \
-$OPTS &&
-
-scons
+cmake . $OPTS -DCMAKE_INSTALL_PREFIX=/usr &&
+make
diff --git a/audio-creation/rosegarden/CONFIGURE
b/audio-creation/rosegarden/CONFIGURE
deleted file mode 100755
index a3472b3..0000000
--- a/audio-creation/rosegarden/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query ROSEGARDEN_SOUND "Enable sound support?" y
diff --git a/audio-creation/rosegarden/DEPENDS
b/audio-creation/rosegarden/DEPENDS
index d2ba28d..481ac6e 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,46 +1,61 @@
-depends g++ &&
-depends scons &&
-depends qt-x11 &&
-depends kdelibs &&
-
-if [[ "$ROSEGARDEN_SOUND" == y ]]; then
-
- optional_depends alsa-lib \
- "" \
- "noalsa=1" \
- "for ALSA audio and MIDI support" &&
-
+depends pkgconfig &&
+depends g++ &&
+depends cmake &&
+depends qt-x11 &&
+depends kdelibs &&
+depends fftw &&
+
+optional_depends alsa-lib \
+ "-DWANT_SOUND=1" \
+ "-DWANT_SOUND=0" \
+ "to enable sound and for ALSA MIDI support" &&
+
+. "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL alsa-lib
+then
optional_depends JACK-DRIVER \
- "" \
- "nojack=1" \
+ "-DWANT_JACK=1" \
+ "-DWANT_JACK=0" \
"for JACK audio support" &&

- optional_depends ladspa "" "" "for LADSPA plugin support" &&
+ optional_depends ladspa \
+ "" \
+ "" \
+ "for LADSPA plugin support" &&

optional_depends dssi \
- "" \
- "nodssi=1" \
+ "-DWANT_DSSI=1" \
+ "-DWANT_DSSI=0" \
"for DSSI plugin support" &&

-#
-## Remove this after is_depends_enabled is integrated to stable sorcery.
-#
-source "$GRIMOIRE/is_depends_enabled.function" &&
-
- 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 liblo \
+ "" \
+ "" \
+ "for audio plugin custom GUI support" &&

+ optional_depends liblrdf \
+ "" \
+ "" \
+ "for audio plugin metadata support"
fi &&

-. $GRIMOIRE/FUNCTIONS
-if check_if_xorg_modular_libs qt-x11; then
- optional_depends libxft "" "" "for better score rendering quality"
+. "$GRIMOIRE/FUNCTIONS"
+
+if check_if_xorg_modular_libs qt-x11
+then
+ depends libsm &&
+ depends libice &&
+ depends libx11 &&
+ depends libxext &&
+
+ optional_depends libxft \
+ "" \
+ "" \
+ "for better score rendering quality"
fi &&

-optional_depends lirc \
- "" \
- "nolirc=1" \
+optional_depends lirc \
+ "-DWANT_LIRC=1" \
+ "-DWANT_LIRC=0" \
"for remote control support"
diff --git a/audio-creation/rosegarden/DETAILS
b/audio-creation/rosegarden/DETAILS
index a42aa73..ef8b531 100755
--- a/audio-creation/rosegarden/DETAILS
+++ b/audio-creation/rosegarden/DETAILS
@@ -1,9 +1,9 @@
SPELL=rosegarden
- VERSION=1.4.0
+ VERSION=1.5.0
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:34dea9223a505fda435fa6c98231007309a24687e801d9a9f8c7cb33cab2c8fa198485f5b3083c336e4e9ac5b831c388caee5456460aec806c8b63f270faf9d6
+
SOURCE_HASH=sha512:15e07cf64b8c88e428b32f7ae9c4b5ca048bc278a1d6b3ba8c9078cb115805c4262c9e208c892074f60afc5b67006bf23eae0d2bc09f242d1e339511706df045
WEB_SITE=http://www.rosegardenmusic.com/
ENTERED=20020514
LICENSE[0]=GPL
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index babeb83..fde3b38 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,12 @@
+2007-02-20 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 1.5.0.
+ * CONFIGURE: Deleted, sound option now handled by optional_depends
+ alsa-lib.
+ * DEPENDS: Added depends pkgconfig & fftw, replaced depends scons
+ with cmake, converted flags to cmake format, added
+ xorg-modular deps.
+ * BUILD, INSTALL: Converted to use cmake.
+
2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Source is_depends_enabled.function (remove it when
is_depends_enabled is in stable sorcery).
diff --git a/audio-creation/rosegarden/INSTALL
b/audio-creation/rosegarden/INSTALL
index 9f0c0eb..965fd47 100755
--- a/audio-creation/rosegarden/INSTALL
+++ b/audio-creation/rosegarden/INSTALL
@@ -1 +1 @@
-scons install
+make install DESTDIR="$INSTALL_ROOT"



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (939e438e55cb3da9e0bc0ea8d1e8c72abe269f3e), Juuso Alasuutari, 02/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page