sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (f39eb7a2107d7a353531819a67eeff33b43dbbeb)
- 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 (f39eb7a2107d7a353531819a67eeff33b43dbbeb)
- Date: Thu, 3 Apr 2014 11:28:55 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog | 1
FUNCTIONS | 9 ++----
audio-creation/ardour3/BUILD | 3 +-
audio-creation/ardour3/DETAILS | 6 ++--
audio-creation/ardour3/HISTORY | 4 ++
audio-creation/jack-rack/BUILD | 1
audio-creation/jack-rack/DETAILS | 2 -
audio-creation/jack-rack/HISTORY | 4 ++
audio-drivers/ngjackspa/HISTORY | 3 ++
audio-drivers/ngjackspa/INSTALL | 3 +-
audio-libs/aubio/0001-disable-tests.patch | 24 ++++++++++++++++
audio-libs/aubio/BUILD | 1
audio-libs/aubio/DEPENDS | 20 ++++++-------
audio-libs/aubio/DETAILS | 6 ++--
audio-libs/aubio/HISTORY | 6 ++++
audio-libs/aubio/INSTALL | 1
audio-libs/aubio/PRE_BUILD | 3 ++
audio-libs/liblo/DETAILS | 6 ++--
audio-libs/liblo/HISTORY | 3 ++
audio-players/cantata/DETAILS | 6 ++--
audio-players/cantata/HISTORY | 3 ++
audio-players/mpd/DETAILS | 4 +-
audio-players/mpd/HISTORY | 3 ++
libs/gmp/DETAILS | 5 ++-
libs/gmp/HISTORY | 3 ++
libs/raptor/DETAILS | 2 -
libs/raptor/HISTORY | 3 ++
video/mpv/BUILD | 7 +---
video/mpv/CONFIGURE | 6 ++--
video/mpv/DEPENDS | 43
++++++++++++++----------------
video/mpv/DETAILS | 4 +-
video/mpv/HISTORY | 5 +++
video/mpv/INSTALL | 2 -
video/mpv/PRE_BUILD | 3 ++
34 files changed, 136 insertions(+), 69 deletions(-)
New commits:
commit f39eb7a2107d7a353531819a67eeff33b43dbbeb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/mpv: version 0.3.7
commit 1143ffca2f4d8c4a63db1dac4f1bde776beeb87e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/gmp: version 6.0.0a
commit b5dec30774091e218bbabccf8d97bc8a10b1b70d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-creation/jack-rack: fix linking, fix SOURCE_URL
commit 0e7a03bc897a984d7f970a8c696bfed3e3da6525
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-drivers/ngjackspa: install manpage
commit 1471adb08839db86109306620a54d34f615b070e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-players/cantata: version 1.3.3
commit 312cff3d9300f904393b52f9530192445ac082db
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-players/mpd: version 0.18.9
commit 83cba9559eaabaca0aa198024419bb1b3a556099
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-creation/ardour3: version 3.5.357
commit d77931c55c0f75a8613db3c0e105ef4da57c421c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-libs/aubio: version 0.4.1
commit f721f7b64ee8f965da585f6a7e52045f576a8266
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
remove options from waf that aren't common to all users of waf
commit a40990b4dc040523e73d38b3d1313d2ae6841d27
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/raptor: version 2.0.13
commit 425b6dce61da768ebdb3b479d796999ec7d460a5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
audio-libs/liblo: version 0.28
diff --git a/ChangeLog b/ChangeLog
index 77027e8..dd5eb90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
* audio-plugins/calf-plugins: new spell, professional-grade audio
plugins
for jack
* audio-libs/stk: new spell, the synthesis toolkit in C++
+ * FUNCTIONS: bring waf_build into line with default_build
2014-03-22 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/rbtools: new spell, tools for ReviewBoard
diff --git a/FUNCTIONS b/FUNCTIONS
index f8db363..970d697 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -522,11 +522,10 @@ function note_config_files() {
# and waf is fast without it as well
function waf_build() {
- ./waf configure \
- --nocache \
- --prefix=${INSTALL_ROOT}/usr \
- --configdir=${INSTALL_ROOT}/etc \
- $OPTS &&
+ ./waf configure --prefix=${INSTALL_ROOT}/usr \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ -j $MAKE_NJOBS \
+ --nocache $OPTS &&
./waf build
}
diff --git a/audio-creation/ardour3/BUILD b/audio-creation/ardour3/BUILD
index f384e0c..33dd493 100755
--- a/audio-creation/ardour3/BUILD
+++ b/audio-creation/ardour3/BUILD
@@ -1,3 +1,4 @@
-OPTS="--noconfirm $ARDOUR3_OPTS $OPTS" &&
+OPTS="--configdir=$INSTALL_ROOT/etc $OPTS" &&
+OPTS="--noconfirm --freedesktop $ARDOUR3_OPTS $OPTS" &&
waf_build
diff --git a/audio-creation/ardour3/DETAILS b/audio-creation/ardour3/DETAILS
index 36e2913..1c393d7 100755
--- a/audio-creation/ardour3/DETAILS
+++ b/audio-creation/ardour3/DETAILS
@@ -1,9 +1,9 @@
SPELL=ardour3
SPELLX=Ardour3
- VERSION=3.5.308
+ VERSION=3.5.357
SOURCE="${SPELLX}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/${SOURCE}
-
SOURCE_HASH=sha512:c02f6dbcb39696a85dca7f76eb04fb348b8b7e9fb6eb6c1570713546427ddc38868279942c9c3348c7a10581bd7700a2d12d1dbe8bcdd3ce9c4d6564cec34b79
+
SOURCE_URL[0]=ftp://ftp.archlinux.org/other/ardour/$SPELLX-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:90a310d10b2bc56cb2acc7fbcea2bfb4d1e49052cd9cbf26d5a5d4efe8786b868e20ef679f07f186547ff281364eeb90e03587f6d86ea3551123f0bafdbb3623
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 1a0bee7..671326d 100644
--- a/audio-creation/ardour3/HISTORY
+++ b/audio-creation/ardour3/HISTORY
@@ -1,3 +1,7 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.357
+ * BUILD: add --configdir and --freedesktop to OPTS
+
2014-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switched jack to JACK-DRIVER; ardour3 works well with jack2
after some internal configuration
diff --git a/audio-creation/jack-rack/BUILD b/audio-creation/jack-rack/BUILD
new file mode 100755
index 0000000..cfde7ad
--- /dev/null
+++ b/audio-creation/jack-rack/BUILD
@@ -0,0 +1 @@
+LIBS+=' -lm -ldl' default_build
diff --git a/audio-creation/jack-rack/DETAILS
b/audio-creation/jack-rack/DETAILS
index 1084753..e369b44 100755
--- a/audio-creation/jack-rack/DETAILS
+++ b/audio-creation/jack-rack/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=B94D2E95.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/audio-creation/jack-rack/HISTORY
b/audio-creation/jack-rack/HISTORY
index 3dece2e..5cb4d47 100644
--- a/audio-creation/jack-rack/HISTORY
+++ b/audio-creation/jack-rack/HISTORY
@@ -1,3 +1,7 @@
+2014-03-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * BUILD: fix linking
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* B94D2E95.gpg: added gpg keyring
diff --git a/audio-drivers/ngjackspa/HISTORY b/audio-drivers/ngjackspa/HISTORY
index fd44da0..18feed6 100644
--- a/audio-drivers/ngjackspa/HISTORY
+++ b/audio-drivers/ngjackspa/HISTORY
@@ -1,3 +1,6 @@
+2014-03-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: install manpage
+
2014-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/audio-drivers/ngjackspa/INSTALL b/audio-drivers/ngjackspa/INSTALL
index 7acf24e..3f96b0d 100755
--- a/audio-drivers/ngjackspa/INSTALL
+++ b/audio-drivers/ngjackspa/INSTALL
@@ -1 +1,2 @@
-prefix=${INSTALL_ROOT}/usr default_install
+prefix=${INSTALL_ROOT}/usr default_install &&
+install -m644 ${SOURCE_DIRECTORY}/ng-jackspa.1
${INSTALL_ROOT}/usr/share/man/man1/
diff --git a/audio-libs/aubio/0001-disable-tests.patch
b/audio-libs/aubio/0001-disable-tests.patch
new file mode 100644
index 0000000..929abcd
--- /dev/null
+++ b/audio-libs/aubio/0001-disable-tests.patch
@@ -0,0 +1,24 @@
+From 948b95efd679a362d9f21033a26f0e4b37741da6 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 24 Mar 2014 23:36:32 +0100
+Subject: [PATCH] disable tests
+
+---
+ wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 83ad7b8..13d941c 100644
+--- a/wscript
++++ b/wscript
+@@ -267,7 +267,6 @@ def build(bld):
+ pass
+ if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']:
+ bld.recurse('examples')
+- bld.recurse('tests')
+
+ bld( source = 'aubio.pc.in' )
+
+--
+1.9.0
+
diff --git a/audio-libs/aubio/BUILD b/audio-libs/aubio/BUILD
new file mode 100755
index 0000000..1d8ce04
--- /dev/null
+++ b/audio-libs/aubio/BUILD
@@ -0,0 +1 @@
+waf_build
diff --git a/audio-libs/aubio/DEPENDS b/audio-libs/aubio/DEPENDS
index 26e106f..fb00c30 100755
--- a/audio-libs/aubio/DEPENDS
+++ b/audio-libs/aubio/DEPENDS
@@ -1,18 +1,16 @@
-depends libsndfile &&
-depends libsamplerate &&
-depends fftw &&
+depends python &&
+depends libsndfile "--enable-sndfile" &&
+depends libsamplerate "--enable-samplerate" &&
+depends fftw "--enable-fftw3 --enable-complex --enable-double" &&
-optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "for ALSA support" &&
+depends alsa-lib &&
optional_depends JACK-DRIVER \
"--enable-jack" \
"--disable-jack" \
"for JACK support" &&
-optional_depends lash \
- "--enable-lash" \
- "--disable-lash" \
- "for LASH support (it will force alsa and jack depends)"
+optional_depends LIBAVCODEC \
+ "--enable-avcodec" \
+ "--disable-avcodec" \
+ "use avcodec"
diff --git a/audio-libs/aubio/DETAILS b/audio-libs/aubio/DETAILS
index da796e6..b265258 100755
--- a/audio-libs/aubio/DETAILS
+++ b/audio-libs/aubio/DETAILS
@@ -1,8 +1,8 @@
SPELL=aubio
- VERSION=0.3.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.4.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://aubio.org/pub/$SOURCE
-
SOURCE_HASH=sha512:b3d8445716c0cde02ee1e7b036864598ec7562d8a938a61f644c384d80e95601abcb6e713cdaab7b2613f6f4f27db1cfafa7c23824c61f504e83d11fefdee8fc
+
SOURCE_HASH=sha512:f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://aubio.org/
LICENSE[0]=GPL
diff --git a/audio-libs/aubio/HISTORY b/audio-libs/aubio/HISTORY
index 6024564..a23df2c 100644
--- a/audio-libs/aubio/HISTORY
+++ b/audio-libs/aubio/HISTORY
@@ -1,2 +1,8 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 0.4.1
+ * BUILD, INSTALL: use waf
+ * 0001-disable-tests.patch, PRE_BUILD: don't build tests as they
+ fail to link
+
2008-07-10 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS: spell created
diff --git a/audio-libs/aubio/INSTALL b/audio-libs/aubio/INSTALL
new file mode 100755
index 0000000..0ea15cc
--- /dev/null
+++ b/audio-libs/aubio/INSTALL
@@ -0,0 +1 @@
+waf_install
diff --git a/audio-libs/aubio/PRE_BUILD b/audio-libs/aubio/PRE_BUILD
new file mode 100755
index 0000000..ab8f858
--- /dev/null
+++ b/audio-libs/aubio/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-disable-tests.patch
diff --git a/audio-libs/liblo/DETAILS b/audio-libs/liblo/DETAILS
index 7e25fb2..8b4604e 100755
--- a/audio-libs/liblo/DETAILS
+++ b/audio-libs/liblo/DETAILS
@@ -1,8 +1,8 @@
SPELL=liblo
- VERSION=0.27
+ VERSION=0.28
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:079f12d349d7fb58d4f7393d2ad72ca6844570524992c56ce87b23531620c2387ac6ba5316f92684b3fae72c7a5abe03e49fcbd97196efdb35d11a2422b065bc
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:05818218d2d6a7042714b8fa905e7242fb9707795ad53ea27b2a1af3661f0822d25585ce17d286aa269c534ef24e19e377e041bf7fe194c8e47c0046fefcb85f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://liblo.sourceforge.net/
ENTERED=20070723
diff --git a/audio-libs/liblo/HISTORY b/audio-libs/liblo/HISTORY
index 02e7108..06b3d34 100644
--- a/audio-libs/liblo/HISTORY
+++ b/audio-libs/liblo/HISTORY
@@ -1,3 +1,6 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.28
+
2014-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.27
diff --git a/audio-players/cantata/DETAILS b/audio-players/cantata/DETAILS
index c90c5d1..fc7b261 100755
--- a/audio-players/cantata/DETAILS
+++ b/audio-players/cantata/DETAILS
@@ -1,8 +1,8 @@
SPELL=cantata
- VERSION=1.3.0.1
+ VERSION=1.3.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60czZxNXJtdWllc0E";
-
SOURCE_HASH=sha512:9a48ef75f7ac23656c27d2a05e0db8b01dfdddf575cf00ba7fa0b1a54027ca010f0c081184db1f03bc27fda64fa2ae5a5259f770c333a2b40a8a2c92eafa9964
+
SOURCE_URL[0]="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60ZUN1NThacGFrdFE";
+
SOURCE_HASH=sha512:1f50abf9e92316ba3cd8da0a542a6fbdabfa58bb8dd7349058ffeffa5f95a4db31e4810e580497fea5c08f31f8e891c1c7b600f66f81f400527d40c58f14148a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://code.google.com/p/cantata/";
LICENSE[0]=GPL
diff --git a/audio-players/cantata/HISTORY b/audio-players/cantata/HISTORY
index 8fdbfc1..2b4d57e 100644
--- a/audio-players/cantata/HISTORY
+++ b/audio-players/cantata/HISTORY
@@ -1,3 +1,6 @@
+2014-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.3
+
2014-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3.0.1
* DEPENDS: add dependency on qjson, optional deps on cdparanoia,
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 9902b76..03acd06 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpd
- VERSION=0.18.8
+ VERSION=0.18.9
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.musicpd.org/download/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:a6f540813b3f91c74645d3903a0b36edd1546880bfa7d1c06f2cb61b37e9c1e343b03ff06a685c4ded796a7f486b19e89849ca43f2b978c839b72eb0be184f34
+
SOURCE_HASH=sha512:12e45e14108cce0a3a993b6d17dfc05ed7d14ea99cce85f202904b9bf1624bfecadbd4d465e3c9057822691a1a245e67524229b160fceb2f72d27d6a8bd56479
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 81914b6..da518dc 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2014-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.18.9
+
2014-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.18.8
diff --git a/libs/gmp/DETAILS b/libs/gmp/DETAILS
index ea3af1f..8f95d93 100755
--- a/libs/gmp/DETAILS
+++ b/libs/gmp/DETAILS
@@ -1,7 +1,8 @@
SPELL=gmp
if [[ $GMP_DEVEL == "y" ]]; then
- VERSION=5.1.3
- SOURCE=$SPELL-$VERSION.tar.xz
+ VERSION=6.0.0
+ XVERSION=a
+ SOURCE=$SPELL-$VERSION$XVERSION.tar.xz
else
VERSION=4.3.2
PATCHLEVEL=0
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 0010fa4..b3c0764 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2014-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.0.0a
+
2013-10-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.3 (devel)
diff --git a/libs/raptor/DETAILS b/libs/raptor/DETAILS
index 27b0bcf..743fefd 100755
--- a/libs/raptor/DETAILS
+++ b/libs/raptor/DETAILS
@@ -1,6 +1,6 @@
SPELL=raptor
SPELLX=raptor2
- VERSION=2.0.12
+ VERSION=2.0.13
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/libs/raptor/HISTORY b/libs/raptor/HISTORY
index 9062cb0..46b5e69 100644
--- a/libs/raptor/HISTORY
+++ b/libs/raptor/HISTORY
@@ -1,3 +1,6 @@
+2014-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.13
+
2013-12-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.12
diff --git a/video/mpv/BUILD b/video/mpv/BUILD
index 61399b2..63c28f8 100755
--- a/video/mpv/BUILD
+++ b/video/mpv/BUILD
@@ -18,8 +18,5 @@ if is_depends_enabled $SPELL $(get_spell_provider $SPELL
OPENGL); then
fi
fi &&
-./old-configure --prefix=${INSTALL_ROOT}/usr \
- --confdir=${TRACK_ROOT}/etc/mpv \
- $OPTS &&
-
-make V=1 -f old-makefile
+OPTS+=" --confdir=$INSTALL_ROOT/etc/mpv" &&
+waf_build
diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE
index 2301e04..305d101 100755
--- a/video/mpv/CONFIGURE
+++ b/video/mpv/CONFIGURE
@@ -1,9 +1,9 @@
default_configure &&
config_query_option MPV_OPTS "Compile-in debugging information?" y \
- "--enable-debug" \
- "--disable-debug" &&
+ "" \
+ "--disable-debug-build" &&
config_query_option MPV_OPTS "Enable VCD (VideoCD) support?" y \
- "--enable-vcd" \
+ "" \
"--disable-vcd"
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index c237624..ca181ae 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -1,4 +1,5 @@
-depends perl &&
+depends perl &&
+depends python &&
depends -sub STABLE ffmpeg &&
optional_depends docutils \
@@ -44,23 +45,23 @@ optional_depends JACK-DRIVER \
optional_depends openal \
"--enable-openal" \
- "--disable-openal" \
+ "" \
"for OpenAL audio output" &&
optional_depends sdl \
"--enable-sdl" \
- "--disable-sdl" \
+ "" \
"for SDL audio output" &&
# TODO: add sdl2 spell
#optional_depends sdl2 \
# "--enable-sdl2" \
-# "--disable-sdl2" \
+# "" \
# "for SDL 2.0+ audio and video output" &&
# video output
optional_depends OPENGL \
- "--enable-gl" \
+ "" \
"--disable-gl" \
"for OpenGL video output" &&
@@ -79,7 +80,7 @@ if is_depends_enabled $SPELL libx11; then
optional_depends libxxf86vm \
"" \
- "--disable-vm" \
+ "--disable-xf86vm" \
"for X video mode extensions" &&
optional_depends libvdpau \
@@ -110,14 +111,14 @@ optional_depends libxscrnsaver \
# codecs
optional_depends JPEG \
- "--enable-jpeg" \
+ "" \
"--disable-jpeg" \
"for JPEG input/output support" &&
optional_depends libcdio \
- "--enable-libcdio" \
- "--disable-libcdio" \
- "for libcdio support" &&
+ "" \
+ "--disable-cdda" \
+ "for cdda support" &&
optional_depends ladspa \
"" \
@@ -131,28 +132,28 @@ optional_depends MPG123 \
# features
optional_depends lirc \
- "--enable-lirc" \
+ "" \
"--disable-lirc" \
"for LIRC (remote control) support" &&
if is_depends_enabled $SPELL libx11; then
optional_depends xproto \
"" \
- "--disable-xf86keysym" \
+ "--disable-xf86xk" \
"for multimedia keys support"
else
- list_add MPV_OPTS "--disable-xf86keysym"
+ list_add MPV_OPTS "--disable-xf86xk"
fi &&
optional_depends v4l-utils \
- "--enable-radio" \
+ "" \
"--disable-radio --disable-radio-v4l2" \
"for Video4Linux2 radio interface" &&
if is_depends_enabled $SPELL v4l-utils; then
if is_depends_enabled $SPELL alsa-lib || is_depends_enabled $SPELL oss;
then
config_query_option MPV_OPTS "Enable radio capture (through
PCI/line-in)?" n \
- "--enable-radio-capture" \
+ "" \
"--disable-radio-capture"
else
list_add MPV_OPTS "--disable-radio-capture"
@@ -160,7 +161,7 @@ if is_depends_enabled $SPELL v4l-utils; then
fi &&
optional_depends v4l-utils \
- "--enable-tv" \
+ "" \
"--disable-tv --disable-tv-v4l2" \
"for Video4Linux2 TV interface (TV/DVB grabbers)" &&
@@ -173,8 +174,8 @@ else
fi &&
optional_depends samba \
- "--enable-smb" \
- "--disable-smb" \
+ "" \
+ "--disable-libsmbclient" \
"for Samba (SMB) input support" &&
if is_depends_enabled $SPELL samba; then
@@ -191,14 +192,14 @@ optional_depends lcms2 \
"--disable-lcms2" \
"for LCMS2 support" &&
-optional_depends lua \
+optional_depends LUA \
"" \
"--disable-lua" \
"for Lua scripting support" &&
optional_depends libbluray \
"" \
- "--disable-bluray" \
+ "--disable-libbluray" \
"for Blu-ray support" &&
optional_depends libdvdread \
@@ -216,8 +217,6 @@ optional_depends enca \
"--disable-enca" \
"for ENCA charset oracle library support" &&
-# accepts only autodetect mode (forcing `--enable-libass' flag disables
libass
-# support); this also happens for `--enable-libass-osd'
optional_depends libass \
"" \
"--disable-libass" \
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index e182eaf..85f4776 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,10 +1,10 @@
SPELL=mpv
- VERSION=0.3.6
+ VERSION=0.3.7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCEX=v${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/${SOURCEX}
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:4f94f0fa4d6ee2d070da1adcd0801d8f1ae5893407cfd422c412526449aeeed45fbb953463393779fde869d68351c5d93416bfe9e2f3dfc2c74ccdf7a746f91f
+
SOURCE_HASH=sha512:452128df418e50c19cf86041decf77202082fc82997aee36ae95e5c0d447dd1e30fcbe9c28d6ec52b0415252b74791152ec485ddc918a1f010d9cc7b9a0f4b29
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/*
$DOCS"
WEB_SITE=http://mpv.io/
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 9b1417f..e5a07a5 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,8 @@
+2014-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.7
+ * BUILD, CONFIGURE, DEPENDS, INSTALL, PRE_BUILD: switch to waf
+ build system
+
2014-03-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.6
diff --git a/video/mpv/INSTALL b/video/mpv/INSTALL
index 947d266..cc0acc7 100755
--- a/video/mpv/INSTALL
+++ b/video/mpv/INSTALL
@@ -1,4 +1,4 @@
-make V=1 install &&
+./waf install
install -vm 755 -d "$INSTALL_ROOT/etc/mpv" &&
diff --git a/video/mpv/PRE_BUILD b/video/mpv/PRE_BUILD
new file mode 100755
index 0000000..4e9edd3
--- /dev/null
+++ b/video/mpv/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+./bootstrap.py
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f39eb7a2107d7a353531819a67eeff33b43dbbeb), Florian Franzmann, 04/03/2014
Archive powered by MHonArc 2.6.24.