Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f345f2484f767b649697f525ae2db13fb4ea0f36)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (f345f2484f767b649697f525ae2db13fb4ea0f36)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f345f2484f767b649697f525ae2db13fb4ea0f36)
  • Date: Wed, 19 Mar 2014 17:41:00 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3
audio-drivers/jack2/BUILD | 4
audio-drivers/jack2/DEPENDS | 5
audio-drivers/jack2/HISTORY | 4
audio-plugins/blop/DETAILS | 2
audio-plugins/blop/HISTORY | 3
audio-plugins/cmt/0001-honour-external-FLAGS.patch | 27 ++++
audio-plugins/cmt/BUILD | 2
audio-plugins/cmt/HISTORY | 4
audio-plugins/cmt/PRE_BUILD | 5
audio-soft/alsa-patch-bay/0001-fix-missing-includes.patch | 79
++++++++++++++
audio-soft/alsa-patch-bay/BUILD | 2
audio-soft/alsa-patch-bay/HISTORY | 4
audio-soft/alsa-patch-bay/PRE_BUILD | 2
audio-soft/qjackctl/BUILD | 5
audio-soft/qjackctl/DETAILS | 6 -
audio-soft/qjackctl/HISTORY | 4
dave_robillard.gpg |binary
dev/null |binary
gnome2-libs/gsettings-desktop-schemas/DETAILS | 7 -
gnome2-libs/gsettings-desktop-schemas/HISTORY | 3
21 files changed, 157 insertions(+), 14 deletions(-)

New commits:
commit f345f2484f767b649697f525ae2db13fb4ea0f36
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-soft/alsa-patch-bay: fix build errors

commit 477b59c4c41412d00a2b4cb35a79f8bf7f3d01ec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

dave_robillard.gpg: add key 29727060

commit 92b5261ec09832d6919099b829bcfa0263a64733
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnome2-libs/gsettings-desktop-schemas: version 3.11.5

commit 9721414b9df4acc6b952346575a02fead16a505c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/jack2: add dependency on dbus-python

commit e68cdd332247a32e93b8092da4100a88ad328aaf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-soft/qjackctl: version 0.3.11

commit 828adc04cbcbf7a7ee0c6c0e8aff0c7339b45dbf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/jack2: fix build error due to incompatibility with waf_build

commit b0f644fad3a73794aaf650118c6db79a6085e451
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-plugins/cmt: honour our CFLAGS/CXXFLAGS

commit 8daf4933104079bb73b606c7a655e5dda11b1890
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-plugins/blop: fix SOURCE_URL[0]

diff --git a/ChangeLog b/ChangeLog
index cb2f1b9..1be839f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * dave_robillard.gpg: add key 29727060
+
2014-03-19 Thomas Orgis <sobukus AT sourcemage.org>
* video/avidemux3: new spell, version 3 of the video editor

diff --git a/audio-drivers/jack2/BUILD b/audio-drivers/jack2/BUILD
index 1340246..4f94490 100755
--- a/audio-drivers/jack2/BUILD
+++ b/audio-drivers/jack2/BUILD
@@ -1,3 +1,3 @@
OPTS="--enable-pkg-config-dbus-service-dir $OPTS" &&
-
-waf_build
+./waf configure --nocache --prefix=${INSTALL_ROOT}/usr $OPTS &&
+./waf build
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index 6c4f58f..d3a94f7 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -26,4 +26,7 @@ optional_depends doxygen \
optional_depends dbus \
"--dbus" \
"--classic" \
- "to enable the D-Bus control interface (instead of classic
jackd!)"
+ "to enable the D-Bus control interface (instead of classic
jackd!)" &&
+if is_depends_enabled $SPELL dbus; then
+ depends dbus-python
+fi
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 9610118..4e89474 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: fix build error due to incompatibility with waf_build
+ * DEPENDS: add dependency on dbus-python
+
2014-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: use official url instead of dropbox
* BUILD, INSTALL: switch to waf_build/waf_install functions
diff --git a/audio-plugins/blop/DETAILS b/audio-plugins/blop/DETAILS
index 06b5b9c..5b03aa8 100755
--- a/audio-plugins/blop/DETAILS
+++ b/audio-plugins/blop/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.2.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/${VERSION%.*}/$SOURCE
WEB_SITE=http://blop.sf.net
ENTERED=20060725

SOURCE_HASH=sha512:5a1bb2e4ba976dd87f8b34538b3a8d2ed21ba0b8818d4b0a713061aeeae7fd52377477314a758cc7082a932315be8ec99006dfc3f5c9712d8d566852adbf671f
diff --git a/audio-plugins/blop/HISTORY b/audio-plugins/blop/HISTORY
index 35802ff..2cf1c86 100644
--- a/audio-plugins/blop/HISTORY
+++ b/audio-plugins/blop/HISTORY
@@ -1,3 +1,6 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
2007-02-16 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Edited long description.

