cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ardour-2.8.16.

Browse Source 
Unbreak with new libsigc++.
This commit is contained in:
ajacoutot 2015-09-28 15:45:25 +00:00
parent c335e7dd0d
commit 866c17f98d
8 changed files with 90 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/ardour/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.17 2015/09/25 14:12:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2015/09/28 15:45:25 ajacoutot Exp $
BROKEN = needs patching to work with libsigc++ >=2.6.0
# XXX check if still needed at next update
CXXFLAGS += -std=c++11
ONLY_FOR_ARCHS = amd64 i386 powerpc
SHARED_ONLY = Yes
COMMENT = digital audio workstation
DISTNAME = ardour-2.8.14
DISTNAME = ardour-2.8.16
CATEGORIES = audio
HOMEPAGE = http://ardour.org
REVISION = 8
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@ -24,17 +24,25 @@ WANTLIB += glibmm-2.4 gmodule-2.0 gnomecanvas-2 gnomecanvasmm-2.6
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz
WANTLIB += jack lo lrdf m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs
WANTLIB += samplerate sigc-2.0 sndfile sndio stdc++ xcb xcb-render
WANTLIB += samplerate sigc-2.0 sndfile sndio xcb xcb-render
WANTLIB += xcb-shm xml2 xslt z expat graphite2
# Use mirrors as official site has click-through donation-request download.
MASTER_SITES = http://stsp.name/openbsd/distfiles/ \
http://pkgs.fedoraproject.org/repo/pkgs/ardour/ardour-2.8.14.tar.bz2/c79219ba10735d0b061d53a84ae611a4/
MASTER_SITES = http://pkgs.fedoraproject.org/repo/pkgs/ardour/${DISTNAME}${EXTRACT_SUFX}/5bafe41df00d25e7a357baaa1038f16d/
EXTRACT_SUFX = .tar.bz2
# Fix build with libsigc++ >= 2.6
MASTER_SITES0 = https://distfiles.bsdfrog.org/
PATCHFILES = ardour-sigc26.diff:0
MODULES = devel/gettext \
devel/scons
# c++11
MODULES += gcc4
MODGCC4_ARCHS= *
MODGCC4_LANGS= c++
NO_TEST= Yes
MODSCONS_ENV= CC="${CC}" \

6
audio/ardour/distinfo
View File

@ -1,2 +1,4 @@
SHA256 (ardour-2.8.14.tar.bz2) = 4H5IOhI1TADYIdr77F9dJpAGK3WCBdrOq3I78emmM/4=
SIZE (ardour-2.8.14.tar.bz2) = 2169985
SHA256 (ardour-2.8.16.tar.bz2) = N+4yEZuhBfoIg/qn4YxY7NUnaJRWjaIkpVTZ70kHXkA=
SHA256 (ardour-sigc26.diff) = SQC0RS07l7FM9uMG/61sLe8ULOVi+UxT3wdzPo4PPoA=
SIZE (ardour-2.8.16.tar.bz2) = 2169916
SIZE (ardour-sigc26.diff) = 182839

