ports/158894: audio/ardour: upgrade to 2.8.11

Guido Falsi mad at madpilot.net
Thu Jul 14 12:30:15 UTC 2011 

>Number:         158894
>Category:       ports
>Synopsis:       audio/ardour: upgrade to 2.8.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 14 12:30:14 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 8.2-STABLE FreeBSD 8.2-STABLE #1: Mon Jun 6 20:10:31 CEST 2011 root at megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64

>Description:

Patch to update the audio/ardour port to the latest 2.8.11 version.

In this patch I did not touch the MASTER_SITES section. For the
time being it is necessary to manually fetch the distfile and put
it in the distfiles directory.

On the home page of the project there is a wrapper aound the source
code download with a request for founding from the author. I'm not
sure how this should be handled in the port.

One option would be to mark the port RESTRICTED explaining the
situation and asking users to go download manually and, as a
consequence, read the author's request for founds.

I'm not sure if mirroring the distfile is "politically correct"
towards the original author intent.

(if such an intent is to be thought as acceptable/good or not is
another matter on which I'm not expressing an opinion)

Another note: I could not test the port with the option "VST" turned
on because I don't have an i386 machine handy.

I hope the patch is appreciated and wait the maintainer's or some
committer opinion about the distfile matter.

>How-To-Repeat:
>Fix:

diff -ruN ardour.old/Makefile ardour/Makefile
--- ardour.old/Makefile	2011-07-14 14:01:29.380472727 +0200
+++ ardour/Makefile	2011-07-14 14:01:42.677557115 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ardour
-PORTVERSION=	2.8.2
-PORTREVISION=	4
+PORTVERSION=	2.8.11
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://freebsd.nsu.ru/distfiles/ \
diff -ruN ardour.old/distinfo ardour/distinfo
--- ardour.old/distinfo	2011-07-14 14:01:29.380472727 +0200
+++ ardour/distinfo	2011-07-14 14:01:42.678557809 +0200
@@ -1,2 +1,2 @@
-SHA256 (ardour-2.8.2.tar.bz2) = 659c4a50a2d045bdfd9b93ab7966726438a555f14d6122986acbd36c72d8fcc5
-SIZE (ardour-2.8.2.tar.bz2) = 3430971
+SHA256 (ardour-2.8.11.tar.bz2) = 6a743f42b795bb66179dd467c9b8e417e99d38fa915159155dd582709b563b73
+SIZE (ardour-2.8.11.tar.bz2) = 3322518
diff -ruN ardour.old/files/patch-SConstruct ardour/files/patch-SConstruct
--- ardour.old/files/patch-SConstruct	2011-07-14 14:01:29.376473023 +0200
+++ ardour/files/patch-SConstruct	2011-07-14 14:01:42.670557004 +0200
@@ -1,17 +1,17 @@
---- SConstruct.orig	2009-07-20 17:55:10.000000000 +0200
-+++ SConstruct	2009-09-15 12:54:21.000000000 +0200
-@@ -48,7 +48,7 @@
-     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
-     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
-     BoolOption('NLS', 'Set to turn on i18n support', 1),
--    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
-+    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate),
-     BoolOption('SURFACES', 'Build support for control surfaces', 1),
-     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
-     ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'),
-@@ -679,9 +679,9 @@
-     opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
-     opt_flags.extend (["-Os"])
+--- SConstruct.orig	2010-07-05 21:56:47.000000000 +0200
++++ SConstruct	2011-07-14 11:43:32.998491293 +0200
+@@ -36,7 +36,7 @@
+     ('PROGRAM_NAME', 'Set program name (default is "Ardour")', 'Ardour'),
+     ('DIST_LIBDIR', 'Explicitly set library dir. If not set, Fedora-style defaults are used (typically lib or lib64)', ''),
+     PathVariable('DESTDIR', 'Set the intermediate install "prefix"', '/'),
+-    PathVariable('PREFIX', 'Set the install "prefix"', '/usr/local'),
++    PathVariable('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate),
+     EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
+     BoolVariable('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
+     BoolVariable('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
+@@ -678,9 +678,9 @@
+     # 
+     opt_flags.extend ([ "-mcpu=7450", "-mcpu=7450" ])
  
 -elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none':
 +elif ((re.search ("i[0-9]86", env['DIST_TARGET']) != None) or (re.search ("x86_64", env['DIST_TARGET']) != None)):
@@ -21,21 +21,22 @@
      
      #
      # ARCH_X86 means anything in the x86 family from i386 to x86_64
-@@ -740,12 +740,7 @@
-             print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be anerror, especially if you are a package maintainer)"
- # end optimization section
- 
--# handle x86/x86_64 libdir properly
--
--if env['DIST_TARGET'] == 'x86_64':
--    env['LIBDIR']='lib64'
+@@ -741,13 +741,7 @@
+ 
+ # handle x86/x86_64 libdir properly
+ 
+-if env['DIST_LIBDIR'] == '':
+-    if env['DIST_TARGET'] == 'x86_64':
+-        env['LIBDIR']='lib64'
+-    else:
+-        env['LIBDIR']='lib'
 -else:
--    env['LIBDIR']='lib'
+-    env['LIBDIR'] = env['DIST_LIBDIR']
 +env['LIBDIR']='lib'
  
  #
  # no VST on x86_64
-@@ -794,13 +789,7 @@
+@@ -796,13 +790,7 @@
  # prepend boiler plate optimization flags
  #
  
@@ -46,11 +47,11 @@
 -    "-fstrength-reduce",
 -    "-pipe"
 -    ]
-+opt_flags[:0] = [ "%%CFLAGS%%" ];
++opt_flags[:0] = [ "-O2 -pipe -march=nocona -I/usr/local/include -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fno-strict-aliasing" ];
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -889,6 +878,7 @@
+@@ -902,6 +890,7 @@
  
  libraries['usb'] = LibraryInfo ()
  prep_libcheck(env, libraries['usb'])
@@ -58,7 +59,7 @@
  
  conf = Configure (libraries['usb'])
  if conf.CheckLib ('usb', 'usb_interrupt_write'):
-@@ -961,6 +951,7 @@
+@@ -954,6 +943,7 @@
  if env['LIBLO']:
      libraries['lo'] = LibraryInfo ()
      prep_libcheck(env, libraries['lo'])
@@ -66,7 +67,7 @@
  
      conf = Configure (libraries['lo'])
      if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -974,6 +965,7 @@
+@@ -967,6 +957,7 @@
  
  libraries['dmalloc'] = LibraryInfo ()
  prep_libcheck(env, libraries['dmalloc'])
@@ -74,7 +75,7 @@
  
  #
  # look for the threaded version
-@@ -1031,8 +1023,10 @@
+@@ -1024,8 +1015,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -87,7 +88,7 @@
  
  env = conf.Finish()
  
-@@ -1091,7 +1085,7 @@
+@@ -1076,7 +1069,7 @@
  
  #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
      libraries['soundtouch'] = LibraryInfo()
@@ -96,7 +97,7 @@
      # Comment the previous line and uncomment this for old versions of Debian:
      #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
  
-@@ -1321,8 +1315,8 @@
+@@ -1301,8 +1294,8 @@
      subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
      subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
  else:
diff -ruN ardour.old/files/patch-gtk2_ardour-ardour_ui.cc ardour/files/patch-gtk2_ardour-ardour_ui.cc
--- ardour.old/files/patch-gtk2_ardour-ardour_ui.cc	2011-07-14 14:01:29.362471404 +0200
+++ ardour/files/patch-gtk2_ardour-ardour_ui.cc	2011-07-14 14:01:42.668557850 +0200
@@ -1,6 +1,6 @@
---- gtk2_ardour/ardour_ui.cc.orig	Sat Mar 17 02:55:45 2007
-+++ gtk2_ardour/ardour_ui.cc	Sun Mar 18 14:44:03 2007
-@@ -28,6 +28,8 @@
+--- gtk2_ardour/ardour_ui.cc.orig	2010-05-12 03:50:11.000000000 +0200
++++ gtk2_ardour/ardour_ui.cc	2011-07-14 11:26:01.327917261 +0200
+@@ -31,6 +31,8 @@
  #include <iostream>
  
  #include <sys/resource.h>
@@ -9,7 +9,7 @@
  
  #include <gtkmm/messagedialog.h>
  #include <gtkmm/accelmap.h>
-@@ -456,8 +458,11 @@
+@@ -684,8 +686,11 @@
  		struct rlimit limits;
  		int64_t ram;
  		long pages, page_size;
@@ -22,12 +22,12 @@
  			ram = 0;
  		} else {
  			ram = (int64_t) pages * (int64_t) page_size;
-@@ -476,7 +481,7 @@
- 						     "This might cause Ardour to run out of memory before your system "
- 						     "runs out of memory. \n\n"
- 						     "You can view the memory limit with 'ulimit -l', "
--						     "and it is normally controlled by /etc/security/limits.conf"));
-+						     "and it is normally controlled by /etc/login.conf"));
- 				
+@@ -704,7 +709,7 @@
+ 								     "This might cause %1 to run out of memory before your system "
+ 								     "runs out of memory. \n\n"
+ 								     "You can view the memory limit with 'ulimit -l', "
+-								     "and it is normally controlled by /etc/security/limits.conf"), PROGRAM_NAME));
++								     "and it is normally controlled by /etc/login.conf"), PROGRAM_NAME));
+ 						   
  				VBox* vbox = msg.get_vbox();
  				HBox hbox;
