Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (af1960de18ff86858162558ecb298c25751455fc)

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 stable-0.62 grimoire by Vlad Glagolev (af1960de18ff86858162558ecb298c25751455fc)
  • Date: Thu, 23 Apr 2015 05:40:13 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 16 +++++++++++++---
audio-creation/guitarix2/BUILD | 5 ++---
audio-creation/guitarix2/HISTORY | 3 +++
audio-drivers/jack/DEPENDS | 2 ++
audio-drivers/jack/HISTORY | 3 +++
audio-players/timidity/DETAILS | 1 +
audio-players/timidity/HISTORY | 6 ++++++
audio-players/timidity/PRE_BUILD | 4 ++++
audio-players/timidity/timidity-2.14-alsajack.patch | 11 +++++++++++
devel/python/CONFIGURE | 2 ++
devel/python/DETAILS | 1 +
devel/python/HISTORY | 7 +++++++
devel/python/INSTALL | 7 +++++++
devel/python3/CONFIGURE | 2 ++
devel/python3/DETAILS | 1 +
devel/python3/HISTORY | 8 ++++++++
devel/python3/INSTALL | 11 +++++++++--
libs/pyqt4/DEPENDS | 6 +++++-
libs/pyqt4/HISTORY | 3 +++
utils/dbus-python/BUILD | 2 ++
utils/dbus-python/HISTORY | 3 +++
22 files changed, 98 insertions(+), 9 deletions(-)

New commits:
commit af1960de18ff86858162558ecb298c25751455fc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python: the word is primary, not default
(cherry picked from commit f6bf58ffc5b1fe777087c9b114d3d66c0de4c0fc)

commit dd0b988f3d6fcb6453925724aa6af9fc6eda361d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python3: warn about making it primary
(cherry picked from commit d717f6c43e1ccf999a69f40c7880c57939231a39)

commit 593425df93b34fd5f59c7d589a8f85e2b1eb91a7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python: add warning about not making it the default pythin
(cherry picked from commit 81d5b7157c0d4b7305c984aec032df210a8b6384)

commit 5ee36befaed5773e144a67e235298ea750c6abb4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

timidity: completed HISTORY entry
(cherry picked from commit 30fc41cd65363c8f899a1913db66260942becd5e)

commit dfd651e373d94f0e126d64e6cd94d537cb9241ed
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

timidity: apply patch to make jack output work with alsa sequencer
(cherry picked from commit cbf9c9b800c5df0c56c671feadaca3176120e4f5)

commit 9b9cf098ad8420696135bd61076ba9e1ed6fe0c8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

guitarix2: use waf_build
(cherry picked from commit b563039e2f5ac93aef082a9a9ba6e6b09c903094)

commit 693cf30990797b899b431dcbfdb15274d76d9268
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python3: ensure existens of python3 command (as per PEP 394)
(cherry picked from commit c0c6181c26f6fa125e8344e77b208a75379d52d3)

Conflicts:

devel/python3/HISTORY

commit f43646337fe74107b4bd50bf3c0aac4827e48e3e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python: ensure existens of python2 command (as per PEP 394)
(cherry picked from commit 54b9638e12e784ea9b0ff60ea20beabc8ff42d51)

commit 82c749ef58feca4224680221bed5d7cc3be566f8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pyqt4: needs dbus-python
(cherry picked from commit 49b66acfd302cdb27e48ef8517c139403759c92f)

commit 9f9462d2a3f4cf441316a1e1b0da8137ce876c1a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

jack: needs db
(cherry picked from commit 7a3e902773ce9f2279f362a8751cc9e67b5ee06c)

commit d235a5947d697e2c5e7500dcd05812bde9c8ee4c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dbus-python: really install for the chosen PYTHON
(cherry picked from commit 7bcb424fc67392c6ee93578842fe4065ddcedf24)

commit 312004ddcbf047ecc1cdff74c95606bdff32b081
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

FUNCTIONS: more robust waf_build
(cherry picked from commit 3fd574c7a86894b1c963f8589d1d0b9632f3497e)

