rpms/ardour/devel ardour-2.1-SConstruct.patch, NONE, 1.1 ardour2.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 ardour.spec, 1.6, 1.7 sources, 1.2, 1.3 ardour-0.9beta11.2-cerrno.patch, 1.1, NONE ardour-lib64-ladspa.patch, 1.1, NONE ardour-no-sse.patch, 1.1, NONE ardour.desktop, 1.1, NONE ardour.png, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Oct 12 11:50:44 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26011

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-2.1-SConstruct.patch ardour2.desktop 
Removed Files:
	ardour-0.9beta11.2-cerrno.patch ardour-lib64-ladspa.patch 
	ardour-no-sse.patch ardour.desktop ardour.png 
Log Message:
* Wed Oct 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-3
- Fix finding of translations (bz 238552)
- Convert some documentation files to UTF-8


ardour-2.1-SConstruct.patch:

--- NEW FILE ardour-2.1-SConstruct.patch ---
diff -up ardour-2.1/SConstruct~ ardour-2.1/SConstruct
--- ardour-2.1/SConstruct~	2007-10-09 22:37:49.000000000 +0200
+++ ardour-2.1/SConstruct	2007-10-09 22:38:23.000000000 +0200
@@ -32,7 +32,7 @@ opts.AddOptions(
     BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'tiger', 'panther', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
@@ -647,7 +647,7 @@ if env['FPU_OPTIMIZATION']:
 
 # handle x86/x86_64 libdir properly
 
-if env['DIST_TARGET'] == 'x86_64':
+if env['DIST_TARGET'] == 'x86_64' or env['DIST_TARGET'] == 'powerpc64':
     env['LIBDIR']='lib64'
 else:
     env['LIBDIR']='lib'
@@ -665,18 +665,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))


--- NEW FILE ardour2.desktop ---
[Desktop Entry]
Name=Ardour
Comment=Ardour Digital Audio Workstation
Icon=ardour
Exec=ardour2
Terminal=false
Type=Application
Categories=AudioVideo;Audio;X-Recorders;X-Multitrack;X-Jack;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2006 05:03:07 -0000	1.2
+++ .cvsignore	12 Oct 2007 11:50:11 -0000	1.3
@@ -1 +1 @@
-ardour-0.99.3.tar.bz2
+ardour-2.1.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ardour.spec	7 Jan 2007 02:36:07 -0000	1.6
+++ ardour.spec	12 Oct 2007 11:50:11 -0000	1.7
@@ -1,35 +1,35 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       0.99.3
-Release:       8%{?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
-Patch4:        ardour-no-sse.patch
+Version:       2.1
+Release:       3%{?dist}
+Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
+Source1:       ardour2.desktop
+Patch0:        ardour-2.1-SConstruct.patch
+Patch1:        ardour-session.cc-no_stomp.patch
+Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
 URL:           http://ardour.org
-License:       GPL
+License:       GPLv2+
 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: scons, pkgconfig, libtool
+BuildRequires: libxslt-devel, libgnomecanvas-devel, boost-devel
 BuildRequires: alsa-lib-devel, jack-audio-connection-kit-devel
+BuildRequires: liblo-devel, libusb-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
+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}
+
 %description
 Ardour is a multichannel hard disk recorder (HDR) and digital audio
 workstation (DAW). It is capable of simultaneous recording 24 or more
@@ -45,71 +45,115 @@
 modern digital mixers.
 
 %prep
-%setup -q -n ardour-%{version}
+%setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p0
+for i in README.fr README.it TRANSLATORS; do
+  iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
+  mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i
+done
 
-# Conditionally apply patch to read ladspa plugins from lib64 dir.
+%build
+# This may look strange, but it enables runtime enabled SSE optimalisations
+%ifarch %{ix86}
+TARGETCPU=i686
+%endif
 %ifarch x86_64
-%patch1 -p0
+TARGETCPU=x86_64
+%endif
+%ifarch ppc
+TARGETCPU=powerpc
+%endif
+%ifarch ppc64
+TARGETCPU=powerpc64
 %endif
 
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+if [ -z "$TARGETCPU" ]; then
+  echo "Please add support for your architecture to ardour.spec and"
+  echo "ardour-2.1-SConstruct.patch"
+  exit 1
+fi
 
-%build
 scons %{?_smp_mflags} PREFIX=%{_prefix} \
-      ARCH="$RPM_OPT_FLAGS" \
-      USE_SSE_EVERYWHERE=0 \
-      BUILD_SSE_OPTIMIZATIONS=1 \
-      KSI=no
+      DIST_TARGET="${TARGETCPU}" \
+      ARCH="$RPM_OPT_FLAGS -ffast-math"
 
 %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
+scons DESTDIR=$RPM_BUILD_ROOT install
 
 # 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 the icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+# 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
+done
 
 # 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
+  %{SOURCE1}
+
+%find_lang gtk2_ardour
+cat gtk2_ardour.lang > ardour.lang
+%find_lang libardour2
+cat libardour2.lang >> ardour.lang
+%find_lang libgtkmm2ext
+cat libgtkmm2ext.lang >> ardour.lang
 
 %clean
 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
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %files -f ardour.lang
-%defattr(-,root,root)
-%doc COPYING DOCUMENTATION
-%{_bindir}/ardour
+%defattr(-,root,root,-)
+%doc README COPYING DOCUMENTATION
+%{_bindir}/ardour2
+%{_libdir}/ardour2/
+%{_datadir}/ardour2/
 %{_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
+%dir %{_sysconfdir}/ardour2/
+%config(noreplace) %{_sysconfdir}/ardour2/ardour_system.rc
+%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_dark.rc
+%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_default.conf
+%config(noreplace) %{_sysconfdir}/ardour2/ardour2_ui_light.rc
+%config(noreplace) %{_sysconfdir}/ardour2/ardour.bindings
+%config(noreplace) %{_sysconfdir}/ardour2/ardour.menus
+%{_datadir}/icons/hicolor/*/apps/ardour.png
+%{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
+* Wed Oct 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-3
+- Fix finding of translations (bz 238552)
+- Convert some documentation files to UTF-8
+
+* Tue Oct  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-2
+- Upgrade to latest upstream 2.1 (bz 238552)
+- Merge with CCRMA ardour2 package
+- Begin with a release of 2 to be higher then CCRMA's last EVR
+
+* Wed May 02 2007 Anthony Green <green at redhat.com> 2.0-1
+- Upgrade sources.
+
 * Sat Jan 06 2007 Anthony Green <green at redhat.com> 0.99.3-8
 - Enable optimization (oops).
 - Add ardour-no-sse.patch to disable use of build-system dependent 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2006 05:03:07 -0000	1.2
+++ sources	12 Oct 2007 11:50:11 -0000	1.3
@@ -1 +1 @@
-874858eed66babe564cd0f96fd82ab91  ardour-0.99.3.tar.bz2
+18be414a37b832aae23c068ba9fcf8ab  ardour-2.1.tar.bz2


--- ardour-0.9beta11.2-cerrno.patch DELETED ---


--- ardour-lib64-ladspa.patch DELETED ---


--- ardour-no-sse.patch DELETED ---


--- ardour.desktop DELETED ---




More information about the fedora-extras-commits mailing list