pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ardour: Initial cleanup before inport

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 19 13:21:12 2016 +0200
Changeset:	62022969365429f12826c96a3b952c7981b18a5d

Modified Files:
	ardour/PLIST
	ardour/distinfo
	ardour/options.mk
	ardour/patches/patch-gtk2__ardour_ardour.sh.in
	ardour/patches/patch-libs_ardour_session__state.cc
	ardour/patches/patch-libs_ardouralsautil_wscript
	ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc
	ardour/patches/patch-libs_backends_jack_wscript
	ardour/patches/patch-libs_fst_wscript
	ardour/patches/patch-libs_pbd_fpu.cc
	ardour/patches/patch-libs_pbd_mountpoint.cc
	ardour/patches/patch-libs_pbd_wscript
	ardour/patches/patch-libs_vfork_wscript
	ardour/patches/patch-wscript
Removed Files:
	ardour/patches/patch-libs_backends_alsa_alsa__audiobackend.h
	ardour/patches/patch-libs_backends_jack_jack__utils.cc

Log Message:
ardour: Initial cleanup before inport

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=62022969365429f12826c96a3b952c7981b18a5d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ardour/PLIST                                       | 13 ++++++++----
 ardour/distinfo                                    | 24 ++++++++++------------
 ardour/options.mk                                  | 17 ++++++++++-----
 ardour/patches/patch-gtk2__ardour_ardour.sh.in     |  2 ++
 ardour/patches/patch-libs_ardour_session__state.cc |  2 ++
 ardour/patches/patch-libs_ardouralsautil_wscript   | 12 ++++-------
 .../patch-libs_backends_alsa_alsa__audiobackend.h  |  0
 .../patch-libs_backends_alsa_zita-alsa-pcmi.cc     |  4 ++++
 .../patch-libs_backends_jack_jack__utils.cc        |  9 --------
 ardour/patches/patch-libs_backends_jack_wscript    |  6 ++++--
 ardour/patches/patch-libs_fst_wscript              |  9 +++-----
 ardour/patches/patch-libs_pbd_fpu.cc               |  2 ++
 ardour/patches/patch-libs_pbd_mountpoint.cc        |  2 ++
 ardour/patches/patch-libs_pbd_wscript              |  9 +++-----
 ardour/patches/patch-libs_vfork_wscript            |  9 +++-----
 ardour/patches/patch-wscript                       | 19 ++++++++++-------
 16 files changed, 73 insertions(+), 66 deletions(-)

diffs:
diff --git a/ardour/PLIST b/ardour/PLIST
index c25e694..fee6618 100644
--- a/ardour/PLIST
+++ b/ardour/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
 bin/ardour4
-bin/ardour4-export
+${PLIST.dummy}bin/ardour4-export
 etc/ardour4/ardour.menus
 etc/ardour4/clearlooks.rc
 etc/ardour4/dark.colors
@@ -17,12 +17,17 @@ lib/ardour4/LV2/reasonablesynth.lv2/reasonablesynth.ttl
 lib/ardour4/${PKGNAME}.0
 lib/ardour4/ardour-exec-wrapper
 lib/ardour4/ardour-vst-scanner
-lib/ardour4/backends/libdummy_audiobackend.so
+${PLIST.alsa}lib/ardour4/backends/libalsa_audiobackend.so
+${PLIST.dummy}lib/ardour4/backends/libdummy_audiobackend.so
+${PLIST.jack}lib/ardour4/backends/libjack_audiobackend.so
 lib/ardour4/engines/libclearlooks.so
 lib/ardour4/h${PKGNAME}.0
 lib/ardour4/libardour.so
 lib/ardour4/libardour.so.3
 lib/ardour4/libardour.so.3.0.0
+${PLIST.alsa}lib/ardour4/libardouralsautil.so
+${PLIST.alsa}lib/ardour4/libardouralsautil.so.0
+${PLIST.alsa}lib/ardour4/libardouralsautil.so.0.0.1
 lib/ardour4/libardourcp.so
 lib/ardour4/libaudiographer.so
 lib/ardour4/libaudiographer.so.0
