Date: Friday, July 8, 2011 @ 15:43:04
Author: schiv
Revision: 130903
upgpkg: ardour 2.8.11-4
fix build and segfault
Added:
ardour/trunk/gcc46.patch
Modified:
ardour/trunk/PKGBUILD
ardour/trunk/ardour.changelog
------------------+
PKGBUILD | 27 +++++++++++++++++++++------
ardour.changelog | 14 +++++++++++++-
gcc46.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-08 17:01:56 UTC (rev 130902)
+++ PKGBUILD 2011-07-08 19:43:04 UTC (rev 130903)
@@ -9,29 +9,41 @@
pkgname=ardour
pkgver=2.8.11
-pkgrel=3
+pkgrel=4
pkgdesc="A multichannel hard disk recorder and digital audio workstation"
arch=('i686' 'x86_64')
url="http://ardour.org";
license=('GPL')
-depends=('liblrdf>=0.4.0-7' 'liblo' 'aubio' 'libusb-compat'
- 'slv2>=0.6.6-3' 'rubberband' 'libgnomecanvas')
+depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat'
+ 'libgnomecanvasmm' 'soundtouch')
+ # -rubberband -libgnomecanvas(+libgnomecanvasmm)
+ # +soundtouch -slv2
makedepends=('scons' 'boost' 'pkg-config')
changelog=${pkgname}.changelog
source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
- ${pkgname}.desktop)
+ ${pkgname}.desktop
+ gcc46.patch)
md5sums=('f451a8d0abc133a1700c3932e07a5612'
- '8aeaf433ebf781733db48e5a16b0c4da')
+ '8aeaf433ebf781733db48e5a16b0c4da'
+ 'd709add59911d099c813162448e4db99')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # gcc 4.6 compatibility
+ patch -Np1 -i "$srcdir/gcc46.patch"
+
sed -i '/-O3/d' SConstruct
+ # use syslibs until internal sigc++ issue w/ latest gcc resolves
+ # TODO: report upstream
scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
PREFIX="/usr" \
DIST_LIBDIR="lib" \
FREEDESKTOP=0 \
FREESOUND=1 \
+ SYSLIBS=1 \
+ LV2=0 \
DESTDIR="${pkgdir}"
}
@@ -41,10 +53,13 @@
scons PREFIX="/usr" \
FREEDESKTOP=0 \
FREESOUND=1 \
+ SYSLIBS=1 \
+ LV2=0 \
DESTDIR="${pkgdir}" install
# install some freedesktop.org compatibility
- install -Dm644 "${srcdir}/${pkgname}.desktop"
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 "${srcdir}/${pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
}
# vim:set ts=2 sw=2 et:
Modified: ardour.changelog
===================================================================
--- ardour.changelog 2011-07-08 17:01:56 UTC (rev 130902)
+++ ardour.changelog 2011-07-08 19:43:04 UTC (rev 130903)
@@ -1,7 +1,18 @@
+9 Jul 2011 (GMT+8) Ray Rashif <sc...@archlinux.org>
+
+ * 2.8.11-4:
+ Fix build failures and runtime segfaults
+ - gcc 4.6 patch
+ - enable SYSLIBS due to ardour sigc++ issues
+ - remove slv2 dep due to ardour rasqal incompatibility [1][2]
+
+ [1] https://bugs.archlinux.org/task/25060
+ [2] https://ardour.org/node/4301
+
22 Feb 2011 (GMT+8) Ray Rashif <sc...@archlinux.org>
* 2.8.11-2 :
- raptor rebuild
+ raptor rebuild
9 Aug 2010 (GMT+8) Ray Rashif <sc...@archlinux.org>
@@ -21,6 +32,7 @@
* ardour.changelog :
Added this changelog.
+ Only important changes will be logged.
* ardour.install :
Removed install scriptlet; old and deprecated information.
Added: gcc46.patch
===================================================================
--- gcc46.patch (rev 0)
+++ gcc46.patch 2011-07-08 19:43:04 UTC (rev 130903)
@@ -0,0 +1,42 @@
+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);
+