diff --git a/audio-plugins/cmt/0001-honour-external-FLAGS.patch
b/audio-plugins/cmt/0001-honour-external-FLAGS.patch
new file mode 100644
index 0000000..9e2cd77
--- /dev/null
+++ b/audio-plugins/cmt/0001-honour-external-FLAGS.patch
@@ -0,0 +1,27 @@
+From 3f6879b463d1bdc352375d88a712965e01837cab Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 19 Mar 2014 15:59:31 +0000
+Subject: [PATCH] honour external FLAGS
+
+---
+ src/makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/makefile b/src/makefile
+index 8a0f795..6194e62 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -11,8 +11,8 @@ INSTALL_PLUGINS_DIR = /usr/lib/ladspa/
+ # GENERAL
+ #
+
+-CFLAGS = $(INCLUDES) -Wall -O3 -fPIC
+-CXXFLAGS = $(CFLAGS)
++CFLAGS += $(INCLUDES)
++CXXFLAGS += $(CFLAGS)
+ PLUGIN_LIB = ../plugins/cmt.so
+
+
###############################################################################
+--
+1.9.0
+
diff --git a/audio-plugins/cmt/BUILD b/audio-plugins/cmt/BUILD
index ad2d0e9..f6ab04a 100755
--- a/audio-plugins/cmt/BUILD
+++ b/audio-plugins/cmt/BUILD
@@ -1,2 +1,2 @@
cd src &&
-make
+default_build_make
diff --git a/audio-plugins/cmt/HISTORY b/audio-plugins/cmt/HISTORY
index 0b331e3..76ffdb1 100644
--- a/audio-plugins/cmt/HISTORY
+++ b/audio-plugins/cmt/HISTORY
@@ -1,3 +1,7 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use default_build_make
+ * PRE_BUILD, 0001-honour-external-FLAGS.patch: honour our
CFLAGS/CXXFLAGS
+
2007-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.16.
* PRE_BUILD: Updated sedits.
diff --git a/audio-plugins/cmt/PRE_BUILD b/audio-plugins/cmt/PRE_BUILD
index 9c603ee..2506409 100755
--- a/audio-plugins/cmt/PRE_BUILD
+++ b/audio-plugins/cmt/PRE_BUILD
@@ -1,4 +1,9 @@
default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+# honour CFLAGS/CXXFLAGS set by us
+patch -p1 < $SPELL_DIRECTORY/0001-honour-external-FLAGS.patch
+
cd "$SOURCE_DIRECTORY/src" &&

