rpms/ardour/devel ardour-2.8-SConstruct.patch, NONE, 1.1 ardour-2.8-gcc44.patch, NONE, 1.1 ardour-2.8-session.cc-no_stomp.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 ardour.spec, 1.24, 1.25 sources, 1.11, 1.12 ardour-2.7-SConstruct.patch, 1.1, NONE ardour-2.7.1-gcc44.patch, 1.1, NONE ardour-session.cc-no_stomp.patch, 1.1, NONE ardour2.desktop, 1.2, NONE

Mon Mar 30 22:07:43 UTC 2009

Author: oget

Update of /cvs/pkgs/rpms/ardour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31620

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-2.8-SConstruct.patch ardour-2.8-gcc44.patch 
	ardour-2.8-session.cc-no_stomp.patch 
Removed Files:
	ardour-2.7-SConstruct.patch ardour-2.7.1-gcc44.patch 
	ardour-session.cc-no_stomp.patch ardour2.desktop 
Log Message:
* Mon Mar 30 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8-1
- New upstream release 2.8.
- Update scriptlets according to the new guidelines
- Enable SLV2 support
- Include mime type
- Minor fixes in the SPEC file


ardour-2.8-SConstruct.patch:

--- NEW FILE ardour-2.8-SConstruct.patch ---
diff -rupN ardour-2.8.old/SConstruct ardour-2.8/SConstruct
--- ardour-2.8.old/SConstruct	2009-03-26 17:12:56.000000000 -0400
+++ ardour-2.8/SConstruct	2009-03-30 14:56:27.000000000 -0400
@@ -49,6 +49,7 @@ opts.AddOptions(
     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'),
+    ('LIBDIR', 'Set librarydir (lib/lib64)', 'lib'),
     BoolOption('SURFACES', 'Build support for control surfaces', 1),
     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
     BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
@@ -743,13 +744,6 @@ if env['FPU_OPTIMIZATION']:
             print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, 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'
-else:
-    env['LIBDIR']='lib'
-
 #
 # no VST on x86_64
 #
@@ -793,18 +787,6 @@ env.Append(CONFIG_ARCH=config[config_arc
 if env['ARCH'] != '':
     opt_flags = env['ARCH'].split()
 
-#
-# prepend boiler plate optimization flags
-#
-
-opt_flags[:0] = [
-    "-O3",
-    "-fomit-frame-pointer",
-    "-ffast-math",
-    "-fstrength-reduce",
-    "-pipe"
-    ]
-
 if env['DEBUG'] == 1:
     env.Append(CCFLAGS=" ".join (debug_flags))
     env.Append(LINKFLAGS=" ".join (debug_flags))
@@ -1094,9 +1076,10 @@ if env['SYSLIBS']:
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()
-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-    # Comment the previous line and uncomment this for old versions of Debian:
-    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    if env['VST'] or not env['RUBBERBAND']:
+        #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+        # Comment the previous line and uncomment this for Debian:
+        libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',
@@ -1245,7 +1228,11 @@ else:
 # timestretch libraries
 #
 
-timefx_subdirs = ['libs/soundtouch']
+if not env['SYSLIBS'] and (env['VST'] or not env['RUBBERBAND']):
+   timefx_subdirs = ['libs/soundtouch']
+else:
+   timefx_subdirs = [ ]
+
 if env['RUBBERBAND']:
     timefx_subdirs += ['libs/rubberband']
 

ardour-2.8-gcc44.patch:

--- NEW FILE ardour-2.8-gcc44.patch ---
diff -rupN ardour-2.7.1.old/gtk2_ardour/actions.cc ardour-2.7.1/gtk2_ardour/actions.cc
--- ardour-2.7.1.old/gtk2_ardour/actions.cc	2008-06-29 14:12:44.000000000 -0400
+++ ardour-2.7.1/gtk2_ardour/actions.cc	2009-02-22 16:52:59.000000000 -0500
@@ -319,7 +319,7 @@ ActionManager::set_sensitive (vector<Ref
 void
 ActionManager::uncheck_toggleaction (const char * name)
 {
-	char *last_slash = strrchr (name, '/');
+	const char *last_slash = strrchr (name, '/');
 
 	if (last_slash == 0) {
 		fatal << string_compose (_("programmer error: %1 %2"), X_("illegal toggle action name"), name) << endmsg;
@@ -334,7 +334,7 @@ ActionManager::uncheck_toggleaction (con
 	memcpy (group_name, name + 10, len);
 	group_name[len] = '\0';
 
-	char* action_name = last_slash + 1;
+	const char* action_name = last_slash + 1;
 
         RefPtr<Action> act = get_action (group_name, action_name);
 	if (act) {
diff -rupN ardour-2.7.1.old/libs/midi++2/midi.cc ardour-2.7.1/libs/midi++2/midi.cc
--- ardour-2.7.1.old/libs/midi++2/midi.cc	2008-10-11 08:34:00.000000000 -0400
+++ ardour-2.7.1/libs/midi++2/midi.cc	2009-02-22 16:27:23.000000000 -0500
@@ -158,7 +158,7 @@ MIDI::byte 
 MIDI::decode_controller_name (const char *name)
 
 {
-	char *lparen;
+	const char *lparen;
 	size_t len;
 
 	if ((lparen = strrchr (name, '(')) != 0) {

ardour-2.8-session.cc-no_stomp.patch:

--- NEW FILE ardour-2.8-session.cc-no_stomp.patch ---
diff -rupN ardour-2.8.old/libs/ardour/session.cc ardour-2.8/libs/ardour/session.cc
--- ardour-2.8.old/libs/ardour/session.cc	2009-03-26 17:57:25.000000000 -0400
+++ ardour-2.8/libs/ardour/session.cc	2009-03-30 14:59:10.000000000 -0400
@@ -3886,7 +3886,8 @@ Session::ensure_passthru_buffers (uint32
 #endif			
 		_passthru_buffers.push_back (p);
 
-		*p = 0;
+		if (current_block_size > 0)
+		  *p = 0;
 		
 #ifdef NO_POSIX_MEMALIGN
 		p =  (Sample *) malloc(current_block_size * sizeof(Sample));
@@ -3901,7 +3902,8 @@ Session::ensure_passthru_buffers (uint32
 		memset (p, 0, sizeof (Sample) * current_block_size);
 		_silent_buffers.push_back (p);
 
-		*p = 0;
+		if (current_block_size > 0)
+		  *p = 0;
 		
 #ifdef NO_POSIX_MEMALIGN
 		p =  (Sample *) malloc(current_block_size * sizeof(Sample));


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Feb 2009 08:37:10 -0000	1.11
+++ .cvsignore	30 Mar 2009 22:07:42 -0000	1.12
@@ -1 +1 @@
-ardour-2.7.1.tar.bz2
+ardour-2.8.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ardour.spec	24 Feb 2009 01:40:56 -0000	1.24
+++ ardour.spec	30 Mar 2009 22:07:43 -0000	1.25
@@ -1,13 +1,12 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.7.1
-Release:       2%{?dist}
+Version:       2.8
+Release:       1%{?dist}
 Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
-Source1:       ardour2.desktop
 Source2:       ardour.script
-Patch0:        ardour-2.7-SConstruct.patch
-Patch1:        ardour-session.cc-no_stomp.patch
-Patch2:        ardour-2.7.1-gcc44.patch
+Patch0:        ardour-2.8-SConstruct.patch
+Patch1:        ardour-2.8-session.cc-no_stomp.patch
+Patch2:        ardour-2.8-gcc44.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
 License:       GPLv2+
@@ -27,15 +26,14 @@
 BuildRequires: libgnomecanvasmm26-devel >= 2.12
 BuildRequires: aubio-devel
 BuildRequires: libcurl-devel
+BuildRequires: slv2-devel
 Requires: hicolor-icon-theme
 
 BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
 
 # for upgrade path from CCRMA ardour2 packages:
 Provides: ardour2 = %{version}-%{release}
-Obsoletes: ardour2 < %{version}-%release}
+Obsoletes: ardour2 < %{version}-%{release}
 
 %description
 Ardour is a multichannel hard disk recorder (HDR) and digital audio
@@ -53,10 +51,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .SConstruct
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
+%patch0 -p1 -b .SConstruct
+%patch1 -p1 -b .no_stomp
+%patch2 -p1 -b .gcc44
+%patch3 -p0 -b .host.not.found
 
 # Fix encodings:
 iconv -f ISO-8859-1 -t UTF8 ardour.1.fr > ardour.1.fr.tmp
@@ -67,6 +65,7 @@
 mv -f ardour.1.ru.tmp ardour.1.ru
 
 %build
+echo "GenericName=Digital Audio Workstation" >> gtk2_ardour/ardour2.desktop.in
 # <sigh> ardours SConstruct script is a mess when it comes to determining
 # opt_flags, so we override the lot using the ARCH= and DIST_TARGET= options
 
@@ -84,7 +83,8 @@
 scons %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
       FREESOUND=1 \
       DIST_TARGET="${TARGETCPU}" \
-      ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math"
+      ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math" \
+      AUSTATE=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -94,25 +94,25 @@
 # Replace ardour2 with a script
 install -dm 755 $RPM_BUILD_ROOT%{_libexecdir}
 mv $RPM_BUILD_ROOT%{_bindir}/ardour2 $RPM_BUILD_ROOT%{_libexecdir}
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
-
-# install the templates
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
-cp templates/*.template $RPM_BUILD_ROOT%{_datadir}/%{name}/templates
-chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/*
+install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ardour2
 
 # copy icons to freedesktop locations
 for s in 16 22 32 48 ; do
     mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
     cp $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
-       $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour.png
+       $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour2.png
 done
 
 # install the desktop entry
+mv gtk2_ardour/ardour2.desktop{.in,}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora              \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  %{SOURCE1}
+  gtk2_ardour/ardour2.desktop
+
+# install mime entry
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages/
+install -p -m 0644 gtk2_ardour/ardour2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/
 
 # install the man pages
 install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -133,16 +133,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 fi
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f ardour.lang
 %defattr(-,root,root,-)
@@ -152,15 +157,22 @@
 %{_libexecdir}/ardour2
 %{_libdir}/ardour2/
 %{_datadir}/ardour2/
-%{_datadir}/ardour/
-%{_datadir}/icons/hicolor/*/apps/ardour.png
+%{_datadir}/icons/hicolor/*/apps/ardour2.png
 %{_datadir}/applications/fedora-ardour2.desktop
+%{_datadir}/mime/packages/ardour2.xml
 %{_mandir}/man1/ardour.1*
 %{_mandir}/es/man1/ardour.1*
 %{_mandir}/fr/man1/ardour.1*
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Mon Mar 30 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8-1
+- New upstream release 2.8.
+- Update scriptlets according to the new guidelines
+- Enable SLV2 support
+- Include mime type
+- Minor fixes in the SPEC file
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	23 Feb 2009 08:37:11 -0000	1.11
+++ sources	30 Mar 2009 22:07:43 -0000	1.12
@@ -1 +1 @@
-0fd4b1a600c75447d633b796bad321e1  ardour-2.7.1.tar.bz2
+24bd768dbe08f1f2724dc97704ee0518  ardour-2.8.tar.bz2


--- ardour-2.7-SConstruct.patch DELETED ---


--- ardour-2.7.1-gcc44.patch DELETED ---


--- ardour-session.cc-no_stomp.patch DELETED ---


--- ardour2.desktop DELETED ---


