Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6961907daffbb79d6b59226342d7ad1070993c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6961907daffbb79d6b59226342d7ad1070993c2)
  • Date: Sun, 16 Jul 2006 07:42:12 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-creation/rosegarden/BUILD | 9
++
audio-creation/rosegarden/CONFIGURE | 38
----------
audio-creation/rosegarden/DEPENDS | 20
++++-
audio-creation/rosegarden/HISTORY | 11
++
audio-creation/rosegarden/INSTALL | 1
dev/null |binary
devel/eclipse-cdt-sdk/org.eclipse.cdt.sdk-3.0.0-linux.x86.tar.gz.sig | 0
7 files changed, 39 insertions(+), 40 deletions(-)

New commits:
commit b6961907daffbb79d6b59226342d7ad1070993c2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert eclipse 3.2 updates (can't get it to compile)

commit 207986ee67a8c4dfae062f9e6d5461e7499fc422
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Fix rosegarden Bug #11862

commit 08076182f2d54d46f5881357406d25bdfdda121f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert the multiple commits for fixing Bug #11862

commit 74a19cb78214a5e585793e4749477e0d5a460bfa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

missed adding BUILD and INSTALL for Bug #11862

commit be24a98a1b8fa8a5556a5fd903beabc3d38a8284
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rosegarden depends on scons now

commit b8cbffaf9998781edcc0babcbebda7e00e5cc345
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Hopefully fix rosegarden (Bug #11862)

commit 1c12b15dee4e6d98bffc6146af5883d4a892c150
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

git didn't commit the deletion

commit ff27243d8b30bfb8c88621b775cc82c31c0190de
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated eclipse-cdt-sdk to 3.1.0 for eclipse 3.2

commit 1928c1cd5ab9f06f7519cb5e1c459ebdcf51894c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated eclipse-cdt to 3.1.0 for eclipse 3.2

commit dd57ae4fbf71c946b2b4d4e78686e3ab78694495
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Fixed eclipse BUILD to specify java5 home

commit 57b19065d99fc74ac6451d719c593a623af829bb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Updated eclipse to 3.2

diff --git a/audio-creation/rosegarden/BUILD b/audio-creation/rosegarden/BUILD
new file mode 100755
index 0000000..5e97fbd
--- /dev/null
+++ b/audio-creation/rosegarden/BUILD
@@ -0,0 +1,9 @@
+OPTS="$ROSEGARDEN_ALSA \
+ $ROSEGARDEN_DSSI \
+ $ROSEGARDEN_LIRC" &&
+
+scons configure prefix=${INSTALL_ROOT}/usr \
+datadir=${INSTALL_ROOT}/usr/share \
+qtincludes=/usr/include/qt \
+$OPTS &&
+scons
diff --git a/audio-creation/rosegarden/CONFIGURE
b/audio-creation/rosegarden/CONFIGURE
index b17885f..0d25a57 100755
--- a/audio-creation/rosegarden/CONFIGURE
+++ b/audio-creation/rosegarden/CONFIGURE
@@ -1,36 +1,2 @@
-if ! grep -q "CONFIGURED" ${SPELL_CONFIG}
-then
-
- if query "Enable Xinerama support?" n
- then echo 'OPTS="${OPTS} --with-xinerama"' >> ${SPELL_CONFIG}
- else echo 'OPTS="${OPTS} --without-xinerama"' >> ${SPELL_CONFIG}
- fi &&
-
- if query "Enable LADSPA plugin?" y
- then depends ladspa &&
- echo 'OPTS="${OPTS} --with-ladspa"' >> ${SPELL_CONFIG}
- if query "Enable liblrdf metadata for LADSPA?" y
- then depends liblrdf &&
- echo 'OPTS="${OPTS} --with-liblrdf"' >> ${SPELL_CONFIG}
- else echo 'OPTS="${OPTS} --without-liblrdf"' >> ${SPELL_CONFIG}
- fi
- else echo 'OPTS="${OPTS} --without-ladspa --without-liblrdf"' \
- >> ${SPELL_CONFIG}
- fi &&
-
- if query "Enable aRTS support (at the cost of ALSA)?" n
- then depends arts &&
- echo 'OPTS="${OPTS} --with-arts"' >> ${SPELL_CONFIG}
- else echo 'OPTS="${OPTS} --without-arts"' >> ${SPELL_CONFIG} &&
- if query "Enable ALSA support?" y
- then depends alsa-lib &&
- echo 'OPTS="${OPTS} --with-alsa=yes"' >> ${SPELL_CONFIG}
- # Disabling ALSA doesn't actually work if ALSA is installed
- # The configure script pretty much does what it wants
- else echo 'OPTS="${OPTS} --with-alsa=no --disable-alsatest"' \
- >> ${SPELL_CONFIG}
- fi
- fi &&
-
- echo "CONFIGURED='y'" >> ${SPELL_CONFIG}
-fi
+config_query_option ROSEGARDEN_DSSI "Enable DSSI support?" y \
+ "" "nodssi=1"
diff --git a/audio-creation/rosegarden/DEPENDS
b/audio-creation/rosegarden/DEPENDS
index 635dd9b..e25ceba 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,6 +1,18 @@
-depends qt-x11 &&
+depends scons &&
depends kdelibs &&
+depends qt-x11 &&
+
+optional_depends JACK-DRIVER \
+ "" \
+ "nojack=1" \
+ "for JACK audio support" &&
+
+optional_depends alsa-lib \
+ "" \
+ "noalsa=1" \
+ "for ALSA support" &&

-optional_depends JACK-DRIVER "--with-jack" \
- "--without-jack" \
- "for JACK audio support"
+optional_depends lirc \
+ "" \
+ "nolirc=1" \
+ "for lirc support?"
diff --git a/audio-creation/rosegarden/HISTORY
b/audio-creation/rosegarden/HISTORY
index c55ba97..80003d5 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,14 @@
+2006-07-16 Eric Sandall <eric AT sandall.us>
+ * Applied Harry Broeken's fixes for Bug #11862
+ * CONFIGURE: Converted to config_query
+ Removed queries for ALSA and lirc (moved to DEPENDS)
+ * DEPENDS: Optionally depend on alsa-lib and lirc (moved from DEPENDS)
+ Needs to depend on scons now
+ * BUILD: Add options from CONFIGURE to $OPTS
+
+2006-05-16 Harry Broeken <harry.broeken AT home.nl>
+ * trying to rewrite the spell to use the scons build system
+
2006-04-30 Unet <unet AT sourcemage.org>
* DETAILS: Updated to 4-1.2.3

diff --git a/audio-creation/rosegarden/INSTALL
b/audio-creation/rosegarden/INSTALL
new file mode 100755
index 0000000..babc987
--- /dev/null
+++ b/audio-creation/rosegarden/INSTALL
@@ -0,0 +1 @@
+scons install
\ No newline at end of file
diff --git
a/devel/eclipse-cdt-sdk/org.eclipse.cdt.sdk-3.0.0-linux.x86.tar.gz.sig
b/devel/eclipse-cdt-sdk/org.eclipse.cdt.sdk-3.0.0-linux.x86.tar.gz.sig
deleted file mode 100644
index 3fc3fd7..0000000
Binary files
a/devel/eclipse-cdt-sdk/org.eclipse.cdt.sdk-3.0.0-linux.x86.tar.gz.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (b6961907daffbb79d6b59226342d7ad1070993c2), Eric Sandall, 07/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page