Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b6edf455532f6c87292577f18283462144cb514e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (b6edf455532f6c87292577f18283462144cb514e)
  • Date: Fri, 7 Nov 2014 08:50:30 -0600

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

ChangeLog | 5 ++++
audio-soft/patchage/BUILD | 7 +-----
audio-soft/patchage/CONFIGURE | 3 ++
audio-soft/patchage/DEPENDS | 48
++++++++++++++++++------------------------
audio-soft/patchage/DETAILS | 21 ++++++++----------
audio-soft/patchage/HISTORY | 13 +++++++++++
audio-soft/patchage/INSTALL | 1
audio-soft/patchage/PRE_BUILD | 8 -------
dave_robillard.gpg |binary
libs/ganv/BUILD | 3 ++
libs/ganv/CONFIGURE | 3 ++
libs/ganv/DEPENDS | 16 ++++++++++++++
libs/ganv/DETAILS | 23 ++++++++++++++++++++
libs/ganv/HISTORY | 3 ++
libs/ganv/INSTALL | 1
libs/ganv/PRE_BUILD | 4 +++
libs/ganv/canvas.patch | 40 +++++++++++++++++++++++++++++++++++
17 files changed, 148 insertions(+), 51 deletions(-)

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

patchage: => 1.0.0

commit 2d55f9b541a89f9d2f634db6355237732e2a7bb8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ganv: new spell, interactive Gtkmm canvas widget for graph-based
interfaces

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

dave_robillard.gpg: updated keyring, added 7364C240 and 9BF368F3 keys

diff --git a/ChangeLog b/ChangeLog
index 44d0ca7..585f961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * dave_robillard.gpg: updated keyring, added 7364C240 and 9BF368F3
keys
+ * libs/ganv: new spell, interactive Gtkmm canvas widget for
graph-based
+ interfaces
+
2014-11-04 Ismael Luceno <ismael AT sourcemage.org>
* python-pypi/box2d: new spell, 2D physics library for Python

diff --git a/audio-soft/patchage/BUILD b/audio-soft/patchage/BUILD
index 13889e6..417ef54 100755
--- a/audio-soft/patchage/BUILD
+++ b/audio-soft/patchage/BUILD
@@ -1,6 +1,3 @@
-if [[ $PATCHAGE_VCS == y ]]
-then
- cd "$SOURCE_DIRECTORY/patchage"
-fi &&
+OPTS="$PATCHAGE_OPTS $OPTS" &&

-default_build
+waf_build
diff --git a/audio-soft/patchage/CONFIGURE b/audio-soft/patchage/CONFIGURE
new file mode 100755
index 0000000..28f4146
--- /dev/null
+++ b/audio-soft/patchage/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option PATCHAGE_OPTS "Include experimental JACK session
management (save/restore) support?" n \
+ "--jack-session-manage" \
+ ""
diff --git a/audio-soft/patchage/DEPENDS b/audio-soft/patchage/DEPENDS
index 6f2eaaf..7257a11 100755
--- a/audio-soft/patchage/DEPENDS
+++ b/audio-soft/patchage/DEPENDS
@@ -1,33 +1,27 @@
-depends -sub CXX gcc &&
-depends boost &&
-depends libglademm &&
-depends raul &&
-depends flowcanvas &&
-depends alsa-lib &&
+# required for waf
+depends PYTHON &&
+depends -sub CXX gcc &&
+depends boost &&
+depends glib2 &&
+depends glibmm &&
+depends gtkmm2 &&
+depends ganv &&

-if [[ $PATCHAGE_VCS == y ]]
-then
- depends libtool &&
- depends automake &&
- depends autoconf
-fi &&
+optional_depends alsa-lib "" "--no-alsa" "for ALSA sequencer support" &&

-message "${MESSAGE_COLOR}The D-Bus interface requires" \
- "a development version of JACK.$DEFAULT_COLOR" &&
+message "${MESSAGE_COLOR}NOTICE: The D-Bus interface requires
JACK2.${DEFAULT_COLOR}" &&

-optional_depends dbus \
- "--enable-jack-dbus" \
- "--disable-jack-dbus" \
- "to use a D-Bus interface for controlling JACK" &&
+optional_depends dbus "--jack-dbus" "" "to use a D-Bus interface for
controlling JACK" &&