@@ -58,8 +63,8 @@ lib/ardour4/surfaces/libardour_faderport.so
 lib/ardour4/surfaces/libardour_generic_midi.so
 lib/ardour4/surfaces/libardour_mcp.so
 lib/ardour4/surfaces/libardour_osc.so
-lib/ardour4/utils/ardour-util.sh
-lib/ardour4/utils/ardour4-export
+${PLIST.dummy}lib/ardour4/utils/ardour-util.sh
+${PLIST.dummy}lib/ardour4/utils/ardour4-export
 lib/ardour4/vamp/libardourvampplugins.so
 lib/ardour4/vamp/libardourvampplugins.so.0
 lib/ardour4/vamp/libardourvampplugins.so.0.0.0
diff --git a/ardour/distinfo b/ardour/distinfo
index f5fec75..24debcd 100644
--- a/ardour/distinfo
+++ b/ardour/distinfo
@@ -4,16 +4,14 @@ SHA1 (ardour-4.7.tar.gz) = 95047ccb3fc599ce11c473a0fd7f1eb012c3e440
 RMD160 (ardour-4.7.tar.gz) = 366f7057fab9878ac425dd70a751899984abc030
 SHA512 (ardour-4.7.tar.gz) = 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
 Size (ardour-4.7.tar.gz) = 9863149 bytes
-SHA1 (patch-gtk2__ardour_ardour.sh.in) = f0d90933665ad0fdf816eafc7d13143f244fee1b
-SHA1 (patch-libs_ardour_session__state.cc) = a1966a289db67c4ddadffe68e681827720f61f8c
-SHA1 (patch-libs_ardouralsautil_wscript) = b5efaa7f83995da47cf807dedd063293baa61739
-SHA1 (patch-libs_backends_alsa_alsa__audiobackend.h) = da39a3ee5e6b4b0d3255bfef95601890afd80709
-SHA1 (patch-libs_backends_alsa_zita-alsa-pcmi.cc) = d988e72154536b759579c5bd515d74e3a849b569
-SHA1 (patch-libs_backends_jack_jack__utils.cc) = ca7d745eb75a5ad114d94d9c66f61ef481d9a5d4
-SHA1 (patch-libs_backends_jack_wscript) = f591b2351af7f6d08542484a3f9e2532f87cbac7
-SHA1 (patch-libs_fst_wscript) = fe13abd4f13cf3bc044b2f91adf17a4722b361ec
-SHA1 (patch-libs_pbd_fpu.cc) = bec4f67f8b52482b5b1cf582a4631c335efec8c7
-SHA1 (patch-libs_pbd_mountpoint.cc) = 1c19b7fd593dbc9773a0e344b543e5842c8880a4
-SHA1 (patch-libs_pbd_wscript) = 9af54613ec93752f643371568656ff9a1ff04a84
-SHA1 (patch-libs_vfork_wscript) = 37186271aaaffd82c4bafcb70218d9bc68648a4f
-SHA1 (patch-wscript) = 4350b98cf873515c811be3875c072e3295aba8fc
+SHA1 (patch-gtk2__ardour_ardour.sh.in) = dc175db3f0375f18662baf2219be3f999158c17c
+SHA1 (patch-libs_ardour_session__state.cc) = 168f67f4af32181d2e3d85d2759383f9acfcbf29
+SHA1 (patch-libs_ardouralsautil_wscript) = d0ce5b6683018760c68d39ad49229904c57f8f7a
+SHA1 (patch-libs_backends_alsa_zita-alsa-pcmi.cc) = bb9efc33e62e840ba253031b60d4de323b7c3e21
+SHA1 (patch-libs_backends_jack_wscript) = a048453911b72c9005a5821a5227443e9f78c2e6
+SHA1 (patch-libs_fst_wscript) = b94e18a903fe3fc0bc71edefa1fd690adc17ee6d
+SHA1 (patch-libs_pbd_fpu.cc) = ebdb6d345bf2e3db0402165412978cb1c9043950
+SHA1 (patch-libs_pbd_mountpoint.cc) = 001b8112c08086d32989c82ab699335ecb92ede6
+SHA1 (patch-libs_pbd_wscript) = 0caa774358b511d9790e146e92454a0c34a8d5ef
+SHA1 (patch-libs_vfork_wscript) = 1d357b3bed8a2006cdc50fcdfa387ebca8c699c7
+SHA1 (patch-wscript) = 026e2ad811e2907cfd1d9100b4eb131cc3cf7d31
diff --git a/ardour/options.mk b/ardour/options.mk
index b5814c2..6566866 100644
--- a/ardour/options.mk
+++ b/ardour/options.mk
@@ -5,21 +5,28 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.ardour
 PKG_SUPPORTED_OPTIONS=	alsa jack dummy
 PKG_SUGGESTED_OPTIONS=	alsa jack
 