Conflicts:

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3f6f21b..7fb65cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: make waf_build more robust with differing versions of waf
+
2015-04-22 Vlad Glagolev <stealth AT sourcemage.org>
* FUNCTIONS: fixed check_tmp_noexec for tmp-less systems, do not force
noexec option
diff --git a/FUNCTIONS b/FUNCTIONS
index 179b05a..5a9d3c5 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -508,12 +508,22 @@ function note_config_files() {
# please use this one instead of maunaly calling waf when possible
# Disabled caching as this has GREAT potential for borkage
# and waf is fast without it as well
+# The waf disables options between versions and bails out if they are given,
+# so check first if they are supported..

function waf_build() {
- ./waf configure --prefix=${INSTALL_ROOT}/usr \
- --mandir=${INSTALL_ROOT}/usr/share/man \
+ local waf_opts="--prefix=$INSTALL_ROOT/usr"
+ # Some waf not know man, waf angry with man.
+ if ./waf --help | grep -q -- --mandir; then
+ waf_opts="$waf_opts --mandir=$INSTALL_ROOT/usr/share/man"
+ fi
+ # Same with some other options.
+ if ./waf --help | grep -q -- --nocache; then
+ waf_opts="$waf_opts --nocache"
+ fi
+ ./waf configure $waf_opts \
-j $MAKE_NJOBS \
- --nocache $OPTS &&
+ $OPTS &&
./waf build
}

diff --git a/audio-creation/guitarix2/BUILD b/audio-creation/guitarix2/BUILD
index 82050c7..577e986 100755
--- a/audio-creation/guitarix2/BUILD
+++ b/audio-creation/guitarix2/BUILD
@@ -1,4 +1,3 @@
# zita-convolver external spelly may come... but that project seems troubled
-./waf configure -j $MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" \
---includeresampler --includeconvolver &&
-./waf build
+OPTS="$OPTS --includeresampler --includeconvolver" &&
+waf_build
diff --git a/audio-creation/guitarix2/HISTORY
b/audio-creation/guitarix2/HISTORY
index b10ebc9..b55f004 100644
--- a/audio-creation/guitarix2/HISTORY
+++ b/audio-creation/guitarix2/HISTORY
@@ -1,3 +1,6 @@
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: use waf_build
+
2011-09-21 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTALL: spell created

diff --git a/audio-drivers/jack/DEPENDS b/audio-drivers/jack/DEPENDS
index f5199ff..d1c6106 100755
--- a/audio-drivers/jack/DEPENDS
+++ b/audio-drivers/jack/DEPENDS
@@ -6,6 +6,8 @@ then
depends automake
fi &&

+depends db &&
+
optional_depends alsa-lib \
"--enable-alsa" \
"--disable-alsa" \
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 7a74e02..59efa7d 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2015-02-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: needs db
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/audio-players/timidity/DETAILS b/audio-players/timidity/DETAILS
index 5b8f5b8..a81f33d 100755
--- a/audio-players/timidity/DETAILS
+++ b/audio-players/timidity/DETAILS
@@ -1,5 +1,6 @@
SPELL=timidity
VERSION=2.14.0
+ PATCHLEVEL=1
SOURCE=TiMidity++-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/TiMidity++-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/timidity/HISTORY b/audio-players/timidity/HISTORY
index daa9891..4419b4e 100644
--- a/audio-players/timidity/HISTORY
+++ b/audio-players/timidity/HISTORY
@@ -1,3 +1,9 @@
+2015-04-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: patch to make alsa sequencer interface work with
+ jack output
+ * timidity-2.14-alsajack.patch: added
+ * DETAILS: PATCHLEVEL++
+
2013-11-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.14.0

diff --git a/audio-players/timidity/PRE_BUILD
b/audio-players/timidity/PRE_BUILD
new file mode 100755
index 0000000..9517d3d
--- /dev/null
+++ b/audio-players/timidity/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+message "${MESSAGE_COLOR}Patching to make -iA -Oj work.$DEFAULT_COLOR" &&
+patch -p0 < "$SCRIPT_DIRECTORY/timidity-2.14-alsajack.patch"
diff --git a/audio-players/timidity/timidity-2.14-alsajack.patch
b/audio-players/timidity/timidity-2.14-alsajack.patch
new file mode 100644
index 0000000..ef3699c
--- /dev/null
+++ b/audio-players/timidity/timidity-2.14-alsajack.patch
@@ -0,0 +1,11 @@
+--- timidity/jack_a.c.orig 2015-04-22 20:48:41.612316567 +0200
++++ timidity/jack_a.c 2015-04-22 20:50:19.767089464 +0200
+@@ -508,6 +508,8 @@
+ pthread_cond_wait(&ctx->cond, &ctx->lock);
+ }
+ /* fallthrough */
++ /* Folks found that: https://bugs.archlinux.org/task/40906 */
++ case PM_REQ_PLAY_START: /* Please make -iA -Oj work! */
+ case PM_REQ_DISCARD:
+ ctx->running = 0;
+ ringbuf_clear(&ctx->rbuf);
diff --git a/devel/python/CONFIGURE b/devel/python/CONFIGURE
index 3470655..6a8c313 100755
--- a/devel/python/CONFIGURE
+++ b/devel/python/CONFIGURE
@@ -1,3 +1,5 @@
+message "${PROBLEM_COLOR}WARNING: Not choosing python 2 as primary will
break many spells!$DEFAULT_COLOR" &&
+message "${MESSAGE_COLOR} Switching to python 3 will cause a lot of
work for you.$DEFAULT_COLOR" &&
config_query PY2K "Use Python 2 as primary version on the system?" y &&

