Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ed468795bf7974a37cf92c881f074145d7b4108a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ed468795bf7974a37cf92c881f074145d7b4108a)
  • Date: Wed, 2 Mar 2016 21:21:47 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/hydrogen/BUILD | 9 +++---
audio-creation/hydrogen/CONFIGURE | 2 -
audio-creation/hydrogen/DEPENDS | 50
+++++++++++++++++++++++++++++---------
audio-creation/hydrogen/DETAILS | 6 ++--
audio-creation/hydrogen/HISTORY | 4 +++
audio-creation/hydrogen/INSTALL | 1
audio-creation/jamin/BUILD | 3 ++
audio-creation/jamin/HISTORY | 3 ++
audio-libs/liblrdf/DETAILS | 1
audio-libs/liblrdf/HISTORY | 4 +++
audio-libs/liblrdf/PRE_BUILD | 4 ++-
doc/xdvik/BUILD | 3 ++
doc/xdvik/HISTORY | 3 ++
doc/xdvik/INSTALL | 4 +++
libs/flickcurl/DETAILS | 4 +--
libs/flickcurl/HISTORY | 4 +++
16 files changed, 81 insertions(+), 24 deletions(-)

New commits:
commit ed468795bf7974a37cf92c881f074145d7b4108a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

hydrogen: fix things by updating to 0.9.6.1

commit b36ac6ae9fa3c6c06fe0a11583d6a5462f87d7a9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

liblrdf: fix with current raptor (dependent spells break otherwise)

commit 4d7e54df07a33a3e0cf2dee5c1fb9477fd604cb3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

jamin: build fix

commit 998f9ec31a449c07e0abd01100d03e296182ef36
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xdvik: build fix

commit 824c770313a1c66f022d053e46ba013e6fb9eca6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

flickcurl: update to 1.26, fixing build against libcurl at that

diff --git a/audio-creation/hydrogen/BUILD b/audio-creation/hydrogen/BUILD
index 34a629c..3599c4e 100755
--- a/audio-creation/hydrogen/BUILD
+++ b/audio-creation/hydrogen/BUILD
@@ -1,4 +1,5 @@
- QTDIR=/usr &&
- PATH=$QTDIR/bin/qt4:$PATH &&
- export QTDIR=/usr/bin/qt4 && # ????? it runs /usr/bin/uic otherwise
- scons prefix=$INSTALL_ROOT/usr
+export QTDIR=$QT4DIR &&
+# Refuses to use ladspa unless path to plugins specified.
+export LADSPA_PATH=$INSTALL_ROOT/usr/lib/ladspa &&
+OPTS+=" $HYDROGEN_OSS" &&
+cmake_build
diff --git a/audio-creation/hydrogen/CONFIGURE
b/audio-creation/hydrogen/CONFIGURE
deleted file mode 100755
index 5aacaa6..0000000
--- a/audio-creation/hydrogen/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option HYDROGEN_OSS "Compile with OSS support?" y \
- "--enable-oss-support" "--disable-oss-support"
diff --git a/audio-creation/hydrogen/DEPENDS b/audio-creation/hydrogen/DEPENDS
index 914f7f3..bda2606 100755
--- a/audio-creation/hydrogen/DEPENDS
+++ b/audio-creation/hydrogen/DEPENDS
@@ -1,17 +1,45 @@
depends -sub CXX gcc &&
depends qt4 &&
-depends scons &&
+depends cmake &&
depends libsndfile &&
-depends JACK-DRIVER &&
-depends libtar &&
-depends liblrdf &&
+
+optional_depends libarchive \
+ "-DWANT_LIBARCHIVE=ON" \
+ "-DWANT_LIBARCHIVE=OFF" \
+ "libarchive for file access instead of libtar and zlib" &&
+if ! is_depends_enabled $SPELL libarchive; then
+ depends libtar
+fi &&
+
+optional_depends liblrdf \
+ "-DWANT_LRDF=ON" \
+ "-DWANT_LRDF=OFF" \
+ "for ladspa plugins (triggers plain ladspa dependency,
too)" &&
+if is_depends_enabled $SPELL liblrdf; then
+ depends ladspa
+fi &&
+
+optional_depends JACK-DRIVER \
+ "-DWANT_JACK=ON" \
+ "-DWANT_JACK=OFF" \
+ "for JACK output" &&

optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "for ALSA support" &&
+ "-DWANT_ALSA=ON" \
+ "-DWANT_ALSA=OFF" \
+ "for ALSA output" &&
+
+optional_depends oss \
+ "-DWANT_OSS=ON" \
+ "-DWANT_OSS=OFF" \
+ "for OSS4 output" &&
+
+optional_depends pulseaudio \
+ "-DWANT_PULSEAUDIO=ON" \
+ "-DWANT_PULSEAUDIO=OFF" \
+ "for pulseaudio output" &&

-optional_depends flac \
- "--enable-flac-support" \
- "--disable-flac-support" \
- "for flac support"
+optional_depends lash \
+ "-DWANT_LASH=ON" \
+ "-DWANT_LASH=OFF" \
+ "session handling"
diff --git a/audio-creation/hydrogen/DETAILS b/audio-creation/hydrogen/DETAILS
index 35bf995..d60404a 100755
--- a/audio-creation/hydrogen/DETAILS
+++ b/audio-creation/hydrogen/DETAILS
@@ -1,9 +1,9 @@
SPELL=hydrogen
- VERSION=0.9.5
+ VERSION=0.9.6.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
+
SOURCE_URL[0]=https://github.com/hydrogen-music/$SPELL/archive/$VERSION.tar.gz
+
SOURCE_HASH=sha512:afb501fb1565a95677aa2702f5d93ee611f03f60dfc8aa5a22714bb261bfeecf2b28e0b591763ec4d1a0b60f8153ef01c3fdfae924ca252943a2396ac953717f
WEB_SITE=http://www.hydrogen-music.org
ENTERED=20031217
LICENSE[0]=GPL
diff --git a/audio-creation/hydrogen/HISTORY b/audio-creation/hydrogen/HISTORY
index 482b324..323cf6e 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,7 @@
+2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
+ DETAILS, CONFIGURE, DEPENDS, BUILD: update to 0.9.6.1
+ INSTALL: gone
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/audio-creation/hydrogen/INSTALL b/audio-creation/hydrogen/INSTALL
deleted file mode 100755
index 9f0c0eb..0000000
--- a/audio-creation/hydrogen/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-scons install
diff --git a/audio-creation/jamin/BUILD b/audio-creation/jamin/BUILD
new file mode 100755
index 0000000..0d5dd5c
--- /dev/null
+++ b/audio-creation/jamin/BUILD
@@ -0,0 +1,3 @@
+# Forgets to link to libdl?!
+LDFLAGS+=" -ldl" &&
+default_build
diff --git a/audio-creation/jamin/HISTORY b/audio-creation/jamin/HISTORY
index 57d1bdc..40141cf 100644
--- a/audio-creation/jamin/HISTORY
+++ b/audio-creation/jamin/HISTORY
@@ -1,3 +1,6 @@
+2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: added, hack to use -ldl (build fix)
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/audio-libs/liblrdf/DETAILS b/audio-libs/liblrdf/DETAILS
index 1fdeeb2..c8da979 100755
--- a/audio-libs/liblrdf/DETAILS
+++ b/audio-libs/liblrdf/DETAILS
@@ -5,6 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/LRDF-$VERSION
SOURCE_URL[0]=https://github.com/swh/LRDF/archive/0.5.0.zip
WEB_SITE=https://github.com/swh/LRDF
ENTERED=20031207
+ PATCHLEVEL=1
LICENSE[0]=GPL