+PLIST_VARS=		alsa jack dummy
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)
 .include "../../audio/alsa-lib/buildlink3.mk"
-WAF_ARGS+=      --with-backends=alsa
+ARDOUR_BACKENDS_ALSA=	yes
+PLIST.alsa=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mjack)
 .include "../../audio/jack/buildlink3.mk"
-WAF_ARGS+=      --with-backends=jack
+ARDOUR_BACKENDS_JACK=	yes
+PLIST.jack=	yes
 .endif
 
 # Useful for developers
-.if !empty(PKG_OPTIONS:Mjack)
-WAF_ARGS+=      --with-backends=dummy
+.if !empty(PKG_OPTIONS:Mdummy)
+ARDOUR_BACKENDS_DUMMY=	yes
+PLIST.dummy=	yes
 .endif
 
-WAF_ARGS+=      --with-backends=alsa,jack,dummy
+ARDOUR_BACKENDS=	${ARDOUR_BACKENDS_ALSA:Dalsa},${ARDOUR_BACKENDS_JACK:Djack},${ARDOUR_BACKENDS_DUMMY:Ddummy}
+
+WAF_ARGS+=      --with-backends=${ARDOUR_BACKENDS:S/,$//}
diff --git a/ardour/patches/patch-gtk2__ardour_ardour.sh.in b/ardour/patches/patch-gtk2__ardour_ardour.sh.in
index 5b51b32..31bb90f 100644
--- a/ardour/patches/patch-gtk2__ardour_ardour.sh.in
+++ b/ardour/patches/patch-gtk2__ardour_ardour.sh.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix ldd(1) parsing on NetBSD.
+
 --- gtk2_ardour/ardour.sh.in.orig	2016-02-19 01:28:56.000000000 +0000
 +++ gtk2_ardour/ardour.sh.in
 @@ -23,7 +23,7 @@ fi
diff --git a/ardour/patches/patch-libs_ardour_session__state.cc b/ardour/patches/patch-libs_ardour_session__state.cc
index 67d1a99..bb9f0e3 100644
--- a/ardour/patches/patch-libs_ardour_session__state.cc
+++ b/ardour/patches/patch-libs_ardour_session__state.cc
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Detect free space on NetBSD.
+
 --- libs/ardour/session_state.cc.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/ardour/session_state.cc
 @@ -2180,7 +2180,7 @@ Session::save_template (string template_
diff --git a/ardour/patches/patch-libs_ardouralsautil_wscript b/ardour/patches/patch-libs_ardouralsautil_wscript
index 869eed3..5f38b37 100644
--- a/ardour/patches/patch-libs_ardouralsautil_wscript
+++ b/ardour/patches/patch-libs_ardouralsautil_wscript
@@ -1,25 +1,21 @@
 $NetBSD$
 
+Add support for NetBSD.
+
 --- libs/ardouralsautil/wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/ardouralsautil/wscript
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- from waflib.extras import autowaf as autowaf
- from waflib import Options
- import os
 @@ -17,12 +17,12 @@ def options(opt):
  
  def configure(conf):
      autowaf.configure(conf)
 -    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
-+    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and not sys.platform.startswith('netbsd'):
++    if (re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw') or sys.platform.startswith('netbsd'):
          autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
          autowaf.check_pkg(conf, 'dbus-1', uselib_store='DBUS', mandatory = False)
  
  def build(bld):
 -    if re.search ("linux", sys.platform) != None:
-+    if re.search ("linux", sys.platform) != None and not sys.platform.startswith('netbsd'):
++    if re.search ("linux", sys.platform) != None or sys.platform.startswith('netbsd'):
          if bld.is_defined('HAVE_ALSA'):
              obj = bld(features = 'cxx cxxshlib')
              obj.source = [
diff --git a/ardour/patches/patch-libs_backends_alsa_alsa__audiobackend.h b/ardour/patches/patch-libs_backends_alsa_alsa__audiobackend.h
deleted file mode 100644
index e69de29..0000000
diff --git a/ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc b/ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc
index b4b8239..de2113c 100644
--- a/ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc
+++ b/ardour/patches/patch-libs_backends_alsa_zita-alsa-pcmi.cc
@@ -1,5 +1,9 @@
 $NetBSD$
 
+Add support for NetBSD:
+- ppoll() on Linux is close to pollts(2) on NetBSD
+- NetBSD ships with <sys/endian.h>, not <endian.h>
+
 --- libs/backends/alsa/zita-alsa-pcmi.cc.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/backends/alsa/zita-alsa-pcmi.cc
 @@ -18,7 +18,11 @@
diff --git a/ardour/patches/patch-libs_backends_jack_jack__utils.cc b/ardour/patches/patch-libs_backends_jack_jack__utils.cc
deleted file mode 100644
index d27f2d4..0000000
--- a/ardour/patches/patch-libs_backends_jack_jack__utils.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
---- libs/backends/jack/jack_utils.cc.orig	2016-02-19 01:28:56.000000000 +0000
-+++ libs/backends/jack/jack_utils.cc
-@@ -982,4 +982,3 @@ ARDOUR::set_midi_option (ARDOUR::JackCom
- 
- 	return -1;
- }
--
diff --git a/ardour/patches/patch-libs_backends_jack_wscript b/ardour/patches/patch-libs_backends_jack_wscript
index 4d75783..4291e7e 100644
--- a/ardour/patches/patch-libs_backends_jack_wscript
+++ b/ardour/patches/patch-libs_backends_jack_wscript
@@ -1,6 +1,8 @@
 $NetBSD$
 
---- libs/backends/jack/wscript.orig	2016-06-19 10:00:50.209065188 +0000
+ALSA is supported on NetBSD
+
+--- libs/backends/jack/wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/backends/jack/wscript
 @@ -110,9 +110,8 @@ def build(bld):
  
@@ -11,6 +13,6 @@ $NetBSD$
      #
  
 -    if re.search ("linux", sys.platform) != None:
-+    if re.search ("linux", sys.platform) != None and not sys.platform.startswith('netbsd'):
++    if re.search ("linux", sys.platform) != None or sys.platform.startswith('netbsd'):
         obj.uselib += [ 'ALSA' ]
 -
diff --git a/ardour/patches/patch-libs_fst_wscript b/ardour/patches/patch-libs_fst_wscript
index fb53fa5..a7fa449 100644
--- a/ardour/patches/patch-libs_fst_wscript
+++ b/ardour/patches/patch-libs_fst_wscript
@@ -1,13 +1,10 @@
 $NetBSD$
 
+There are problems with C++11 heavy code on NetBSD when building against _POSIX_SOURCE.
+Fix it by using _NETBSD_SOURCE.
+
 --- libs/fst/wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/fst/wscript
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- from waflib.extras import autowaf as autowaf
- from waflib import Options, TaskGen
- import waflib.Logs as Logs, waflib.Utils as Utils
 @@ -83,6 +83,7 @@ def build(bld):
      obj.includes  = [ '../pbd/', '../ardour/', '.' ]
      obj.defines = [
diff --git a/ardour/patches/patch-libs_pbd_fpu.cc b/ardour/patches/patch-libs_pbd_fpu.cc
index c6af5ab..b4fca00 100644
--- a/ardour/patches/patch-libs_pbd_fpu.cc
+++ b/ardour/patches/patch-libs_pbd_fpu.cc
@@ -1,5 +1,7 @@
 $NetBSD$
 
+There are problems with C++11 heavy code on NetBSD when building against _XOPEN_SOURCE.
+
 --- libs/pbd/fpu.cc.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/pbd/fpu.cc
 @@ -19,7 +19,9 @@
diff --git a/ardour/patches/patch-libs_pbd_mountpoint.cc b/ardour/patches/patch-libs_pbd_mountpoint.cc
index 41ed729..a4b57d9 100644
--- a/ardour/patches/patch-libs_pbd_mountpoint.cc
+++ b/ardour/patches/patch-libs_pbd_mountpoint.cc
@@ -1,5 +1,7 @@
 $NetBSD$
 
+NetBSD uses statvfs for the functionality of statfs on Linux.
+
 --- libs/pbd/mountpoint.cc.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/pbd/mountpoint.cc
 @@ -116,7 +116,11 @@ mountpoint (string path)
diff --git a/ardour/patches/patch-libs_pbd_wscript b/ardour/patches/patch-libs_pbd_wscript
index 150bfdf..a4a0d82 100644
--- a/ardour/patches/patch-libs_pbd_wscript
+++ b/ardour/patches/patch-libs_pbd_wscript
@@ -1,13 +1,10 @@
 $NetBSD$
 
+There are problems with C++11 heavy code on NetBSD when building against _XOPEN_SOURCE.
+Fix it by using _NETBSD_SOURCE.
+
 --- libs/pbd/wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/pbd/wscript
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- from waflib.extras import autowaf as autowaf
- from waflib import Options
- from waflib import TaskGen
 @@ -97,7 +97,7 @@ def configure(conf):
      conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False)
      conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
diff --git a/ardour/patches/patch-libs_vfork_wscript b/ardour/patches/patch-libs_vfork_wscript
index d73682d..00ae45c 100644
--- a/ardour/patches/patch-libs_vfork_wscript
+++ b/ardour/patches/patch-libs_vfork_wscript
@@ -1,13 +1,10 @@
 $NetBSD$
 
+There are problems with C++11 heavy code on NetBSD when building against
+_POSIX_SOURCE and _XOPEN_SOURCE. Fix it by using _NETBSD_SOURCE.
+
 --- libs/vfork/wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ libs/vfork/wscript
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- from waflib.extras import autowaf as autowaf
- from waflib import TaskGen
- import os
 @@ -25,4 +25,5 @@ def build(bld):
      obj.defines = [
              '_POSIX_SOURCE',
diff --git a/ardour/patches/patch-wscript b/ardour/patches/patch-wscript
index 6f904c5..e6ddf3f 100644
--- a/ardour/patches/patch-wscript
+++ b/ardour/patches/patch-wscript
@@ -1,20 +1,25 @@
 $NetBSD$
 
+ALSA and PortAudio are supported on NetBSD.
+
 --- wscript.orig	2016-02-19 01:28:56.000000000 +0000
 +++ wscript
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- from waflib.extras import autowaf as autowaf
- from waflib import Options
- import os
+@@ -924,7 +924,7 @@ def configure(conf):
+                   okmsg = 'ok',
+                   errmsg = 'too old\nPlease install boost version 1.39 or higher.')
+ 
+-    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw':
++    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' or sys.platform.startswith('netbsd'):
+         autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
+ 
+     autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True)
 @@ -1093,16 +1093,16 @@ int main () { return 0; }
      conf.env['BUILD_PABACKEND'] = any('portaudio' in b for b in backends)
      conf.env['BUILD_CORECRAPPITA'] = any('coreaudio' in b for b in backends)
  
 -    if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']:
 -        print("PortAudio Backend is not for Linux")
-+    if re.search ("linux", sys.platform) != None and not sys.platform.startswith('netbsd') and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']:
++    if (re.search ("linux", sys.platform) != None or sys.platform.startswith('netbsd')) and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']:
 +        print("PortAudio Backend is not for Linux/NetBSD")
          sys.exit(1)
Home | Main Index | Thread Index | Old Index