-if is_depends_enabled $SPELL dbus
-then
- depends -sub DBUS jack2
+if is_depends_enabled $SPELL dbus; then
+ depends dbus-glib &&
+ depends -sub DBUS jack2
else
- depends JACK-DRIVER
-fi &&
+ depends JACK-DRIVER
+fi &&

-optional_depends lash \
- "--enable-lash" \
- "--disable-lash" \
- "for audio session handling support"
+optional_depends doxygen "--docs" "" "to build documentation" &&
+
+if is_depends_enabled $SPELL doxygen; then
+ depends graphviz
+fi
diff --git a/audio-soft/patchage/DETAILS b/audio-soft/patchage/DETAILS
index d4ef47a..f00e517 100755
--- a/audio-soft/patchage/DETAILS
+++ b/audio-soft/patchage/DETAILS
@@ -7,27 +7,26 @@ then
else
VERSION=svn
fi
- SOURCE=drobilla_lad-$VERSION.tar.bz2
- SOURCE_URL[0]=svn_http://svn.drobilla.net/lad:lad
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=svn_http://svn.drobilla.net/lad/trunk/patchage:patchage
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/drobilla_lad-$VERSION"
else
- VERSION=0.4.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.0.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.drobilla.net/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
- WEB_SITE=http://wiki.drobilla.net/Patchage
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://drobilla.net/software/patchage/
ENTERED=20080319
LICENSE[0]=GPL
- KEYWORDS="alsa jack lash tools audio"
- SHORT="A modular patch bay for audio and MIDI systems"
+ KEYWORDS="alsa jack tools audio"
+ SHORT="modular patch bay for audio and MIDI systems"
cat << EOF
-Patchage is a modular patch bay for audio and MIDI systems based on
-JACK, LASH, and ALSA audio systems.
+Patchage is a modular patch bay for audio and MIDI systems based on JACK and
+ALSA audio systems.
EOF
diff --git a/audio-soft/patchage/HISTORY b/audio-soft/patchage/HISTORY
index cd2ca46..e2035c6 100644
--- a/audio-soft/patchage/HISTORY
+++ b/audio-soft/patchage/HISTORY
@@ -1,3 +1,16 @@
+2014-11-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.0; updated source url and renamed
source
+ for VCS branch; updated website, descriptions, keywords
+ * BUILD: use PATCHAGE_OPTS, waf_build()
+ * DEPENDS: rewritten: added PYTHON for waf script; replaced raul and
+ flowcanvas with ganv; autotools aren't needed for VCS branch;
alsa-lib
+ becomes optional; adapted dbus flags; added missing glib2, glibmm,
+ gtkmm2, dbus-glib deps; added optional doxygen, graphviz deps;
removed
+ lash (dropped by upstream); updated JACK2 notice; cleaned up
+ * INSTALL: added, for waf_install()
+ * CONFIGURE: added, for configure options
+ * PRE_BUILD: dropped
+
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-soft/patchage/INSTALL b/audio-soft/patchage/INSTALL
new file mode 100755
index 0000000..0ea15cc
--- /dev/null
+++ b/audio-soft/patchage/INSTALL
@@ -0,0 +1 @@
+waf_install
diff --git a/audio-soft/patchage/PRE_BUILD b/audio-soft/patchage/PRE_BUILD
deleted file mode 100755
index 9071c97..0000000
--- a/audio-soft/patchage/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $PATCHAGE_VCS == y ]]
-then
- cd patchage &&
- ./autogen.sh
-fi
diff --git a/dave_robillard.gpg b/dave_robillard.gpg
index c9985f7..b53088b 100644
Binary files a/dave_robillard.gpg and b/dave_robillard.gpg differ
diff --git a/libs/ganv/BUILD b/libs/ganv/BUILD
new file mode 100755
index 0000000..9c6c9b6
--- /dev/null
+++ b/libs/ganv/BUILD
@@ -0,0 +1,3 @@
+OPTS="$GANV_OPTS $OPTS" &&
+
+waf_build
diff --git a/libs/ganv/CONFIGURE b/libs/ganv/CONFIGURE
new file mode 100755
index 0000000..5f93935
--- /dev/null
+++ b/libs/ganv/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option GANV_OPTS "Use experimental force-directed graph
layout?" y \
+ "" \
+ "--no-fdgl"
diff --git a/libs/ganv/DEPENDS b/libs/ganv/DEPENDS
new file mode 100755
index 0000000..796084e
--- /dev/null
+++ b/libs/ganv/DEPENDS
@@ -0,0 +1,16 @@
+# required for waf
+depends PYTHON &&
+depends -sub CXX gcc &&
+depends pkgconfig &&
+depends gtk+2 &&
+depends gtkmm2 &&
+
+optional_depends gettext "" "--no-nls" "for i18n (native language support)"
&&
+optional_depends gobject-introspection "--gir" "" "to build Gobject
introspection data" &&
+optional_depends doxygen "--docs" "" "to build documentation" &&
+
+if is_depends_enabled $SPELL doxygen; then
+ depends graphviz
+else
+ optional_depends graphviz "" "--no-graphviz" "for Graphviz support"
+fi
diff --git a/libs/ganv/DETAILS b/libs/ganv/DETAILS
new file mode 100755
index 0000000..f4439a6
--- /dev/null
+++ b/libs/ganv/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=ganv
+ VERSION=1.4.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://download.drobilla.net/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://drobilla.net/software/ganv/
+ ENTERED=20141107
+ LICENSE[0]=GPL
+ SHORT="interactive Gtkmm canvas widget for graph-based interfaces"
+cat << EOF
+Ganv is an interactive Gtk canvas widget for graph-based interfaces
(patchers,
+modular synthesizers, finite state automata, interactive graphs, etc).
+
+Ganv provides classes for "Modules" (boxes with "Ports"), Circles, and
+Edges (lines that connect either Ports or Circles). The user can rearrange
+items, or Ganv can automatically arrange items using GraphViz. Edges can be
made
+by the user one at a time with the mouse, or in groups using the mouse and
+keyboard.
+EOF
diff --git a/libs/ganv/HISTORY b/libs/ganv/HISTORY
new file mode 100644
index 0000000..46b2bd4
--- /dev/null
+++ b/libs/ganv/HISTORY
@@ -0,0 +1,3 @@
+2014-11-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFIGURE, canvas.patch:
+ spell created, version 1.4.2
diff --git a/libs/ganv/INSTALL b/libs/ganv/INSTALL
new file mode 100755
index 0000000..0ea15cc
--- /dev/null
+++ b/libs/ganv/INSTALL
@@ -0,0 +1 @@
+waf_install
diff --git a/libs/ganv/PRE_BUILD b/libs/ganv/PRE_BUILD
new file mode 100755
index 0000000..b3a66ec
--- /dev/null
+++ b/libs/ganv/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/canvas.patch"
diff --git a/libs/ganv/canvas.patch b/libs/ganv/canvas.patch
new file mode 100644
index 0000000..3633634
--- /dev/null
+++ b/libs/ganv/canvas.patch
@@ -0,0 +1,40 @@
+--- src/Canvas.cpp.orig 2014-07-13 22:45:07.000000000 +0300
++++ src/Canvas.cpp 2014-11-07 14:43:16.341865183 +0300
+@@ -760,6 +760,18 @@
+ }
+ #endif
+
++inline uint64_t
++get_monotonic_time()
++{
++#if GLIB_CHECK_VERSION(2, 28, 0)
++ return g_get_monotonic_time();
++#else
++ GTimeVal time;
++ g_get_current_time(&time);
++ return time.tv_sec + time.tv_usec;
++#endif
++}
++
+ #ifdef GANV_FDGL
+
+ inline Region
+@@ -788,18 +800,6 @@
+ b->impl->force = vec_sub(b->impl->force, f);
+ }
+
+-inline uint64_t
+-get_monotonic_time()
+-{
+-#if GLIB_CHECK_VERSION(2, 28, 0)
+- return g_get_monotonic_time();
+-#else
+- GTimeVal time;
+- g_get_current_time(&time);
+- return time.tv_sec + time.tv_usec;
+-#endif
+-}
+-
+ gboolean
+ GanvCanvasImpl::layout_iteration()
+ {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b6edf455532f6c87292577f18283462144cb514e), Vlad Glagolev, 11/07/2014

Archive powered by MHonArc 2.6.24.

Top of Page