Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (21b7adf2683d5cef103fe4a27f6c0ff88b7c8523)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (21b7adf2683d5cef103fe4a27f6c0ff88b7c8523)
  • Date: Sun, 13 Apr 2008 05:55:31 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-creation/hydrogen/HISTORY | 7 +++
audio-creation/hydrogen/PRE_BUILD | 4 +-
audio-creation/hydrogen/flac.patch | 24 ++++++++++++
audio-creation/hydrogen/gcc43.patch | 68
++++++++++++++++++++++++++++++++++
audio-libs/libsndfile/HISTORY | 6 +++
audio-libs/libsndfile/PRE_BUILD | 3 +
audio-libs/libsndfile/acinclude.patch | 18 +++++++++
7 files changed, 128 insertions(+), 2 deletions(-)

New commits:
commit 21b7adf2683d5cef103fe4a27f6c0ff88b7c8523
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hydrogen: Fixes Bug #14078 (thanks to Anthony Hillairet
<anthony AT hillairet.org>)

commit 34df35670fb7d9c03600787ca607e00461acc6d9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hydrogen: Compilation fixes for GCC 4.3.0

commit 7d8903dd9329337b9381df142ea6d3ed9846b8b6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libsndfile: +x on PROVIDES

commit 3990fa2ba64d9ef9bc741a8a6c0fcb27cafe41cd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libsndfile: Fix compilation with flac-1.1.4.patch

commit 2995f895242789e31bd1929dd551474cfcab3101
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libsndfile: Fix compilation with flac-1.1.4.patch