# Fix install path
diff --git a/audio-soft/alsa-patch-bay/0001-fix-missing-includes.patch
b/audio-soft/alsa-patch-bay/0001-fix-missing-includes.patch
new file mode 100644
index 0000000..39eee53
--- /dev/null
+++ b/audio-soft/alsa-patch-bay/0001-fix-missing-includes.patch
@@ -0,0 +1,79 @@
+From b917c0feb9aae8d71a80edbf0bf3b653147386f7 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 19 Mar 2014 22:33:21 +0000
+Subject: [PATCH] fix missing includes
+
+---
+ src/driver.cpp | 1 +
+ src/driver/jack/jack-addr.cpp | 3 +++
+ src/driver/jack/jack-driver.cpp | 2 ++
+ src/misc.cpp | 1 +
+ src/plugins.cpp | 1 +
+ 5 files changed, 8 insertions(+)
+
+diff --git a/src/driver.cpp b/src/driver.cpp
+index 8bfecf7..3197584 100644
+--- a/src/driver.cpp
++++ b/src/driver.cpp
+@@ -15,6 +15,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <fcntl.h>
++#include <cstdlib>
+
+ #include "driver.h"
+
+diff --git a/src/driver/jack/jack-addr.cpp b/src/driver/jack/jack-addr.cpp
+index 8c25f84..10b842a 100644
+--- a/src/driver/jack/jack-addr.cpp
++++ b/src/driver/jack/jack-addr.cpp
+@@ -13,6 +13,9 @@
+
+ #include "jack-addr.h"
+
++#include <cstring>
++#include <cstdlib>
++
+ namespace APB {
+ namespace Jack {
+
+diff --git a/src/driver/jack/jack-driver.cpp
b/src/driver/jack/jack-driver.cpp
+index b12467d..4e93713 100644
+--- a/src/driver/jack/jack-driver.cpp
++++ b/src/driver/jack/jack-driver.cpp
+@@ -18,6 +18,8 @@
+ #include "misc.h"
+ #include "plugin.h"
+ #include "ui.h"
++#include <cstring>
++#include <cstdlib>
+
+ namespace APB {
+ namespace Jack {
+diff --git a/src/misc.cpp b/src/misc.cpp
+index 2347303..86e2ccc 100644
+--- a/src/misc.cpp
++++ b/src/misc.cpp
+@@ -12,6 +12,7 @@
+ #include <sstream>
+
+ #include "misc.h"
++#include <cstdlib>
+
+ namespace APB {
+
+diff --git a/src/plugins.cpp b/src/plugins.cpp
+index ff12e15..c7f3766 100644
+--- a/src/plugins.cpp
++++ b/src/plugins.cpp
+@@ -18,6 +18,7 @@
+ #include <iostream>
+ #include <list>
+ #include <string>
++#include <cstdlib>
+
+ #include "plugin.h"
+ #include "plugins.h"
+--
+1.9.0
+
diff --git a/audio-soft/alsa-patch-bay/BUILD b/audio-soft/alsa-patch-bay/BUILD
new file mode 100755
index 0000000..83c3fac
--- /dev/null
+++ b/audio-soft/alsa-patch-bay/BUILD
@@ -0,0 +1,2 @@
+CXXFLAGS+=" -fpermissive" &&
+default_build
diff --git a/audio-soft/alsa-patch-bay/HISTORY
b/audio-soft/alsa-patch-bay/HISTORY
index 61bf6c5..f5232c0 100644
--- a/audio-soft/alsa-patch-bay/HISTORY
+++ b/audio-soft/alsa-patch-bay/HISTORY
@@ -1,3 +1,7 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD, 0001-fix-missing-includes.patch:
+ fix build errors
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 19C57B14.gpg: added gpg keyring
diff --git a/audio-soft/alsa-patch-bay/PRE_BUILD
b/audio-soft/alsa-patch-bay/PRE_BUILD
index 777879a..a85e80f 100755
--- a/audio-soft/alsa-patch-bay/PRE_BUILD
+++ b/audio-soft/alsa-patch-bay/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < $SPELL_DIRECTORY/0001-fix-missing-includes.patch &&
+
if [[ "$APB_AUDIO" == ALSA ]]; then
sedit "/.*jack-patch-bay/D" src/Makefile.in &&
sedit "s/jack-patch-bay.desktop//g" Makefile.in
diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index f48c53e..f92b50e 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,3 +1,2 @@
-OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS \
- --with-qt=${INSTALL_ROOT}/usr/bin/qt4" \
-default_build
+OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS" &&
+PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH default_build
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 4c9dd1e..3a1f598 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.3.9
+ VERSION=0.3.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a7a06cc002101816ddc38860cfa66f4bc75f867b50c2ccaefb1c3bc43a799fbc1e6a13f31b2e2e88c4de4c27254d1f5e72972207e66359e3016c4ea9b95c3bd5
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:4fd14cd8da30d9b04b9eac32cc13a4a145c1b695b833e7d97a12fc1609b1e96faf7ce451d6f9dea4f9f664ab4a9a27c7bc5e596f3d8432e0eefdc0181d7f7167

fi
WEB_SITE=http://qjackctl.sf.net
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index 33b9488..97fb799 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.11
+ * BUILD: set path to qt4
+
2012-05-19 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.3.9

diff --git a/dave_robillard.gpg b/dave_robillard.gpg
index 6abb6db..c9985f7 100644
Binary files a/dave_robillard.gpg and b/dave_robillard.gpg differ
diff --git a/gnome2-libs/gsettings-desktop-schemas/DETAILS
b/gnome2-libs/gsettings-desktop-schemas/DETAILS
index 9d5fa37..cd1cc87 100755
--- a/gnome2-libs/gsettings-desktop-schemas/DETAILS
+++ b/gnome2-libs/gsettings-desktop-schemas/DETAILS
@@ -1,10 +1,10 @@
SPELL=gsettings-desktop-schemas
- VERSION=3.10.1
+ VERSION=3.11.5
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-#
SOURCE_HASH=sha512:a05d2c105418f6bdc84ed11594ba38f9057c8307999122a6adb04b4499e450ae3443c3777d8b2dc58fb08021f5488dd0cf4fdf541e7940808d2212f72cfb510c
+
SOURCE_HASH=sha512:e7b84d9e53b2b237fba78dfcc3d2d8d1274bfd22ec9ae0bfdcee1f0874d46df172da33e050e24fb1a1aadd330de241fe41460af4d58f49dd46a5aa9191f0d188
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnome.org/
LICENSE[0]=LGPL
@@ -14,3 +14,4 @@ cat << EOF
collection of GSettings schemas for settings shared by various
components of a desktop.
EOF
+e7b84d9e53b2b237fba78dfcc3d2d8d1274bfd22ec9ae0bfdcee1f0874d46df172da33e050e24fb1a1aadd330de241fe41460af4d58f49dd46a5aa9191f0d188
/var/spool/sorcery/gsettings-desktop-schemas-3.11.5.tar.xz
diff --git a/gnome2-libs/gsettings-desktop-schemas/HISTORY
b/gnome2-libs/gsettings-desktop-schemas/HISTORY
index bda8014..4404b65 100644
--- a/gnome2-libs/gsettings-desktop-schemas/HISTORY
+++ b/gnome2-libs/gsettings-desktop-schemas/HISTORY
@@ -1,3 +1,6 @@
+2014-03-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.11.5
+
2013-11-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.10.1

diff --git
a/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.tar.xz.sig

b/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.tar.xz.sig
deleted file mode 100644
index 9c1b5d3..0000000
Binary files
a/gnome2-libs/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.tar.xz.sig
and /dev/null differ


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f345f2484f767b649697f525ae2db13fb4ea0f36), Florian Franzmann, 03/19/2014

Archive powered by MHonArc 2.6.24.

Top of Page