sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (65bcf1e2f78d33faa344cbe331e4fda878e9b8e0)

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 (65bcf1e2f78d33faa344cbe331e4fda878e9b8e0)
Date: Tue, 4 Oct 2011 11:04:14 -0500

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

audio-creation/rosegarden/BUILD | 7 ++--
audio-creation/rosegarden/DEPENDS | 59
+++++++-----------------------------
audio-creation/rosegarden/DETAILS | 4 +-
audio-creation/rosegarden/HISTORY | 6 +++
audio-creation/rosegarden/INSTALL | 1
audio-creation/rosegarden/PRE_BUILD | 3 +
6 files changed, 27 insertions(+), 53 deletions(-)

New commits:
commit 65bcf1e2f78d33faa344cbe331e4fda878e9b8e0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

rosegarden: version 11.06 and removed obsolete kde dep

diff --git a/audio-creation/rosegarden/BUILD b/audio-creation/rosegarden/BUILD
index 420eb25..a5628d1 100755
--- a/audio-creation/rosegarden/BUILD
+++ b/audio-creation/rosegarden/BUILD
@@ -1,3 +1,4 @@
-cmake . $OPTS -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE3_INCLUDE_DIR=/usr/include/kde3 &&
-make
+QTDIR="${QTDIR:-/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
+OPTS="--with-qtdir=/usr ${OPTS}"
+default_build
diff --git a/audio-creation/rosegarden/DEPENDS
b/audio-creation/rosegarden/DEPENDS
index 61acf77..a9821e3 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,54 +1,19 @@
-depends cmake &&
-depends fftw &&
-depends -sub CXX gcc &&
-depends libsm &&
-depends libice &&
-depends libx11 &&
-depends libxext &&
-depends kdelibs &&
-depends pkgconfig &&
-depends qt-x11 &&
-
-optional_depends alsa-lib \
- "-DWANT_SOUND=1" \
- "-DWANT_SOUND=0" \
- "to enable sound and for ALSA MIDI support" &&
-
-
-if is_depends_enabled $SPELL alsa-lib
-then
- optional_depends JACK-DRIVER \
- "-DWANT_JACK=1" \
- "-DWANT_JACK=0" \
- "for JACK audio support" &&
-
- optional_depends ladspa \
- "" \
- "" \
- "for LADSPA plugin support" &&
-
- optional_depends dssi \
- "-DWANT_DSSI=1" \
- "-DWANT_DSSI=0" \
- "for DSSI plugin support" &&
-
- optional_depends liblo \
- "" \
- "" \
- "for audio plugin custom GUI support" &&
-
- optional_depends liblrdf \
- "" \
- "" \
- "for audio plugin metadata support"
-fi &&
-
+depends FFTW &&
+depends -sub CXX gcc &&
+depends libxt &&
+depends -sub QT3 qt4 &&
+depends alsa-lib &&
+depends JACK-DRIVER &&
+depends ladspa &&
+depends dssi &&
+depends liblo &&
+depends liblrdf &&
optional_depends libxft \
"" \
"" \
"for better score rendering quality" &&

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 b68f216..0702bae 100755
--- a/audio-creation/rosegarden/DETAILS
+++ b/audio-creation/rosegarden/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.7.2
+ VERSION=11.06
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7a05d84a654ed6a9329941cc405e7e0ad567cdda83ae0f201ca435a6178fe46f8d0db31fa3a20ee6c88434364de0604b78c9c29ff75e0c89eaad4be8810ed614
+
SOURCE_HASH=sha512:cbfbfa0e0c46b75a5826ebd3b77ebc14196e7dc611de10c6388fbe1477bb6bba9ef17d08e62871fb97ebcf7ded74534564804cbedb25c24d7bfed179f0538905
fi
WEB_SITE=http://www.rosegardenmusic.com/
ENTERED=20020514
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index 7fb84ab..57a255f 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,9 @@
+2011-10-04 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 11.06
+ * DEPENDS: kdelibs is not needed and removed unneeded deps
+ * PRE_BUILD: added to make it find qt4
+ * INSTALL: removed, no longer needed
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-creation/rosegarden/INSTALL
b/audio-creation/rosegarden/INSTALL
deleted file mode 100755
index 965fd47..0000000
--- a/audio-creation/rosegarden/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install DESTDIR="$INSTALL_ROOT"
diff --git a/audio-creation/rosegarden/PRE_BUILD
b/audio-creation/rosegarden/PRE_BUILD
new file mode 100755
index 0000000..c1d0332
--- /dev/null
+++ b/audio-creation/rosegarden/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#QTDIR/bin#QTDIR/bin/qt4#g' configure

[SM-Commit] GIT changes to master grimoire by Arjan Bouter (65bcf1e2f78d33faa344cbe331e4fda878e9b8e0), Arjan Bouter, 10/04/2011