rpms/ardour/devel ardour-0.9beta11.2-cerrno.patch, NONE, 1.1 ardour-lib64-ladspa.patch, NONE, 1.1 ardour-session.cc-_total_free_4k_blocks.patch, NONE, 1.1 ardour-session.cc-no_stomp.patch, NONE, 1.1 ardour.desktop, NONE, 1.1 ardour.png, NONE, 1.1 ardour.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Anthony Green (green)
fedora-extras-commits at redhat.com
Sun Sep 3 05:03:07 UTC 2006
Author: green
Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29760/devel
Modified Files:
.cvsignore sources
Added Files:
ardour-0.9beta11.2-cerrno.patch ardour-lib64-ladspa.patch
ardour-session.cc-_total_free_4k_blocks.patch
ardour-session.cc-no_stomp.patch ardour.desktop ardour.png
ardour.spec
Log Message:
auto-import ardour-0.99.3-4 on branch devel from ardour-0.99.3-4.src.rpm
ardour-0.9beta11.2-cerrno.patch:
--- NEW FILE ardour-0.9beta11.2-cerrno.patch ---
--- ardour-0.9beta11.2/libs/midi++/midi++/fd_midiport.h~ 2004-02-24 06:09:30.000000000 -0800
+++ ardour-0.9beta11.2/libs/midi++/midi++/fd_midiport.h 2004-03-02 13:21:28.000000000 -0800
@@ -21,6 +21,7 @@
#ifndef __fd_midiport_h__
#define __fd_midiport_h__
+#include <cerrno>
#include <vector>
#include <string>
ardour-lib64-ladspa.patch:
--- NEW FILE ardour-lib64-ladspa.patch ---
See http://tracker.ardour.org/view.php?id=1124
--- libs/ardour/plugin_manager.cc~ 2006-04-26 08:44:34.000000000 -0700
+++ libs/ardour/plugin_manager.cc 2006-05-13 09:18:00.000000000 -0700
@@ -107,7 +107,7 @@
_ladspa_plugin_info.clear ();
if (ladspa_path.length() == 0) {
- ladspa_path = "/usr/local/lib/ladspa:/usr/lib/ladspa";
+ ladspa_path = "/usr/local/lib64/ladspa:/usr/lib64/ladspa";
}
ladspa_discover_from_path (ladspa_path);
ardour-session.cc-_total_free_4k_blocks.patch:
--- NEW FILE ardour-session.cc-_total_free_4k_blocks.patch ---
--- libs/ardour/session.cc~ 2006-04-26 08:44:34.000000000 -0700
+++ libs/ardour/session.cc 2006-05-14 09:44:33.000000000 -0700
@@ -243,7 +243,8 @@
: _engine (eng),
_mmc_port (default_mmc_port),
_mtc_port (default_mtc_port),
- _midi_port (default_midi_port),
+ _midi_port (default_midi_port),
+ _total_free_4k_blocks (0),
pending_events (2048),
midi_requests (128), // the size of this should match the midi request pool size
main_outs (0)
@@ -291,6 +292,7 @@
_mmc_port (default_mmc_port),
_mtc_port (default_mtc_port),
_midi_port (default_midi_port),
+ _total_free_4k_blocks (0),
pending_events (2048),
midi_requests (16),
main_outs (0)
ardour-session.cc-no_stomp.patch:
--- NEW FILE ardour-session.cc-no_stomp.patch ---
--- libs/ardour/session.cc~ 2006-05-14 09:53:33.000000000 -0700
+++ libs/ardour/session.cc 2006-05-14 10:20:11.000000000 -0700
@@ -3218,7 +3218,8 @@
#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));
@@ -3228,7 +3229,8 @@
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));
--- NEW FILE ardour.desktop ---
[Desktop Entry]
Name=Ardour
Comment=Ardour Digital Audio Workstation
Icon=ardour.png
Exec=ardour
Terminal=false
Type=Application
--- NEW FILE ardour.spec ---
Summary: Multichannel Digital Audio Workstation
Name: ardour
Version: 0.99.3
Release: 4%{?dist}
Source: http://ardour.org/files/releases/ardour-0.99.3.tar.bz2
Source1: ardour.png
Source2: ardour.desktop
Patch0: ardour-0.9beta11.2-cerrno.patch
Patch1: ardour-lib64-ladspa.patch
Patch2: ardour-session.cc-no_stomp.patch
Patch3: ardour-session.cc-_total_free_4k_blocks.patch
URL: http://ardour.org
License: GPL
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons, pkgconfig
BuildRequires: automake, autoconf, libtool
BuildRequires: gtk+-devel, libart_lgpl-devel
BuildRequires: alsa-lib-devel, jack-audio-connection-kit-devel
BuildRequires: gettext >= 0.11.5
BuildRequires: libsndfile-devel >= 1.0.0
BuildRequires: libsamplerate-devel >= 0.0.13
BuildRequires: liblrdf-devel >= 0.3.1
BuildRequires: libxml2-devel >= 2.5.0
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%description
Ardour is a multichannel hard disk recorder (HDR) and digital audio
workstation (DAW). It is capable of simultaneous recording 24 or more
channels of 32 bit audio at 48kHz. Ardour is intended to function as a
"professional" HDR system, replacing dedicated hardware solutions such
as the Mackie HDR, the Tascam 2424 and more traditional tape systems
like the Alesis ADAT series. It is also intended to provide the same
or better functionality as software systems such as ProTools,
Samplitude, Logic Audio, Nuendo and Cubase VST (we acknowledge these
and all other names as trademarks of their respective owners). It
supports MIDI Machine Control, and so can be controlled from any MMC
controller, such as the Mackie Digital 8 Bus mixer and many other
modern digital mixers.
%prep
%setup -q -n ardour-%{version}
%patch0 -p1
# Conditionally apply patch to read ladspa plugins from lib64 dir.
%ifarch x86_64
%patch1 -p0
%endif
%patch2 -p0
%patch3 -p0
%build
# Use NOARCH to skip /proc/cpuinfo problems, ARCH to specify
# optimization flags
scons %{?_smp_mflags} PREFIX=%{_prefix} \
NOARCH="1" ARCH="$RPM_OPT_FLAGS" \
USE_SSE_EVERYWHERE=0 \
BUILD_SSE_OPTIMIZATIONS=1 \
KSI=no DEBUG=1
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
scons %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT NOARCH="1" ARCH="$RPM_OPT_FLAGS" install
# install the icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
# install the desktop entry
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
--add-category AudioVideo \
--add-category Application \
%{SOURCE2}
%find_lang gtk_ardour
cat gtk_ardour.lang > ardour.lang
%find_lang libardour
cat libardour.lang >> ardour.lang
%find_lang libgtkmmext
cat libgtkmmext.lang >> ardour.lang
%clean
rm -rf $RPM_BUILD_ROOT
%files -f ardour.lang
%defattr(-,root,root)
%doc COPYING DOCUMENTATION
%{_bindir}/ardour
%{_datadir}/ardour/
%dir %{_sysconfdir}/ardour/
%config(noreplace) %{_sysconfdir}/ardour/ardour.rc
%config(noreplace) %{_sysconfdir}/ardour/ardour_system.rc
%config(noreplace) %{_sysconfdir}/ardour/ardour_ui.rc
%{_datadir}/pixmaps/ardour.png
%{_datadir}/applications/*ardour.desktop
%changelog
* Sat Sep 2 2006 Anthony Green <green at redhat.com> 0.99.3-4
- Move .desktop file out of spec file to source dir.
- Add a couple of upstream patches (2 and 3)
* Sun Aug 13 2006 Anthony Green <green at redhat.com> 0.99.3-3
- Remove PlanetCCRMA changelogs (rpmlint was complaining)
- Escape macros in changelog.
- Remove useless rm in %%build section.
- Don't install useless README file.
- Clean up BuildRequires and %%files sections.
* Sat May 13 2006 Anthony Green <green at redhat.com> 0.99.3-2
- Conditionally apply ardour-lib64-ladspa.patch.
* Sat May 13 2006 Anthony Green <green at redhat.com> 0.99.3-1
- Update sources to 0.99.3.
- Add linudoc-tools dependency.
- Set USE_SSE_EVERYWHERE and BUILD_SSE_OPTIMIZATIONS at build time.
- Replace some macro command usage.
* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.99.2-3
- Use %%find_lang.
* Thu Apr 20 2006 Anthony Green <green at redhat.com> 0.99.2-2
- Fix ardour URL. Add scons smp build flags.
- Own %%{_sysconfdir}/ardour.
- Standardize on $RPM_BUILD_ROOT usage.
- Remove gcc BuildRequires.
* Tue Apr 18 2006 Anthony Green <green at redhat.com> 0.99.2-1
- Update sources. Build for Fedora Extras. Derived from Fernando
Lopez-Lezcano's PlanetCCRMA package.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Sep 2006 04:52:57 -0000 1.1
+++ .cvsignore 3 Sep 2006 05:03:07 -0000 1.2
@@ -0,0 +1 @@
+ardour-0.99.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Sep 2006 04:52:57 -0000 1.1
+++ sources 3 Sep 2006 05:03:07 -0000 1.2
@@ -0,0 +1 @@
+874858eed66babe564cd0f96fd82ab91 ardour-0.99.3.tar.bz2
More information about the scm-commits
mailing list