Skip to Content.
Sympa Menu

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

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 (5b973795c0e382b1d945ca87e51af885fb560b52)
  • Date: Thu, 8 Sep 2011 01:32:28 -0500

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

audio-creation/ardour2/HISTORY | 4 ++
audio-creation/ardour2/PRE_BUILD | 1
audio-creation/ardour2/gcc46.patch | 53
+++++++++++++++++++++++++++++++++++++
audio-players/mpg123/DETAILS | 2 -
audio-players/mpg123/HISTORY | 3 ++
5 files changed, 62 insertions(+), 1 deletion(-)

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

ardour2: fix some gcc 4.6 build issues (long time ago, already:-/)

commit 715a10fb9a5ad10764639311c690d8a7639b6e0a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg123: bump to 1.13.4

diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index bea8e65..5e599a2 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -2,6 +2,10 @@
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)

+2011-04-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, gcc46.patch: fix build with stricter gcc
+ (patch mostly from http://tracker.ardour.org/view.php?id=3771)
+
2010-08-12 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 2.8.11

diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
index 7dc627e..f6e315a 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/mime.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/gcc46.patch" &&

sed -i "s:soundtouch-1.0:soundtouch-1.4:" SConstruct &&
# Brute force lib64 killing.
diff --git a/audio-creation/ardour2/gcc46.patch
b/audio-creation/ardour2/gcc46.patch
new file mode 100644
index 0000000..56761ae
--- /dev/null
+++ b/audio-creation/ardour2/gcc46.patch
@@ -0,0 +1,53 @@
+diff -ru ardour-2.8.11-orig/libs/sigc++2/sigc++/signal_base.h
ardour-2.8.11/libs/sigc++2/sigc++/signal_base.h
+--- ardour-2.8.11-orig/libs/sigc++2/sigc++/signal_base.h 2009-02-24
13:37:56.000000000 +0100
++++ ardour-2.8.11/libs/sigc++2/sigc++/signal_base.h 2011-04-25
00:11:21.000000000 +0200
+@@ -22,6 +22,7 @@
+ #define _SIGC_SIGNAL_BASE_H_
+
+ #include <list>
++#include <stddef.h> // for size_t
+ #include <sigc++config.h>
+ #include <sigc++/type_traits.h>
+ #include <sigc++/trackable.h>
+diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc
ardour-2.8.11/libs/ardour/enums.cc
+--- ardour-2.8.11.old/libs/ardour/enums.cc 2010-04-20 13:28:37.000000000
-0400
++++ ardour-2.8.11/libs/ardour/enums.cc 2011-02-13 11:23:02.000000000 -0500
+@@ -31,7 +31,8 @@
+
+ using namespace std;
+ using namespace PBD;
+-using namespace ARDOUR;
++namespace ARDOUR
++{
+
+ void
+ setup_enum_writer ()
+@@ -362,3 +363,5 @@ setup_enum_writer ()
+ REGISTER (_Track_FreezeState);
+
+ }
++
++}
+diff -rupN
ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h
ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h
+--- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h
2009-03-26 10:25:40.000000000 -0400
++++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h
2011-02-09 21:41:04.000000000 -0500
+@@ -19,6 +19,7 @@
+ #define RUBBERBAND_API_MAJOR_VERSION 2
+ #define RUBBERBAND_API_MINOR_VERSION 0
+
++#include <cstddef>
+ #include <vector>
+
+ /**
+diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc
ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc
+--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc 2009-02-24
07:38:19.000000000 -0500
++++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc 2011-02-13
11:23:24.000000000 -0500
+@@ -177,7 +177,7 @@ wiimote_discovery:
+ std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
+
+ while (!wiimote_handle && !main_thread_quit) {
+- bdaddr = *BDADDR_ANY;
++ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
+ callback_thread_registered_for_ardour = false;
+ wiimote_handle = cwiid_open(&bdaddr, 0);
+
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index e1ffef2..a14839e 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.13.3
+ VERSION=1.13.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 90187a2..56ffef1 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2011-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Update to 1.13.4
+
2011-04-22 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to 1.13.3




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5b973795c0e382b1d945ca87e51af885fb560b52), Thomas Orgis, 09/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page