SOURCE_HASH=sha512:5b57961199af7aab8714a411917426cac5a92fa7bb9bfebdb9a8ffbe6713186b8c500b71ffb689e0701ca24f0e7fede23520d29411c7afe6a90535802dded48d
KEYWORDS="audio libs"
diff --git a/audio-libs/liblrdf/HISTORY b/audio-libs/liblrdf/HISTORY
index 0d5915c..dbaeaed 100644
--- a/audio-libs/liblrdf/HISTORY
+++ b/audio-libs/liblrdf/HISTORY
@@ -1,3 +1,7 @@
+2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: include raptor2/raptor2.h instead of raptor.h
+ * DETAILS: PATCHLEVEL++
+
2013-10-23 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update checksum

diff --git a/audio-libs/liblrdf/PRE_BUILD b/audio-libs/liblrdf/PRE_BUILD
index 74cf1f0..f1d1c78 100755
--- a/audio-libs/liblrdf/PRE_BUILD
+++ b/audio-libs/liblrdf/PRE_BUILD
@@ -4,4 +4,6 @@ sedit 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac &&
libtoolize -fv &&
aclocal --force &&
autoconf -f &&
-automake -afv
+automake -afv &&
+# Raptor decided to drop the compat header. Let's break software. It's fun!
+sed -i s:raptor.h:raptor2/raptor2.h: lrdf.h
diff --git a/doc/xdvik/BUILD b/doc/xdvik/BUILD
index 50d719e..89e9aa0 100755
--- a/doc/xdvik/BUILD
+++ b/doc/xdvik/BUILD
@@ -1,2 +1,5 @@
+mkdir -p smgl-build &&
+cd smgl-build &&
+ln -sf ../configure . &&
OPTS="$XDVIK_OPTS --with-xdvi-x-toolkit=$XDVIK_KIT --with-ps=$XDVIK_PS
--disable-multiplatform $OPTS" &&
default_build
diff --git a/doc/xdvik/HISTORY b/doc/xdvik/HISTORY
index 869b1bf..733249e 100644
--- a/doc/xdvik/HISTORY
+++ b/doc/xdvik/HISTORY
@@ -1,3 +1,6 @@
+2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, INSTALL: build in separate directory, as build aborts
otherwise
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/doc/xdvik/INSTALL b/doc/xdvik/INSTALL
new file mode 100755
index 0000000..46b4bb3
--- /dev/null
+++ b/doc/xdvik/INSTALL
@@ -0,0 +1,4 @@
+# Presence of that dir seems assumed.
+mkdir -p "$INSTALL_ROOT/usr/texmf-dist/dvips/config" &&
+cd "$SOURCE_DIRECTORY/smgl-build" &&
+default_install
diff --git a/libs/flickcurl/DETAILS b/libs/flickcurl/DETAILS
index 6fa87c5..75ba13b 100755
--- a/libs/flickcurl/DETAILS
+++ b/libs/flickcurl/DETAILS
@@ -1,9 +1,9 @@
SPELL=flickcurl
- VERSION=1.21
+ VERSION=1.26
SOURCE=$SPELL-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.dajobe.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:499e300be108f0ad39a9dd756dc14f77a98c91de459717f6812eba9c9695302890e841de30481c0013e08634b774e164ece99ea2a0ccc640bd9249a688ad0878
+
SOURCE_HASH=sha512:5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
LICENSE[0]=LGPL/GPL/Apache
WEB_SITE=http://librdf.org/flickcurl/
ENTERED=20100226
diff --git a/libs/flickcurl/HISTORY b/libs/flickcurl/HISTORY
index 25930b7..1fe8853 100644
--- a/libs/flickcurl/HISTORY
+++ b/libs/flickcurl/HISTORY
@@ -1,3 +1,7 @@
+2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.26
+ * PRE_BUILD: never existed in grimoire:-(
+
2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.21
* PRE_BUILD: replace include for curl/types.h by curl/curl.h



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ed468795bf7974a37cf92c881f074145d7b4108a), Thomas Orgis, 03/02/2016

Archive powered by MHonArc 2.6.24.

Top of Page