12
audio/ardour/patches/patch-SConstruct
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-SConstruct,v 1.2 2015/09/25 14:12:16 ajacoutot Exp $
--- SConstruct.orig Fri Jul 20 17:25:16 2012
+++ SConstruct Fri Sep 25 16:04:14 2015
$OpenBSD: patch-SConstruct,v 1.3 2015/09/28 15:45:25 ajacoutot Exp $
--- SConstruct.orig Sun Dec 2 20:19:45 2012
+++ SConstruct Mon Sep 28 10:35:37 2015
@@ -441,7 +441,6 @@ deps = \
'gtk+-2.0' : '2.8.1',
'libxml-2.0' : '2.6.0',
@ -56,7 +56,7 @@ $OpenBSD: patch-SConstruct,v 1.2 2015/09/25 14:12:16 ajacoutot Exp $
#
# warnings flags
@@ -929,6 +934,7 @@ libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk
@@ -930,6 +935,7 @@ libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk
env['RUBBERBAND'] = False
@ -64,7 +64,7 @@ $OpenBSD: patch-SConstruct,v 1.2 2015/09/25 14:12:16 ajacoutot Exp $
conf = Configure (env)
if conf.CheckHeader ('fftw3.h'):
@@ -1061,6 +1067,11 @@ elif conf.CheckCHeader('/System/Library/Frameworks/Cor
@@ -1062,6 +1068,11 @@ elif conf.CheckCHeader('/System/Library/Frameworks/Cor
env['SYSMIDI'] = 'CoreMIDI'
subst_dict['%MIDITAG%'] = "ardour"
subst_dict['%MIDITYPE%'] = "coremidi"
@ -76,7 +76,7 @@ $OpenBSD: patch-SConstruct,v 1.2 2015/09/25 14:12:16 ajacoutot Exp $
else:
print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
sys.exit (1)
@@ -1283,11 +1294,7 @@ subst_dict['%INSTALL_PREFIX%'] = install_prefix;
@@ -1284,11 +1295,7 @@ subst_dict['%INSTALL_PREFIX%'] = install_prefix;
subst_dict['%FINAL_PREFIX%'] = final_prefix;
subst_dict['%PREFIX%'] = final_prefix;

28
audio/ardour/patches/patch-gtk2_ardour_SConscript
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-gtk2_ardour_SConscript,v 1.2 2013/03/08 01:25:44 brad Exp $
--- gtk2_ardour/SConscript.orig Thu Apr 19 14:33:57 2012
+++ gtk2_ardour/SConscript Sat Jan 26 01:17:52 2013
$OpenBSD: patch-gtk2_ardour_SConscript,v 1.3 2015/09/28 15:45:25 ajacoutot Exp $
--- gtk2_ardour/SConscript.orig Sun Dec 2 20:43:52 2012
+++ gtk2_ardour/SConscript Mon Sep 28 10:48:48 2015
@@ -18,7 +18,7 @@ domain = 'gtk2_ardour'
gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2)
gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
-gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkardour.Append(CXXFLAGS="-DSIGCXX_DISABLE_DEPRECATED")
gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h
#gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
gtkardour.Append(PACKAGE=domain)
@@ -27,6 +27,8 @@ gtkardour.Append(POTFILE=domain + '.pot')
if gtkardour['IS_OSX']:
gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
@ -10,7 +19,16 @@ $OpenBSD: patch-gtk2_ardour_SConscript,v 1.2 2013/03/08 01:25:44 brad Exp $
gtkardour.Merge ([
libraries['ardour'],
libraries['ardour_cp'],
@@ -413,7 +415,7 @@ for style in ['', 'BOLD', 'ITALIC']:
@@ -58,7 +60,7 @@ gtkardour.Merge ([
libraries['boost']
])
-gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkmmtests.Append(CXXFLAGS="-DSIGCXX_DISABLE_DEPRECATED")
gtkmmtests.Merge ([
libraries['atkmm'],
@@ -415,7 +417,7 @@ for style in ['', 'BOLD', 'ITALIC']:
if env['GTKOSX']:
ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)
else:
@ -19,7 +37,7 @@ $OpenBSD: patch-gtk2_ardour_SConscript,v 1.2 2013/03/08 01:25:44 brad Exp $
ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
@@ -529,14 +531,9 @@ if env['FREEDESKTOP']:
@@ -531,14 +533,9 @@ if env['FREEDESKTOP']:
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))

15
audio/ardour/patches/patch-libs_ardour_SConscript
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-libs_ardour_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
--- libs/ardour/SConscript.orig Sat Aug 11 17:46:06 2012
+++ libs/ardour/SConscript Sat Aug 11 17:46:10 2012
$OpenBSD: patch-libs_ardour_SConscript,v 1.2 2015/09/28 15:45:25 ajacoutot Exp $
--- libs/ardour/SConscript.orig Sun Dec 2 20:44:18 2012
+++ libs/ardour/SConscript Mon Sep 28 10:48:48 2015
@@ -16,7 +16,7 @@ domain = 'libardour2'
ardour.Append(DOMAIN = domain, MAJOR = 2, MINOR = 0, MICRO = 0)
ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+ardour.Append(CXXFLAGS="-DSIGCXX_DISABLE_DEPRECATED")
ardour.Append(PACKAGE = domain)
ardour.Append(POTFILE = domain + '.pot')
@@ -327,7 +327,6 @@ ardour.Merge ([
libraries['lrdf'],
libraries['midi++2'],

15
audio/ardour/patches/patch-libs_midi++2_SConscript
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libs_midi++2_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
--- libs/midi++2/SConscript.orig Mon Jan 2 20:01:31 2012
+++ libs/midi++2/SConscript Mon Jan 2 20:05:13 2012
$OpenBSD: patch-libs_midi++2_SConscript,v 1.2 2015/09/28 15:45:25 ajacoutot Exp $
--- libs/midi++2/SConscript.orig Tue Feb 24 13:37:50 2009
+++ libs/midi++2/SConscript Mon Sep 28 10:48:48 2015
@@ -32,6 +32,7 @@ version.cc
sysdep_sources = Split ("""
alsa_sequencer_midiport.cc
@ -9,7 +9,7 @@ $OpenBSD: patch-libs_midi++2_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
""")
if env['SYSMIDI'] == 'CoreMIDI':
@@ -39,6 +40,9 @@ if env['SYSMIDI'] == 'CoreMIDI':
@@ -39,12 +40,15 @@ if env['SYSMIDI'] == 'CoreMIDI':
midi2.Append (CCFLAGS="-DWITH_COREMIDI")
midi2.Append (LINKFLAGS="-framework CoreMIDI")
midi2.Append (LINKFLAGS="-framework CoreFoundation")
@ -19,3 +19,10 @@ $OpenBSD: patch-libs_midi++2_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
else:
sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
midi2.Append (CCFLAGS="-DWITH_ALSA")
midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+midi2.Append(CCFLAGS="-DSIGCXX_DISABLE_DEPRECATED")
midi2.VersionBuild(['version.cc','midi++/version.h'], [])

25
audio/ardour/patches/patch-libs_pbd_SConscript
View File

@ -1,13 +1,22 @@
$OpenBSD: patch-libs_pbd_SConscript,v 1.1.1.1 2012/08/17 15:33:32 stsp Exp $
--- libs/pbd/SConscript.orig Wed Nov 23 15:08:24 2011
+++ libs/pbd/SConscript Sat Aug 11 15:12:45 2012
@@ -58,6 +58,9 @@ if conf.CheckCHeader('execinfo.h'):
$OpenBSD: patch-libs_pbd_SConscript,v 1.2 2015/09/28 15:45:25 ajacoutot Exp $
--- libs/pbd/SConscript.orig Sun Dec 2 20:15:35 2012
+++ libs/pbd/SConscript Mon Sep 28 10:48:48 2015
@@ -13,7 +13,7 @@ domain = 'libpbd'
pbd.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0)
pbd.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
pbd.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-pbd.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+pbd.Append(CXXFLAGS="-DSIGCXX_DISABLE_DEPRECATED")
pbd.Append(PACKAGE=domain)
pbd.Append(POTFILE=domain + '.pot')
@@ -57,6 +57,9 @@ if conf.CheckFunc('getmntent'):
if conf.CheckCHeader('execinfo.h'):
conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
pbd = conf.Finish()
+
+if libraries.has_key('execinfo'):
+ pbd.Merge([libraries['execinfo']])
+
pbd.Merge ([ libraries['sigc2'],
libraries['xml'],
libraries['glibmm2'],
libraries['boost'],

4
audio/ardour/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2012/08/18 08:50:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/09/28 15:45:25 ajacoutot Exp $
bin/ardour2
lib/ardour2/
@bin lib/ardour2/ardour-2.8.14
@bin lib/ardour2/ardour-2.8.16
lib/ardour2/engines/
lib/ardour2/engines/libclearlooks.so
lib/ardour2/libardour.so