config_query_option PYTHON_OPTS \
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index f5af121..17cffec 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,7 @@
SPELL=python
VERSION=2.7.9
SECURITY_PATCH=4
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 1f58bcf..3ca10da 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,10 @@
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: add warning about not using python 2 as primary
+
+2015-04-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: ensure python2 and python2-config symlinks
+ * DETAILS: PATCHLEVEL++
+
2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply a patch; quoting paths
* libressl.patch: added, backported official patch from OpenBSD
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 5a47b20..8a1a8b5 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -10,6 +10,13 @@ install -vm 755
"$SOURCE_DIRECTORY"/Tools/i18n/{pygettext.py,msgfmt.py} \

local PYVER=`echo ${VERSION}|cut -d . -f 1,2` &&

+# Ensure existence of /usr/bin/python2 and /usr/bin/python2-config
+# symlinks, as they are not created with altinstall.
+# See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
+# and the surrounding thread for fun.
+ln -sf python$PYVER "$INSTALL_ROOT/usr/bin/python2" &&
+ln -sf python$PYVER-config "$INSTALL_ROOT/usr/bin/python2-config" &&
+
if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
"${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index dfbe08c..73a1a34 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -1,3 +1,5 @@
+message "${PROBLEM_COLOR}WARNING: Not choosing python 2 as primary will
break many spells!$DEFAULT_COLOR" &&
+message "${MESSAGE_COLOR} Switching to python 3 will cause a lot of
work for you.$DEFAULT_COLOR" &&
config_query PY3K "Use Python 3 as primary version on the system?" n &&
config_query SYMLINK "create symlinks for python -> python3" n &&

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index dd7f3fc..8c50b2d 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,6 +1,7 @@
SPELL=python3
VERSION=3.4.2
SECURITY_PATCH=3
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index a35a0a5..05af663 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,11 @@
+2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: warn about making this python primary
+
+2015-04-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: ensure python3 and python3-config symlinks,
+ also better version extraction using cut -d .
+ * DETAILS: PATCHLEVEL++
+
2015-03-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de
* INSTALL: install python3 symlink

diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 0a4e44a..852c1f0 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -4,9 +4,16 @@ cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr"
"$INSTALL_ROOT/" &&
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
# help some stupid installer scripts
-local PV=`echo ${VERSION}|cut -c-3` &&
+local PV=`echo ${VERSION}|cut -d . -f 1,2` &&
+
+# Ensure existence of /usr/bin/python3 and /usr/bin/python3-config
+# symlinks, as they are not created with altinstall.
+# See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
+# and the surrounding thread for fun.
+ln -sf python$PV "$INSTALL_ROOT/usr/bin/python3" &&
+ln -sf python$PV-config "$INSTALL_ROOT/usr/bin/python3-config" &&
+
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
-ln -sf ${TRACK_ROOT}/usr/bin/python${PV} ${INSTALL_ROOT}/usr/bin/python3 &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
if [[ $SYMLINK == y ]];then
diff --git a/libs/pyqt4/DEPENDS b/libs/pyqt4/DEPENDS
index 2ab9874..3e2f518 100755
--- a/libs/pyqt4/DEPENDS
+++ b/libs/pyqt4/DEPENDS
@@ -4,4 +4,8 @@ depends sip &&
optional_depends qscintilla '' '' "editting component"
if is_depends_enabled pyqt4 qscintilla; then
sub_depends qscintilla QT4
-fi
+fi &&
+# This needs to use the same PYTHON ... this is a rather
+# generic problem. We need to ensure consistency of providers along
+# one branch of the dependency tree.
+optional_depends dbus-python '' '' 'QtDBus API'
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index eceed90..a4469cc 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2015-04-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: dbus-python
+
2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: missing &&

diff --git a/utils/dbus-python/BUILD b/utils/dbus-python/BUILD
new file mode 100755
index 0000000..a5edff6
--- /dev/null
+++ b/utils/dbus-python/BUILD
@@ -0,0 +1,2 @@
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') \
+default_build
diff --git a/utils/dbus-python/HISTORY b/utils/dbus-python/HISTORY
index 5390230..dab17fd 100644
--- a/utils/dbus-python/HISTORY
+++ b/utils/dbus-python/HISTORY
@@ -1,3 +1,6 @@
+2015-04-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: actually use the selected PYTHON!
+
2014-02-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.0
* DEPENDS: PYTHON, supports python3



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (af1960de18ff86858162558ecb298c25751455fc), Vlad Glagolev, 04/23/2015

Archive powered by MHonArc 2.6.24.

Top of Page