Skip to Content.
Sympa Menu

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

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 (8c52fbb567b2f0f54699887958fc6b26cb752455)
  • Date: Mon, 18 Jan 2016 00:01:01 +0000

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

ChangeLog | 6 +++
FUNCTIONS | 71
++++++++++++++++++++++++++++++++++----
audio-libs/soundtouch/DETAILS | 4 +-
audio-libs/soundtouch/HISTORY | 5 ++
audio-libs/soundtouch/PRE_BUILD | 2 -
audio-libs/soundtouch/UP_TRIGGERS | 4 ++
6 files changed, 82 insertions(+), 10 deletions(-)

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

soundtouch: bump to 1.9.2, trigger for soversion change

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

FUNCTIONS: update trigger check helpers

diff --git a/ChangeLog b/ChangeLog
index 8a75e0c..5f91333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+
+2016-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: more helpers for triggering checks on incompatible
+ upgrades (is_version_between(), check_dependees(),
+ check_dependees_versionjump())
+
2016-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* kde5-apps/kdeconnect: added, connect to your phone

diff --git a/FUNCTIONS b/FUNCTIONS
index acb43eb..45b30be 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -750,6 +750,27 @@ function is_version_less() {
}

#---
+## Check if a version is between two others. The range is inclusive.
+## @param $1 - first bound
+## @param $2 - version that may be in between
+## @param $3 - second bound
+#---
+function is_version_between() {
+ # First check if the boundaries have been hit.
+ [[ "$1" == "$2" ]] && return
+ [[ "$2" == "$3" ]] && return
+ # Check both ascending and descending order.
+ # If $1 and $3 are equal, there cannot be anything in between.
+ if is_version_less "$1" "$3"; then
+ is_version_less "$1" "$2" &&
+ is_version_less "$2" "$3"
+ else
+ is_version_less "$3" "$2" &&
+ is_version_less "$3" "$1"
+ fi
+}
+
+#---
## Check sanity of a temporary partition
## @param $1 - the partition to check for
#---
@@ -803,6 +824,22 @@ function get_spell_provider_file(){
| grep "$3" | sort | head -n 1
}

+
+#---
+## Trigger checks on dependent spells. Used after checking if
+## an incompatible update is scheduled.
+## @params $1 - spell at hand
+#---
+function check_dependees()
+{
+ local spell=$1; shift
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
$spell." &&
+ message "Figuring out what spells need to be checked for
sanity...${DEFAULT_COLOR}" &&
+ for each in $(show_up_depends "$spell" 1); do
+ up_trigger $each check_self
+ done
+}
+
#---
## Trigger check_self on spells depending on the one at hand if it
## is being updated from an old version.
@@ -829,17 +866,39 @@ function check_dependees_on_update()
new_version=$(echo "$new_version" | "$@")
fi &&
if [[ "$new_version" != "$old_version" ]]; then
- message "${MESSAGE_COLOR}This is a possibly incompatible update of
$SPELL." &&
- message "Figuring out what spells need to be checked for
sanity...${DEFAULT_COLOR}" &&
-
- for each in $(show_up_depends $SPELL 1); do
- up_trigger $each check_self
- done
+ check_dependees "$spell"
fi
fi
}

#---
+## Trigger check_self on a certain version jump (known ABI breakage).
+## You know that a spell changed ABI most recently in version x, so you
+## provide this version and the function checks if updating the spell
+## crosses version x and hence dependees shall be triggered.
+## @params $1 - spell at hand
+## @params $2 - new version to be installed
+## @params $3 - version of last ABI breakage
+#---
+function check_dependees_versionjump()
+{
+ local spell=$1; shift;
+ local version=$1; shift;
+ local breaker;
+ if spell_ok "$spell"; then
+ local old_version=$(installed_version "$spell")
+ [[ "$old_version" == "$version" ]] && return
+ # Now, if the versions differ, check if the breaking version is crossed.
+ for breaker in "$@"; do
+ if is_version_between "$old_version" "$breaker" "$version"; then
+ check_dependees "$spell"
+ return
+ fi
+ done
+ fi
+}
+
+#---

. $GRIMOIRE/glselect.function
. $GRIMOIRE/bzr_download.function
diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index 7b2176a..4d117ce 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -1,7 +1,7 @@
SPELL=soundtouch
- VERSION=1.7.1
+ VERSION=1.9.2
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:92a9e2fb5e47f573771620f329e9193f559ff25ce21f16917479ff94e2aac1e3ebb79cb0fe1ae55d6505b40f694792e493b388470987fbe7a85505fd88e947cc
+
SOURCE_HASH=sha512:d8f3f8970198a46ef3dc252719749bc19cbd2f8de5e00eeb2874565bfc421b60d94d400bacf702591293e595edf6c1c35917b6153fd395cad8d6b03115da7068
SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://www.surina.net/soundtouch/
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index ee38a6f..68a6513 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,8 @@
+2016-01-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.9.2
+ * PRE_BUILD: pkgdocdir definition is already present
+ * UP_TRIGGERS: trigger for soversion change
+
2013-02-02 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS in
configure.ac to fix build with automake 1.13
diff --git a/audio-libs/soundtouch/PRE_BUILD b/audio-libs/soundtouch/PRE_BUILD
index 726da32..99e2ddd 100755
--- a/audio-libs/soundtouch/PRE_BUILD
+++ b/audio-libs/soundtouch/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-sed -i "s:COPYING.TXT
README.html:README.html\npkgdocdir=\$(datadir)/doc/soundtouch:" \
- Makefile.am &&
sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac &&

touch NEWS README AUTHORS ChangeLog &&
diff --git a/audio-libs/soundtouch/UP_TRIGGERS
b/audio-libs/soundtouch/UP_TRIGGERS
new file mode 100755
index 0000000..8588508
--- /dev/null
+++ b/audio-libs/soundtouch/UP_TRIGGERS
@@ -0,0 +1,4 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+# See
http://www.surina.net/soundtouch/soundtouch-abi-tracker/timeline/soundtouch/index.html,
+# soversion change with version 1.9.2 .
+check_dependees_versionjump $SPELL $VERSION 1.9.2



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8c52fbb567b2f0f54699887958fc6b26cb752455), Thomas Orgis, 01/17/2016

Archive powered by MHonArc 2.6.24.

Top of Page