diff -ruN ardour.old/pkg-plist ardour/pkg-plist
--- ardour.old/pkg-plist	2011-07-14 14:01:29.378473015 +0200
+++ ardour/pkg-plist	2011-07-14 14:01:42.675556285 +0200
@@ -1,6 +1,5 @@
 %%NO_VST%%bin/ardour2
 %%VST%%bin/ardourvst
-lib/ardour2/libsndfile-ardour.so
 lib/ardour2/libpbd.so
 lib/ardour2/libmidi++.so
 lib/ardour2/libardour.so
@@ -137,43 +136,49 @@
 share/ardour2/templates/8 Tracks.template
 @dirrm share/ardour2/templates
 @dirrm share/ardour2
-share/locale/el_GR/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/el_GR/LC_MESSAGES/libardour2.mo
-share/locale/el_GR/LC_MESSAGES/gtk2_ardour.mo
-share/locale/ru_RU/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/ru_RU/LC_MESSAGES/libardour2.mo
-share/locale/ru_RU/LC_MESSAGES/gtk2_ardour.mo
-share/locale/pt_BR/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/pt_BR/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/el/LC_MESSAGES/libardour2.mo
+share/locale/el/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/ru/LC_MESSAGES/libardour2.mo
+share/locale/ru/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt/LC_MESSAGES/gtk2_ardour.mo
 share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
