[arch-commits] Commit in ardour/trunk (PKGBUILD gcc46.patch raptor2.patch)
Ray Rashif
schiv at archlinux.org
Wed Sep 28 12:18:35 UTC 2011
Date: Wednesday, September 28, 2011 @ 08:18:35
Author: schiv
Revision: 138807
upgpkg: ardour 2.8.12-1
new upstream release; reverted to internal libs
Modified:
ardour/trunk/PKGBUILD
Deleted:
ardour/trunk/gcc46.patch
ardour/trunk/raptor2.patch
---------------+
PKGBUILD | 44 +++++++++++--------------------------------
gcc46.patch | 42 -----------------------------------------
raptor2.patch | 57 --------------------------------------------------------
3 files changed, 12 insertions(+), 131 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-09-28 11:36:57 UTC (rev 138806)
+++ PKGBUILD 2011-09-28 12:18:35 UTC (rev 138807)
@@ -8,65 +8,45 @@
# for fixed dependencies speaking in terms of versions
pkgname=ardour
-pkgver=2.8.11
-pkgrel=6
+pkgver=2.8.12
+pkgrel=1
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-8' 'liblo' 'aubio' 'libusb-compat'
- 'libgnomecanvasmm' 'soundtouch' 'slv2>=0.6.6-6')
- # -rubberband -libgnomecanvas(+libgnomecanvasmm)
+depends=('liblrdf>=0.4.0-8' 'liblo' 'libusb-compat'
+ 'libgnomecanvas' 'aubio' 'slv2>=0.6.6-6')
+ # -libgnomecanvas(+libgnomecanvasmm)
# +soundtouch (these +/- changes are for SYSLIBS)
# liblrdf versioned for https://bugs.archlinux.org/task/25005
# slv2 versioned for https://bugs.archlinux.org/task/25060
-makedepends=('scons' 'boost' 'pkg-config' 'cwiid')
+makedepends=('scons' 'boost' 'cwiid')
optdepends=('cwiid: Wiimote support')
changelog=${pkgname}.changelog
source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
- ${pkgname}.desktop
- gcc46.patch
- raptor2.patch)
-md5sums=('f451a8d0abc133a1700c3932e07a5612'
- '8aeaf433ebf781733db48e5a16b0c4da'
- 'd709add59911d099c813162448e4db99'
- 'a26a9bec0968fa0630c70f70c54f67de')
+ ${pkgname}.desktop)
+md5sums=('7c031892f53aeacf08a750fc320c79c5'
+ '8aeaf433ebf781733db48e5a16b0c4da')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # gcc 4.6 compatibility
- # http://tracker.ardour.org/view.php?id=3771
- patch -Np1 -i "$srcdir/gcc46.patch"
-
- # raptor2 compatibility
- # https://bugs.archlinux.org/task/25060
- # http://tracker.ardour.org/view.php?id=4179
- patch -Np0 -i "$srcdir/raptor2.patch"
-
sed -i '/-O3/d' SConstruct
- # use syslibs until internal sigc++ issue w/ latest gcc (?) resolves
- # TODO: report upstream
- scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
+ scons ${MAKEFLAGS} ARCH="${CFLAGS} -O3" \
PREFIX="/usr" \
DIST_LIBDIR="lib" \
FREEDESKTOP=0 \
FREESOUND=1 \
WIIMOTE=1 \
- SYSLIBS=1 \
+ SYSLIBS=0 \
DESTDIR="${pkgdir}"
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- scons PREFIX="/usr" \
- FREEDESKTOP=0 \
- FREESOUND=1 \
- WIIMOTE=1 \
- SYSLIBS=1 \
- DESTDIR="${pkgdir}" install
+ scons DESTDIR="${pkgdir}" install
# install some freedesktop.org compatibility
install -Dm644 "${srcdir}/${pkgname}.desktop" \
Deleted: gcc46.patch
===================================================================
--- gcc46.patch 2011-09-28 11:36:57 UTC (rev 138806)
+++ gcc46.patch 2011-09-28 12:18:35 UTC (rev 138807)
@@ -1,42 +0,0 @@
-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);
-
Deleted: raptor2.patch
===================================================================
--- raptor2.patch 2011-09-28 11:36:57 UTC (rev 138806)
+++ raptor2.patch 2011-09-28 12:18:35 UTC (rev 138807)
@@ -1,57 +0,0 @@
-Index: SConstruct
-===================================================================
---- SConstruct (revision 9877)
-+++ SConstruct (revision 9878)
-@@ -431,7 +431,6 @@
- 'gtk+-2.0' : '2.8.1',
- 'libxml-2.0' : '2.6.0',
- 'samplerate' : '0.1.0',
-- 'raptor' : '1.4.2',
- 'lrdf' : '0.4.0',
- 'jack' : '0.109.0',
- 'libgnomecanvas-2.0' : '2.0',
-@@ -487,7 +486,10 @@
-
- libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
-
--conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
-+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists,
-+ 'CheckPKGVersion' : CheckPKGVersion }
-+ )
-+
-
- if conf.CheckPKGExists ('fftw3f'):
- libraries['fftw3f'] = LibraryInfo()
-@@ -501,6 +503,22 @@
- libraries['aubio'] = LibraryInfo()
- libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
-
-+raptorOK = 0
-+
-+if conf.CheckPKGExists ('raptor2'):
-+ libraries['raptor'] = LibraryInfo()
-+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
-+ raptorOK = 1
-+else:
-+ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'):
-+ libraries['raptor'] = LibraryInfo()
-+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
-+ raptorOK = 1
-+
-+if raptorOK == 0:
-+ print "Ardour requires either raptor or raptor2 to be available at build time"
-+ Exit (1)
-+
- env = conf.Finish ()
-
- if env['FFT_ANALYSIS']:
-@@ -570,9 +588,6 @@
- libraries['lrdf'] = LibraryInfo()
- libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
-
--libraries['raptor'] = LibraryInfo()
--libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
--
- libraries['sndfile'] = LibraryInfo()
- libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
-
More information about the arch-commits
mailing list