sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6899eeb95034e4a80b1798054e2eb323ba5276e5)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6899eeb95034e4a80b1798054e2eb323ba5276e5)
Date: Sat, 21 Jun 2014 15:24:12 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-creation/ardour3/BUILD | 6 +++-
audio-creation/ardour3/DEPENDS | 5 +++
audio-creation/ardour3/DETAILS | 7 +++--
audio-creation/ardour3/HISTORY | 6 ++++
audio-libs/liblo/HISTORY | 5 +++
audio-libs/liblo/PRE_BUILD | 6 ++++
audio-libs/liblo/pre-gcc48.patch | 50
+++++++++++++++++++++++++++++++++++++++
7 files changed, 80 insertions(+), 5 deletions(-)

New commits:
commit 6899eeb95034e4a80b1798054e2eb323ba5276e5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ardour3: => 3.5.380

commit 6b2bbfffc7e919465ac702e5688b62c448691530
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

liblo: added gcc pre-4.8 support

diff --git a/audio-creation/ardour3/BUILD b/audio-creation/ardour3/BUILD
index 33dd493..cda691f 100755
--- a/audio-creation/ardour3/BUILD
+++ b/audio-creation/ardour3/BUILD
@@ -1,4 +1,6 @@
-OPTS="--configdir=$INSTALL_ROOT/etc $OPTS" &&
-OPTS="--noconfirm --freedesktop $ARDOUR3_OPTS $OPTS" &&
+OPTS="--noconfirm \
+ --configdir=$INSTALL_ROOT/etc \
+ $ARDOUR3_OPTS \
+ $OPTS" &&

waf_build
diff --git a/audio-creation/ardour3/DEPENDS b/audio-creation/ardour3/DEPENDS
index 8b79dde..0262163 100755
--- a/audio-creation/ardour3/DEPENDS
+++ b/audio-creation/ardour3/DEPENDS
@@ -40,6 +40,11 @@ if is_depends_enabled $SPELL lv2; then
depends suil-0
fi &&

+optional_depends shared-mime-info \
+ "--freedesktop" \
+ "" \
+ "to build documentation" &&
+
optional_depends doxygen \
"--docs" \
"" \
diff --git a/audio-creation/ardour3/DETAILS b/audio-creation/ardour3/DETAILS
index 1c393d7..7f95a36 100755
--- a/audio-creation/ardour3/DETAILS
+++ b/audio-creation/ardour3/DETAILS
@@ -1,9 +1,10 @@
SPELL=ardour3
SPELLX=Ardour3
- VERSION=3.5.357
+ VERSION=3.5.380
SOURCE="${SPELLX}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=ftp://ftp.archlinux.org/other/ardour/$SPELLX-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:90a310d10b2bc56cb2acc7fbcea2bfb4d1e49052cd9cbf26d5a5d4efe8786b868e20ef679f07f186547ff281364eeb90e03587f6d86ea3551123f0bafdbb3623
+ SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/${SOURCE}
+ SOURCE_URL[1]=http://sourcemage.ru/mirror/$SOURCE
+
SOURCE_HASH=sha512:a53b4e3e6201367f1d82bab53b4cf38d3d0466c80cbbafc062c23b7bf19d0c572d859dfc3e1f75845a62d1bc0387504ed94e3887c82b730b98ec8c3f5cb71c87
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="http://ardour.org";
LICENSE[0]=GPLv2
diff --git a/audio-creation/ardour3/HISTORY b/audio-creation/ardour3/HISTORY
index 671326d..7306581 100644
--- a/audio-creation/ardour3/HISTORY
+++ b/audio-creation/ardour3/HISTORY
@@ -1,3 +1,9 @@
+2014-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.5.380; switched back to sourcemage url;
+ added 2nd mirror
+ * BUILD: merge OPTS
+ * DEPENDS: made --freedesktop optional
+
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.5.357
* BUILD: add --configdir and --freedesktop to OPTS
diff --git a/audio-libs/liblo/HISTORY b/audio-libs/liblo/HISTORY
index 06b3d34..a4e0e14 100644
--- a/audio-libs/liblo/HISTORY
+++ b/audio-libs/liblo/HISTORY
@@ -1,3 +1,8 @@
+2014-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * pre-gcc48.patch: added, to fix build with compilers with full C++11
+ support
+
2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.28

diff --git a/audio-libs/liblo/PRE_BUILD b/audio-libs/liblo/PRE_BUILD
new file mode 100755
index 0000000..d3ef378
--- /dev/null
+++ b/audio-libs/liblo/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8.0; then
+ patch -p0 < "$SPELL_DIRECTORY/pre-gcc48.patch"
+fi
diff --git a/audio-libs/liblo/pre-gcc48.patch
b/audio-libs/liblo/pre-gcc48.patch
new file mode 100644
index 0000000..961ecb0
--- /dev/null
+++ b/audio-libs/liblo/pre-gcc48.patch
@@ -0,0 +1,50 @@
+--- lo/lo_cpp.h.orig 2014-01-27 21:30:49.000000000 +0400
++++ lo/lo_cpp.h 2014-06-21 22:48:04.546899637 +0400
+@@ -426,19 +426,22 @@
+ }
+ }
+
+- Server(const num_string_type &port, lo_err_handler err_h=0)
+- : Server(lo_server_new(port, err_h)) {}
++ Server(const num_string_type &port, lo_err_handler err_h=0) {
++ server = lo_server_new(port, err_h);
++ }
+
+- Server(const num_string_type &port, int proto, lo_err_handler
err_h=0)
+- : Server(lo_server_new_with_proto(port, proto, err_h)) {}
++ Server(const num_string_type &port, int proto, lo_err_handler
err_h=0) {
++ server = lo_server_new_with_proto(port, proto, err_h);
++ }
+
+ Server(const string_type &group, const num_string_type &port,
+- const string_type &iface="", const string_type &ip="",
lo_err_handler err_h=0)
+- : Server((iface._s || ip._s)
+- ? lo_server_new_multicast_iface(group, port,
+- iface._s?:0,
+- ip._s?:0, err_h)
+- : lo_server_new_multicast(group, port, err_h)) {}
++ const string_type &iface="", const string_type &ip="",
lo_err_handler err_h=0) {
++ if (iface._s || ip._s) {
++ server = lo_server_new_multicast_iface(group, port,
iface._s?:0, ip._s?:0, err_h);
++ } else {
++ server = lo_server_new_multicast(group, port, err_h);
++ }
++ }
+
+ virtual ~Server()
+ { if (server) lo_server_free(server); }
+@@ -734,8 +737,12 @@
+ }
+ }
+
+- Bundle(const Bundle &b)
+- : Bundle((lo_bundle)b) {}
++ Bundle(const Bundle &b) {
++ lo_bundle newb = (lo_bundle)b;
++ bundle = newb;
++ if (newb)
++ lo_bundle_incref(newb);
++ }
+
+ ~Bundle()
+ { if (bundle) lo_bundle_free_recursive(bundle); }

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6899eeb95034e4a80b1798054e2eb323ba5276e5), Vlad Glagolev, 06/21/2014