diff --git a/audio-creation/hydrogen/HISTORY b/audio-creation/hydrogen/HISTORY
index ea6700b..3f19189 100644
--- a/audio-creation/hydrogen/HISTORY
+++ b/audio-creation/hydrogen/HISTORY
@@ -1,3 +1,10 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ Apply flac.patch (Fixes Bug #14078
+ * gcc43.patch: Fixes for GCC 4.3.0
+ * flac.patch: Patch from Anthony Hillairet <anthony AT hillairet.org>
+ from Bug #14078 to fix compilation against flac
+
2006-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* BUILD: added sourcing of profile script for qt, a stab at fixing
#11821

diff --git a/audio-creation/hydrogen/PRE_BUILD
b/audio-creation/hydrogen/PRE_BUILD
index 4dbf107..9c79c43 100755
--- a/audio-creation/hydrogen/PRE_BUILD
+++ b/audio-creation/hydrogen/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch
+patch -p0 < $SCRIPT_DIRECTORY/gcc4.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/flac.patch
diff --git a/audio-creation/hydrogen/flac.patch
b/audio-creation/hydrogen/flac.patch
new file mode 100644
index 0000000..0e3e16e
--- /dev/null
+++ b/audio-creation/hydrogen/flac.patch
@@ -0,0 +1,24 @@
+From Anthony Hillairet <anthony AT hillairet.org>
+Bug http://bugs.sourcemage.org/show_bug.cgi?id=14078
+--
+diff -Naur hydrogen-0.9.3.orig/src/lib/FLACFile.cpp
hydrogen-0.9.3/src/lib/FLACFile.cpp
+--- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp 2008-04-13 10:49:49.000000000
+0000
++++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-04-13 10:49:01.000000000
+0000
+@@ -165,14 +165,13 @@
+ }
+
+ set_metadata_ignore_all();
+- set_filename( sFilename.c_str() );
+
+- State s=init();
+- if( s != FLAC__FILE_DECODER_OK ) {
++ FLAC__StreamDecoderInitStatus s = init(sFilename.c_str());
++ if( s != FLAC__STREAM_DECODER_INIT_STATUS_OK ) {
+ errorLog( "[load] Error in init()" );
+ }
+
+- if ( process_until_end_of_file() == false ) {
++ if ( process_until_end_of_stream() == false ) {
+ errorLog( "[load] Error in process_until_end_of_file()" );
+ }
+ }
diff --git a/audio-creation/hydrogen/gcc43.patch
b/audio-creation/hydrogen/gcc43.patch
new file mode 100644
index 0000000..b0f70b4
--- /dev/null
+++ b/audio-creation/hydrogen/gcc43.patch
@@ -0,0 +1,68 @@
+diff -Naur hydrogen-0.9.3.orig/src/gui/DrumkitManager.cpp
hydrogen-0.9.3/src/gui/DrumkitManager.cpp
+--- hydrogen-0.9.3.orig/src/gui/DrumkitManager.cpp 2008-04-13
10:29:07.000000000 +0000
++++ hydrogen-0.9.3/src/gui/DrumkitManager.cpp 2008-04-13 10:36:33.000000000
+0000
+@@ -22,6 +22,7 @@
+ *
+ */
+ #include <qcursor.h>
++#include <cstdlib>
+
+ #include "config.h"
+ #include "Skin.h"
+diff -Naur hydrogen-0.9.3.orig/src/gui/HydrogenApp.cpp
hydrogen-0.9.3/src/gui/HydrogenApp.cpp
+--- hydrogen-0.9.3.orig/src/gui/HydrogenApp.cpp 2008-04-13
10:29:07.000000000 +0000
++++ hydrogen-0.9.3/src/gui/HydrogenApp.cpp 2008-04-13 10:38:19.000000000
+0000
+@@ -51,6 +51,8 @@
+ #include <qhbox.h>
+ #include <qdir.h>
+
++#include <cstdlib>
++
+ HydrogenApp* HydrogenApp::m_pInstance = NULL;
+
+ HydrogenApp::HydrogenApp( MainForm *pMainForm, Song *pFirstSong )
+diff -Naur hydrogen-0.9.3.orig/src/gui/main.cpp
hydrogen-0.9.3/src/gui/main.cpp
+--- hydrogen-0.9.3.orig/src/gui/main.cpp 2008-04-13 10:29:07.000000000
+0000
++++ hydrogen-0.9.3/src/gui/main.cpp 2008-04-13 10:39:58.000000000 +0000
+@@ -43,6 +43,8 @@
+ #include "lib/Exception.h"
+
+ #include <iostream>
++#include <cstdlib>
++
+ using namespace std;
+
+ void showInfo();
+diff -Naur hydrogen-0.9.3.orig/src/lib/FLACFile.cpp
hydrogen-0.9.3/src/lib/FLACFile.cpp
+--- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp 2008-04-13 10:29:07.000000000
+0000
++++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-04-13 10:45:11.000000000
+0000
+@@ -27,6 +27,7 @@
+
+ #include <vector>
+ #include <fstream>
++#include <cstring>
+
+ #ifdef FLAC_SUPPORT
+
+diff -Naur hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp
hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp
+--- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp 2008-04-13
10:29:07.000000000 +0000
++++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp 2008-04-13
10:31:49.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include "../Preferences.h"
+
+ #include <pthread.h>
++#include <cstring>
+
+ audioProcessCallback ossDriver_audioProcessCallback;
+ bool ossDriver_running;
+diff -Naur hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp
hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp
+--- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp 2008-04-13
10:29:07.000000000 +0000
++++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp 2008-04-13
10:36:39.000000000 +0000
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <stdio.h>
++#include <cstdlib>
+ #include <string>
+
+ #include "lib/Hydrogen.h"
diff --git a/audio-libs/libsndfile/HISTORY b/audio-libs/libsndfile/HISTORY
index 416e03c..991651d 100644
--- a/audio-libs/libsndfile/HISTORY
+++ b/audio-libs/libsndfile/HISTORY
@@ -1,3 +1,9 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply acinclude.patch if applying flac-1.1.4.patch
+ * acinlcude.patch: flac-1.1.4.patch modifies configure.ac which
+ triggers a call to autoconf which fails with some undefined
+ _m4_divert_diversion. Remove the AC_MSG_WARN which calls this
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: removed is_depends_enabled.function reference

diff --git a/audio-libs/libsndfile/PRE_BUILD b/audio-libs/libsndfile/PRE_BUILD
index 0bd5608..7c805e2 100755
--- a/audio-libs/libsndfile/PRE_BUILD
+++ b/audio-libs/libsndfile/PRE_BUILD
@@ -4,5 +4,6 @@ cd "$SOURCE_DIRECTORY" &&
# Fix linking against flac >= 1.1.4
if is_depends_enabled $SPELL flac
then
- patch -p1 < "$SCRIPT_DIRECTORY/flac-1.1.4.patch"
+ patch -p1 < "$SCRIPT_DIRECTORY/flac-1.1.4.patch" &&
+ patch -p1 < $SCRIPT_DIRECTORY/acinclude.patch
fi
diff --git a/audio-libs/libsndfile/PROVIDES b/audio-libs/libsndfile/PROVIDES
old mode 100644
new mode 100755
diff --git a/audio-libs/libsndfile/acinclude.patch
b/audio-libs/libsndfile/acinclude.patch
new file mode 100644
index 0000000..b76da94
--- /dev/null
+++ b/audio-libs/libsndfile/acinclude.patch
@@ -0,0 +1,18 @@
+diff -Naur libsndfile-1.0.17.orig/acinclude.m4 libsndfile-1.0.17/acinclude.m4
+--- libsndfile-1.0.17.orig/acinclude.m4 2008-04-13 10:18:59.000000000
+0000
++++ libsndfile-1.0.17/acinclude.m4 2008-04-13 10:19:09.000000000 +0000
+@@ -265,13 +265,7 @@
+ else
+ ac_cv_c_big_endian=0
+ ac_cv_c_little_endian=0
+-
+-
AC_MSG_WARN([[*****************************************************************]])
+- AC_MSG_WARN([[*** Not able to determine endian-ness of target
processor. ]])
+- AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and
CPU_IS_LITTLE_ENDIAN in ]])
+- AC_MSG_WARN([[*** src/config.h may need to be hand editied.
]])
+-
AC_MSG_WARN([[*****************************************************************]])
+- fi
++fi
+
+ )# AC_C_FIND_ENDIAN
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (21b7adf2683d5cef103fe4a27f6c0ff88b7c8523), Eric Sandall, 04/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page