Skip to Content.
Sympa Menu

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

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 (f210c886bdb7f486093c3746e698e5aaf5679261)
  • Date: Fri, 13 Feb 2015 06:46:25 -0600

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

audio-drivers/libffado/DETAILS | 4 ++--
audio-drivers/libffado/HISTORY | 3 +++
audio-soft/qjackctl/HISTORY | 5 +++++
audio-soft/qjackctl/PRE_BUILD | 15 +++++++++++++++
4 files changed, 25 insertions(+), 2 deletions(-)

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

libffado: version 2.2.1

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

qjackctl: fix build when old qmake is around

diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index f19431d..ce5283f 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -8,10 +8,10 @@ if [[ "$LIBFFADO_BRANCH" == scm ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=2.1.0
+ VERSION=2.2.1
SOURCE="$SPELL-$VERSION.tgz"
SOURCE_URL="http://www.ffado.org/files/$SOURCE";
-
SOURCE_HASH=sha512:37179cb32920f16577e9f887cf90aca8d46081573080cbe408654c5234c7f45433521c977918057e330ddaa5fefa98c983ea7806d4f1f33c950112cbe66d013b
+
SOURCE_HASH=sha512:310741703912dd273458d0ecc4aca43af1735e15a19704e39b0c660212a34875e9c6086a325914d70d2373ff56b888acb4d925778db8cc3b9b2e8866e0a7b042
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://www.ffado.org
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index ad5d3ec..b54b043 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,6 @@
+2015-02-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.2.1
+
2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: libconfig

diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index aab46e9..ebe24e0 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,8 @@
+2015-02-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: Hack configure to not override PATH by prepending
+ /usr/bin and /usr/local/bin, which is redundant anyway and
+ makes it pick up the wrong qmake.
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/audio-soft/qjackctl/PRE_BUILD b/audio-soft/qjackctl/PRE_BUILD
index 4c4b784..5db59a9 100755
--- a/audio-soft/qjackctl/PRE_BUILD
+++ b/audio-soft/qjackctl/PRE_BUILD
@@ -1,5 +1,20 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p0 <<EOT &&
+--- configure.orig 2015-02-13 13:32:08.859414154 +0100
++++ configure 2015-02-13 13:33:06.921688275 +0100
+@@ -2363,7 +2363,9 @@
+
+
+ # Standard installation base dirs.
+-ac_with_paths="/usr /usr/local"
++# Do not override $PATH (/usr/bin/qt4)!
++#ac_with_paths="/usr /usr/local"
++ac_with_paths=""
+
+ ac_qtdirs="qt"
+
+EOT

if [[ $QJCTL_VCS == y ]]
then



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f210c886bdb7f486093c3746e698e5aaf5679261), Thomas Orgis, 02/13/2015

Archive powered by MHonArc 2.6.24.

Top of Page