Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ba2a2fd44c75c185419cf59b4458c77ff8e7e5bb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ba2a2fd44c75c185419cf59b4458c77ff8e7e5bb)
  • Date: Thu, 21 Oct 2010 04:31:09 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-drivers/dream/BUILD | 6 ++----
audio-drivers/dream/DETAILS | 10 +++++-----
audio-drivers/dream/HISTORY | 6 ++++++
audio-drivers/dream/PRE_BUILD | 5 +++++
audio-drivers/dream/gcc-4.5.patch | 10 ++++++++++
5 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 1e15b5dd5e2f410ba202e7ebdc8a0d82255f334a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-drivers/dream: version 1.12b

diff --git a/audio-drivers/dream/BUILD b/audio-drivers/dream/BUILD
index 2506794..1920cc9 100755
--- a/audio-drivers/dream/BUILD
+++ b/audio-drivers/dream/BUILD
@@ -1,4 +1,2 @@
-[ -f bootstrap ] && sh bootstrap
-sed -i 's,$QTDIR/bin,/usr/bin,' configure &&
-./configure $OPTS --prefix=$INSTALL_ROOT/usr --with-qtdir=/usr/include/qt
--without-faad2 &&
-make
+OPTS="$OPTS --with-qtdir=/usr/include/qt --disable-faad2" &&
+default_build
diff --git a/audio-drivers/dream/DETAILS b/audio-drivers/dream/DETAILS
index 2dfc6bb..2ad5a60 100755
--- a/audio-drivers/dream/DETAILS
+++ b/audio-drivers/dream/DETAILS
@@ -1,9 +1,9 @@
SPELL=dream
- VERSION=1.6.25
- SOURCE=drm-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/drm-$VERSION
- SOURCE_URL[0]=${SOURCEFORGE_URL}/drm/${SOURCE}
-
SOURCE_HASH=sha512:2a815a1d308c5a7162764bd0c45774ec6e1ffd6d6e6fb8d750e767988d6f7e513c00d997197a35f10d7e92a4bf6f3401b00992e4c7b74802042a71bb159c04ac
+ VERSION=1.12b
+ SOURCE=drm-${VERSION/\./-}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/drm
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/project/drm/drm/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:6cf6f4041f93e3cd5144b991136e03758c395e33754cdac23b435e411d015ef1bbfa75ed2f826e8b2fe9e6af74a593030a995e283278a6a674349f912119efbd
WEB_SITE=http://drm.sourceforge.net/
ENTERED=20041022
LICENSE[0]=GPL
diff --git a/audio-drivers/dream/HISTORY b/audio-drivers/dream/HISTORY
index aadc7e2..5dd022d 100644
--- a/audio-drivers/dream/HISTORY
+++ b/audio-drivers/dream/HISTORY
@@ -1,3 +1,9 @@
+2010-10-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.12b
+ * BUILD, PRE_BUILD: moved configure sediting to PRE_BUILD
+ * BUILD: use default_build
+ * PRE_BUILD, gcc-4.5.patch: fixed build issue with gcc 4.5
+
2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: new version, new url
* BUILD: fix qt path and disable faad2 - needs faad2 > 2.0
diff --git a/audio-drivers/dream/PRE_BUILD b/audio-drivers/dream/PRE_BUILD
new file mode 100755
index 0000000..15af771
--- /dev/null
+++ b/audio-drivers/dream/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch &&
+[ -f bootstrap ] && sh bootstrap &&
+sed -i 's,$QTDIR/bin,/usr/bin,' configure
diff --git a/audio-drivers/dream/gcc-4.5.patch
b/audio-drivers/dream/gcc-4.5.patch
new file mode 100644
index 0000000..71c0b12
--- /dev/null
+++ b/audio-drivers/dream/gcc-4.5.patch
@@ -0,0 +1,10 @@
+--- drm/common/datadecoding/journaline/NML.cpp.orig 2010-10-21
11:11:34.000000000 +0200
++++ drm/common/datadecoding/journaline/NML.cpp 2010-10-21 11:12:09.000000000
+0200
+@@ -69,6 +69,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <zlib.h>
++#include <cstdio>
+ #include "NML.h"
+ #include "Splitter.h"
+ #include "cpplog.h"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ba2a2fd44c75c185419cf59b4458c77ff8e7e5bb), Florian Franzmann, 10/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page