Skip to Content.
Sympa Menu

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

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 (ea78795b10517891d454b64779c61e9cdf5d8235)
  • Date: Tue, 21 Dec 2010 03:15:53 -0600

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

audio-libs/soundtouch/DETAILS | 2 -
audio-libs/soundtouch/HISTORY | 4 +++
audio-libs/soundtouch/PRE_BUILD | 6 ++++-
audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig | 0
audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch | 11
++++++++++
dev/null |binary
6 files changed, 21 insertions(+), 2 deletions(-)

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

soundtouch: actually deleting the sig

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

soundtouch: disable assembly code on x86-64 as it still yields instant
segfault

diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index b51ebab..28dce2b 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -1,6 +1,6 @@
SPELL=soundtouch
VERSION=1.5.0
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:22725c62fd977657392dc9984b064a6d9d027bb3b9a32f3e149a276a08bf27210856ec3d1de13f5795cdf96f80da93b09416082e414ebdd5edc836a440bd1f32
SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 8431dd0..b396ead 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,7 @@
+2010-12-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * soundtouch-1.5.0-x86_64-asm-broken.patch, PRE_BUILD:
+ disable asm code on x86-64. It just segfaults.
+
2010-09-12 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 1.5.0 (needed to make it work on x86-64)
* soundtouch-1.4.0.tar.gz.sig: removed, switch to hash sum
diff --git a/audio-libs/soundtouch/PRE_BUILD b/audio-libs/soundtouch/PRE_BUILD
index 4030189..ed29005 100755
--- a/audio-libs/soundtouch/PRE_BUILD
+++ b/audio-libs/soundtouch/PRE_BUILD
@@ -1,5 +1,9 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Assembly code still broken on x86-64 ... instant segfault.
+# Got this patch idea from the ArchLinux folks.
+patch -Np0 < "$SCRIPT_DIRECTORY/soundtouch-1.5.0-x86_64-asm-broken.patch" &&

sed -i "s:COPYING.TXT
README.html:README.html\npkgdocdir=\$(datadir)/doc/soundtouch:" \
Makefile.am &&
diff --git a/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig
b/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig
deleted file mode 100644
index df8b1e0..0000000
Binary files a/audio-libs/soundtouch/soundtouch-1.4.0.tar.gz.sig and
/dev/null differ
diff --git a/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch
b/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch
new file mode 100644
index 0000000..07c6848
--- /dev/null
+++ b/audio-libs/soundtouch/soundtouch-1.5.0-x86_64-asm-broken.patch
@@ -0,0 +1,11 @@
+--- include/STTypes.h.orig 2010-12-21 09:52:30.000000000 +0100
++++ include/STTypes.h 2010-12-21 09:52:36.000000000 +0100
+@@ -87,7 +87,7 @@ namespace soundtouch
+
+ #endif
+
+- #if (WIN32 || __i386__ || __x86_64__)
++ #if (WIN32 || __i386__)
+ /// Define this to allow X86-specific assembler/intrinsic
optimizations.
+ /// Notice that library contains also usual C++ versions of each of
these
+ /// these routines, so if you're having difficulties getting the
optimized



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ea78795b10517891d454b64779c61e9cdf5d8235), Thomas Orgis, 12/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page