-share/locale/es_ES/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/es_ES/LC_MESSAGES/gtk2_ardour.mo
-share/locale/fr_FR/LC_MESSAGES/gtk2_ardour.mo
-share/locale/it_IT/LC_MESSAGES/libardour2.mo
-share/locale/it_IT/LC_MESSAGES/gtk2_ardour.mo
-share/locale/sv_SE/LC_MESSAGES/libardour2.mo
-share/locale/sv_SE/LC_MESSAGES/gtk2_ardour.mo
-share/locale/de_DE/LC_MESSAGES/gtk2_ardour.mo
-share/locale/pl_PL/LC_MESSAGES/libardour2.mo
-share/locale/pl_PL/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/pl_PL/LC_MESSAGES/gtk2_ardour.mo
-share/locale/es_ES/LC_MESSAGES/libardour2.mo
-share/locale/fr_FR/LC_MESSAGES/libardour2.mo
-share/locale/cs_CZ/LC_MESSAGES/gtk2_ardour.mo
-share/locale/nn_NO/LC_MESSAGES/gtk2_ardour.mo
- at dirrmtry share/locale/pl_PL/LC_MESSAGES
- at dirrmtry share/locale/pl_PL
- at dirrmtry share/locale/it_IT/LC_MESSAGES
- at dirrmtry share/locale/it_IT
- at dirrmtry share/locale/sv_SE/LC_MESSAGES
- at dirrmtry share/locale/sv_SE
- at dirrmtry share/locale/el_GR/LC_MESSAGES
- at dirrmtry share/locale/el_GR
- at dirrmtry share/locale/ru_RU/LC_MESSAGES
- at dirrmtry share/locale/ru_RU
- at dirrmtry share/locale/de_DE/LC_MESSAGES
- at dirrmtry share/locale/de_DE
- at dirrmtry share/locale/cs_CZ/LC_MESSAGES
- at dirrmtry share/locale/cs_CZ
- at dirrmtry share/locale/nn_NO/LC_MESSAGES
- at dirrmtry share/locale/nn_NO
+share/locale/es/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/es/LC_MESSAGES/gtk2_ardour.mo
+share/locale/fr/LC_MESSAGES/gtk2_ardour.mo
+share/locale/it/LC_MESSAGES/libardour2.mo
+share/locale/it/LC_MESSAGES/gtk2_ardour.mo
+share/locale/sv/LC_MESSAGES/libardour2.mo
+share/locale/sv/LC_MESSAGES/gtk2_ardour.mo
+share/locale/de/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pl/LC_MESSAGES/libardour2.mo
+share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pl/LC_MESSAGES/gtk2_ardour.mo
+share/locale/es/LC_MESSAGES/libardour2.mo
+share/locale/fr/LC_MESSAGES/libardour2.mo
+share/locale/cs/LC_MESSAGES/gtk2_ardour.mo
+share/locale/nn/LC_MESSAGES/gtk2_ardour.mo
+share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/nn/LC_MESSAGES/libardour2.mo
+ at dirrmtry share/locale/pl/LC_MESSAGES
+ at dirrmtry share/locale/pl
+ at dirrmtry share/locale/it/LC_MESSAGES
+ at dirrmtry share/locale/it
+ at dirrmtry share/locale/sv/LC_MESSAGES
+ at dirrmtry share/locale/sv
+ at dirrmtry share/locale/el/LC_MESSAGES
+ at dirrmtry share/locale/el
+ at dirrmtry share/locale/ru/LC_MESSAGES
+ at dirrmtry share/locale/ru
+ at dirrmtry share/locale/de/LC_MESSAGES
+ at dirrmtry share/locale/de
+ at dirrmtry share/locale/cs/LC_MESSAGES
+ at dirrmtry share/locale/cs
+ at dirrmtry share/locale/nn/LC_MESSAGES
+ at dirrmtry share/locale/nn
+ at dirrmtry share/locale/pt/LC_MESSAGES
+ at dirrmtry share/locale/pt
+ at dirrmtry share/locale/pt_PT/LC_MESSAGES
+ at dirrmtry share/locale/pt_PT
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list