From b161a9b7c3ff48093c6eaeebb8fdfc8571f1fa14 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Mon, 1 Dec 2008 15:00:15 +0000 Subject: [PATCH 01/12] Rebuild for Python 2.6 --- aldrin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aldrin.spec b/aldrin.spec index 3067eb8..8da63c7 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,6 +1,6 @@ Name: aldrin Version: 0.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia @@ -82,6 +82,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.11-7 +- Rebuild for Python 2.6 + * Fri Oct 5 2007 Alexander Kahl - 0.11-6 - added ExludeArch for ppc64 to reflect libzzub unavailability on that arch From 35a4ea17752e6a37aaf60580bd3ed5654a66e4eb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:28:14 +0000 Subject: [PATCH 02/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- aldrin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aldrin.spec b/aldrin.spec index 8da63c7..107f65a 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,6 +1,6 @@ Name: aldrin Version: 0.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia @@ -82,6 +82,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.11-7 - Rebuild for Python 2.6 From c071dbdfda52b25649faee8c116ed51d211f82c0 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Fri, 6 Mar 2009 01:57:00 +0000 Subject: [PATCH 03/12] - Update to version 0.13 --- .cvsignore | 2 +- aldrin-docfix.patch | 102 +++++++++++++++++++++++++++----------------- aldrin.spec | 76 ++++++++++++++++----------------- sources | 2 +- 4 files changed, 102 insertions(+), 80 deletions(-) diff --git a/.cvsignore b/.cvsignore index 901ec6c..f079d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aldrin-0.11.tar.bz2 +aldrin-0.13.tar.gz diff --git a/aldrin-docfix.patch b/aldrin-docfix.patch index 9aba628..ca8f360 100644 --- a/aldrin-docfix.patch +++ b/aldrin-docfix.patch @@ -1,46 +1,68 @@ -diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct ---- aldrin-0.11/SConstruct.docfix 2007-09-25 20:55:58.000000000 +0200 -+++ aldrin-0.11/SConstruct 2007-09-25 20:55:58.000000000 +0200 -@@ -127,12 +127,14 @@ if win32: - install('${DESTDIR}${PREFIX}', 'aldrin.bat') - - # docs --install('${DOC_INSTALL_PATH}/aldrin/html', -+install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, - glob.glob('share/doc/aldrin/html/*.html') - + glob.glob('share/doc/aldrin/html/*.css')) --install('${DOC_INSTALL_PATH}/aldrin/images', -+install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, - glob.glob('share/doc/aldrin/images/*.gif') - + glob.glob('share/doc/aldrin/images/*.png')) -+install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, -+ ['ChangeLog', 'CREDITS', 'LICENCE']) +diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript +--- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500 +@@ -31,4 +31,5 @@ install('${DOC_PATH}/images', + glob.glob('aldrin/images/*.gif') + + glob.glob('aldrin/images/*.png')) - # icon theme - install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png') -diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py ---- aldrin-0.11/share/aldrin/router.py.docfix 2007-09-25 21:16:54.000000000 +0200 -+++ aldrin-0.11/share/aldrin/router.py 2007-09-25 21:17:19.000000000 +0200 -@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog): - uri = filenameify(self.pluginloader.get_uri()) - name = filenameify(self.pluginloader.get_name()) - helpfilepaths = [ -- filepath('../doc/zzub/plugins/' + uri + '/index.html'), -- filepath('../doc/zzub/plugins/' + name + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'), -+ filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'), - ] - for path in helpfilepaths: - print "searching for '%s'..." % path -diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py ---- aldrin-0.11/share/aldrin/main.py.docfix 2007-09-25 21:14:29.000000000 +0200 -+++ aldrin-0.11/share/aldrin/main.py 2007-09-25 21:16:17.000000000 +0200 -@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window): - @type event: wx.MenuEvent +- ++install('${DOC_PATH}', ++ ['../ChangeLog', '../CREDITS', '../LICENCE']) +diff -rupN aldrin.old/SConstruct aldrin/SConstruct +--- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500 +@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys + env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications' + env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin' + env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin' +-env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin' ++env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION + env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin' + env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin' + env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor' +diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py +--- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500 +@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref + from aldrin.utils import CancelException + + import aldrin.com as com +- ++from about import VERSION + def cmp_view(a,b): + a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0 + b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0 +@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window): + @type event: MenuEvent """ import webbrowser - webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) -+ webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html')) ++ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html')) - def on_about(self, event): + def on_about(self, *args): """ +diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py +--- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500 +@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa + get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \ + gettext, new_stock_image_button, diff + import zzub +-import sys,os ++import sys,os,glob + import fnmatch + import ctypes + import time +@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox): + """ + uri = filenameify(self.pluginloader.get_uri()) + name = filenameify(self.pluginloader.get_name()) ++ zzubdocpath = glob.glob("../doc/libzzub-*")[0] + helpfilepaths = [ +- filepath('../doc/zzub/plugins/' + uri + '/index.html'), +- filepath('../doc/zzub/plugins/' + name + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + name + '/index.html'), + ] + for path in helpfilepaths: + print "searching for '%s'..." % path diff --git a/aldrin.spec b/aldrin.spec index 107f65a..25320e3 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,21 +1,19 @@ -Name: aldrin -Version: 0.11 -Release: 8%{?dist} -Summary: Modular music sequencer/tracker +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +Name: aldrin +Version: 0.13 +Release: 1%{?dist} +Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ -URL: http://trac.zeitherrschaft.org/aldrin/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +URL: http://code.google.com/p/aldrin-sequencer/ +Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: aldrin-docfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -ExcludeArch: ppc64 -BuildRequires: scons >= 0.96.92 -BuildRequires: dos2unix +BuildRequires: scons BuildRequires: desktop-file-utils -Requires: pyzzub = 0.2.3 +Requires: pyzzub >= 0.2.6 Requires: pygtk2 %description @@ -26,31 +24,28 @@ samples. %prep -%setup -q -mac2unix SConstruct -%patch0 -p1 -b docfix +%setup -q -n %{name} +%patch0 -p1 -b .docfix %build -find share/aldrin share/doc \ - -regextype posix-egrep \ - -regex '.+\.(py|html|xml|prs|col|css)' \ - -exec mac2unix '{}' \; \ - -exec chmod 644 '{}' \; - +# Fix encoding iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ +touch -r CREDITS CREDITS~ %{__mv} CREDITS~ CREDITS +# Fix permission +%{__chmod} 644 src/components/player.py + %install %{__rm} -rf $RPM_BUILD_ROOT -scons install PREFIX=$RPM_BUILD_ROOT%{_prefix} +scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --vendor="fedora" \ - --remove-category="Application" \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +desktop-file-install --vendor="fedora" \ + --remove-category="Application" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -58,30 +53,35 @@ desktop-file-install \ %post update-desktop-database &> /dev/null || : - -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 || : %postun update-desktop-database &> /dev/null || : - -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 +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root,-) -%{_bindir}/aldrin +%{_bindir}/aldrin* +%config(noreplace) %{_sysconfdir}/%{name} +%{python_sitelib}/%{name} %{_defaultdocdir}/%{name}-%{version} %{_datadir}/%{name} +%{_datadir}/icons/%{name} +%{_datadir}/pixmaps/%{name} %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 +- Update to version 0.13 + * Mon Feb 23 2009 Fedora Release Engineering - 0.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 99b111e..9a6924e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a40ea5852e34b69abc55e12d049aef8 aldrin-0.11.tar.bz2 +6bdbd4a48883cc7d4734fef3055947b2 aldrin-0.13.tar.gz From 3867dd2c6b9978df09510bad804cbf64d5e9e452 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:41:33 +0000 Subject: [PATCH 04/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- aldrin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aldrin.spec b/aldrin.spec index 25320e3..cec7e61 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -2,7 +2,7 @@ Name: aldrin Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ @@ -79,6 +79,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 - Update to version 0.13 From 3b3487c75481d69e0f7ad1b5cc716a7c21e803eb Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Thu, 6 Aug 2009 02:58:48 +0000 Subject: [PATCH 05/12] - Update the .desktop file --- aldrin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/aldrin.spec b/aldrin.spec index cec7e61..1191a90 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -2,7 +2,7 @@ Name: aldrin Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ @@ -41,8 +41,9 @@ touch -r CREDITS CREDITS~ %{__rm} -rf $RPM_BUILD_ROOT scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor="fedora" \ +desktop-file-install --vendor="fedora" \ --remove-category="Application" \ + --add-category="Sequencer" \ --delete-original \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop @@ -79,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Aug 05 2009 Orcan Ogetbil - 0.13-3 +- Update the .desktop file + * Fri Jul 24 2009 Fedora Release Engineering - 0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From d679aa15d35a4d2e3b2a2fbb014acbe8588533d5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:59 +0000 Subject: [PATCH 06/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index da1591d..92c3eea 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: aldrin -# $Id$ +# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $ NAME := aldrin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From abdc76c132d8a3d0b2d2adaf0dc7c23335aafa6f Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 30 May 2010 15:33:07 +0000 Subject: [PATCH 07/12] - Change device order in autodetect. Prevents a possible crash. - Fix segfault in waveedit when deleting end of waveform. --- aldrin.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/aldrin.spec b/aldrin.spec index 1191a90..c897094 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -2,13 +2,20 @@ Name: aldrin Version: 0.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ URL: http://code.google.com/p/aldrin-sequencer/ Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: aldrin-docfix.patch +# Choose the first detected device instead of last one. Prevents crashes on +# some systems I tried that supply multiple output devices per sound card. +# http://bitbucket.org/paniq/aldrin/issue/32/device-order-patch +Patch1: aldrin-firstdev.patch +# Fix segfault in waveedit when deleting end of waveform. +# http://bitbucket.org/paniq/aldrin/issue/16/segfault-when-deleting-the-end-of-a-wav +Patch2: aldrin-65a8db7be79e.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: scons @@ -26,7 +33,8 @@ samples. %prep %setup -q -n %{name} %patch0 -p1 -b .docfix - +%patch1 -p1 -b .firstdev +%patch2 -p1 -b .delete.waveform %build # Fix encoding @@ -80,6 +88,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat Mar 06 2010 Orcan Ogetbil - 0.13-4 +- Change device order in autodetect. Prevents a possible crash. +- Fix segfault in waveedit when deleting end of waveform. + * Wed Aug 05 2009 Orcan Ogetbil - 0.13-3 - Update the .desktop file From 2e4cc7a63e04004da82acc9517972522cc64a76c Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 30 May 2010 15:35:39 +0000 Subject: [PATCH 08/12] - Change device order in autodetect. Prevents a possible crash. - Fix segfault in waveedit when deleting end of waveform. --- aldrin-65a8db7be79e.diff | 20 +++++++++++++++++++ aldrin-firstdev.patch | 42 ++++++++++++++++++++++++++++++++++++++++ aldrin.spec | 5 ++++- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 aldrin-65a8db7be79e.diff create mode 100644 aldrin-firstdev.patch diff --git a/aldrin-65a8db7be79e.diff b/aldrin-65a8db7be79e.diff new file mode 100644 index 0000000..e57d4ed --- /dev/null +++ b/aldrin-65a8db7be79e.diff @@ -0,0 +1,20 @@ +# HG changeset patch -- Bitbucket.org +# Project Aldrin +# URL http://bitbucket.org/paniq/aldrin/overview +# User jmmcd +# Date 1238628185 -3600 +# Node ID 65a8db7be79e5a55343fff33e0234702a2c04416 +# Parent 66f9f971fdf278d83f620cea4a7de3585d1d1c31 +Fix segfault in waveedit when deleting end of waveform. Fixes #16 on bitbucket. Thanks to bucket_brigade for the fix. + +--- a/src/aldrin/waveedit.py ++++ b/src/aldrin/waveedit.py +@@ -115,7 +115,7 @@ class WaveEditView(gtk.DrawingArea): + player = com.get('aldrin.core.player') + if self.selection: + begin,end = self.selection +- self.level.remove_sample_range(begin,end) ++ self.level.remove_sample_range(begin,end-1) + self.selection = None + player.history_commit("remove sample range") + self.sample_changed() diff --git a/aldrin-firstdev.patch b/aldrin-firstdev.patch new file mode 100644 index 0000000..6256fc4 --- /dev/null +++ b/aldrin-firstdev.patch @@ -0,0 +1,42 @@ +diff -rupN aldrin.old/src/components/driver.py aldrin/src/components/driver.py +--- aldrin.old/src/components/driver.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/driver.py 2010-03-06 04:32:27.000000000 -0500 +@@ -155,22 +155,33 @@ class AudioDriver: + + # second round: if we didnt find them from the config, + # pick good alternatives. ++ ++ # regardless of what was chosen as input, if output ++ # has an input as well, prefer that one first. ++ # We also prefer the first device since it is usually the ++ # default system device. Unfortunately, the armstrong api ++ # does not provide us a default value. ++ if (output == -1 and input == -1): ++ for i in range(self.driver.get_count()): ++ if (self.driver.is_output(i) and self.driver.is_input(i)): ++ output = i ++ input = i ++ break + + if output == -1: + for i in range(self.driver.get_count()): + if self.driver.is_output(i): + output = i +- +- # regardless of what was chosen as input, if output +- # has an input as well, prefer that one first. +- if self.driver.is_input(output): +- input = output ++ break + + # take output channel if it supports input + if input == -1: + for i in range(self.driver.get_count()): + if self.driver.is_input(i): + input = i ++ break ++ if self.driver.is_input(output): ++ input = output + + if output == -1: + raise self.AudioInitException diff --git a/aldrin.spec b/aldrin.spec index c897094..f196ddc 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,4 +1,6 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif Name: aldrin Version: 0.13 @@ -91,6 +93,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Sat Mar 06 2010 Orcan Ogetbil - 0.13-4 - Change device order in autodetect. Prevents a possible crash. - Fix segfault in waveedit when deleting end of waveform. +- Comply with new python guidelines * Wed Aug 05 2009 Orcan Ogetbil - 0.13-3 - Update the .desktop file From 22ebd384671e4747c6cd751d771ab49a8c085fad Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:34:33 +0000 Subject: [PATCH 09/12] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- aldrin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aldrin.spec b/aldrin.spec index f196ddc..9417042 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -4,7 +4,7 @@ Name: aldrin Version: 0.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ @@ -90,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Jul 21 2010 David Malcolm - 0.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sat Mar 06 2010 Orcan Ogetbil - 0.13-4 - Change device order in autodetect. Prevents a possible crash. - Fix segfault in waveedit when deleting end of waveform. From 5345cf9493e0ca9df7027b13334f2d9daccace32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:41:07 +0000 Subject: [PATCH 10/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 92c3eea..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aldrin -# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $ -NAME := aldrin -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 467913f2c732cbd6d7ca41ba66ef7033b8247a07 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:45:26 -0600 Subject: [PATCH 11/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- aldrin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aldrin.spec b/aldrin.spec index 9417042..ed33eda 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -4,7 +4,7 @@ Name: aldrin Version: 0.13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia License: GPLv2+ @@ -90,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 21 2010 David Malcolm - 0.13-5 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 8a2a4627dc37504aaadc273e5379c5e809abb66a Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Mon, 6 Jun 2011 22:19:01 -0400 Subject: [PATCH 12/12] Package is retired --- .gitignore | 1 - aldrin-65a8db7be79e.diff | 20 ------ aldrin-docfix.patch | 68 ------------------ aldrin-firstdev.patch | 42 ------------ aldrin.spec | 144 --------------------------------------- dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 .gitignore delete mode 100644 aldrin-65a8db7be79e.diff delete mode 100644 aldrin-docfix.patch delete mode 100644 aldrin-firstdev.patch delete mode 100644 aldrin.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f079d9e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -aldrin-0.13.tar.gz diff --git a/aldrin-65a8db7be79e.diff b/aldrin-65a8db7be79e.diff deleted file mode 100644 index e57d4ed..0000000 --- a/aldrin-65a8db7be79e.diff +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -- Bitbucket.org -# Project Aldrin -# URL http://bitbucket.org/paniq/aldrin/overview -# User jmmcd -# Date 1238628185 -3600 -# Node ID 65a8db7be79e5a55343fff33e0234702a2c04416 -# Parent 66f9f971fdf278d83f620cea4a7de3585d1d1c31 -Fix segfault in waveedit when deleting end of waveform. Fixes #16 on bitbucket. Thanks to bucket_brigade for the fix. - ---- a/src/aldrin/waveedit.py -+++ b/src/aldrin/waveedit.py -@@ -115,7 +115,7 @@ class WaveEditView(gtk.DrawingArea): - player = com.get('aldrin.core.player') - if self.selection: - begin,end = self.selection -- self.level.remove_sample_range(begin,end) -+ self.level.remove_sample_range(begin,end-1) - self.selection = None - player.history_commit("remove sample range") - self.sample_changed() diff --git a/aldrin-docfix.patch b/aldrin-docfix.patch deleted file mode 100644 index ca8f360..0000000 --- a/aldrin-docfix.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript ---- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500 -+++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500 -@@ -31,4 +31,5 @@ install('${DOC_PATH}/images', - glob.glob('aldrin/images/*.gif') - + glob.glob('aldrin/images/*.png')) - -- -+install('${DOC_PATH}', -+ ['../ChangeLog', '../CREDITS', '../LICENCE']) -diff -rupN aldrin.old/SConstruct aldrin/SConstruct ---- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500 -+++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500 -@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys - env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications' - env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin' - env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin' --env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin' -+env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION - env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin' - env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin' - env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor' -diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py ---- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500 -+++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500 -@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref - from aldrin.utils import CancelException - - import aldrin.com as com -- -+from about import VERSION - def cmp_view(a,b): - a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0 - b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0 -@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window): - @type event: MenuEvent - """ - import webbrowser -- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) -+ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html')) - - def on_about(self, *args): - """ -diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py ---- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500 -+++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500 -@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa - get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \ - gettext, new_stock_image_button, diff - import zzub --import sys,os -+import sys,os,glob - import fnmatch - import ctypes - import time -@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox): - """ - uri = filenameify(self.pluginloader.get_uri()) - name = filenameify(self.pluginloader.get_name()) -+ zzubdocpath = glob.glob("../doc/libzzub-*")[0] - helpfilepaths = [ -- filepath('../doc/zzub/plugins/' + uri + '/index.html'), -- filepath('../doc/zzub/plugins/' + name + '/index.html'), -+ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'), -+ filepath(zzubdocpath + '/plugins/' + name + '/index.html'), - ] - for path in helpfilepaths: - print "searching for '%s'..." % path diff --git a/aldrin-firstdev.patch b/aldrin-firstdev.patch deleted file mode 100644 index 6256fc4..0000000 --- a/aldrin-firstdev.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rupN aldrin.old/src/components/driver.py aldrin/src/components/driver.py ---- aldrin.old/src/components/driver.py 2009-01-09 16:25:22.000000000 -0500 -+++ aldrin/src/components/driver.py 2010-03-06 04:32:27.000000000 -0500 -@@ -155,22 +155,33 @@ class AudioDriver: - - # second round: if we didnt find them from the config, - # pick good alternatives. -+ -+ # regardless of what was chosen as input, if output -+ # has an input as well, prefer that one first. -+ # We also prefer the first device since it is usually the -+ # default system device. Unfortunately, the armstrong api -+ # does not provide us a default value. -+ if (output == -1 and input == -1): -+ for i in range(self.driver.get_count()): -+ if (self.driver.is_output(i) and self.driver.is_input(i)): -+ output = i -+ input = i -+ break - - if output == -1: - for i in range(self.driver.get_count()): - if self.driver.is_output(i): - output = i -- -- # regardless of what was chosen as input, if output -- # has an input as well, prefer that one first. -- if self.driver.is_input(output): -- input = output -+ break - - # take output channel if it supports input - if input == -1: - for i in range(self.driver.get_count()): - if self.driver.is_input(i): - input = i -+ break -+ if self.driver.is_input(output): -+ input = output - - if output == -1: - raise self.AudioInitException diff --git a/aldrin.spec b/aldrin.spec deleted file mode 100644 index ed33eda..0000000 --- a/aldrin.spec +++ /dev/null @@ -1,144 +0,0 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif - -Name: aldrin -Version: 0.13 -Release: 6%{?dist} -Summary: Modular music sequencer/tracker -Group: Applications/Multimedia -License: GPLv2+ -URL: http://code.google.com/p/aldrin-sequencer/ -Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz -Patch0: aldrin-docfix.patch -# Choose the first detected device instead of last one. Prevents crashes on -# some systems I tried that supply multiple output devices per sound card. -# http://bitbucket.org/paniq/aldrin/issue/32/device-order-patch -Patch1: aldrin-firstdev.patch -# Fix segfault in waveedit when deleting end of waveform. -# http://bitbucket.org/paniq/aldrin/issue/16/segfault-when-deleting-the-end-of-a-wav -Patch2: aldrin-65a8db7be79e.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: scons -BuildRequires: desktop-file-utils -Requires: pyzzub >= 0.2.6 -Requires: pygtk2 - -%description -Aldrin is a powerful music composition software featuring a flexible audio -routing system commonly found in expensive audio software, enabling you to mix, -split, mutilate and modify audio signals emitted by software synthesizers and -samples. - - -%prep -%setup -q -n %{name} -%patch0 -p1 -b .docfix -%patch1 -p1 -b .firstdev -%patch2 -p1 -b .delete.waveform - -%build -# Fix encoding -iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ -touch -r CREDITS CREDITS~ -%{__mv} CREDITS~ CREDITS - -# Fix permission -%{__chmod} 644 src/components/player.py - -%install -%{__rm} -rf $RPM_BUILD_ROOT -scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT - -desktop-file-install --vendor="fedora" \ - --remove-category="Application" \ - --add-category="Sequencer" \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - - -%post -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - -%files -%defattr(-,root,root,-) -%{_bindir}/aldrin* -%config(noreplace) %{_sysconfdir}/%{name} -%{python_sitelib}/%{name} -%{_defaultdocdir}/%{name}-%{version} -%{_datadir}/%{name} -%{_datadir}/icons/%{name} -%{_datadir}/pixmaps/%{name} -%{_datadir}/applications/* -%{_datadir}/icons/hicolor/*/apps/* - -%changelog -* Mon Feb 07 2011 Fedora Release Engineering - 0.13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 21 2010 David Malcolm - 0.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Sat Mar 06 2010 Orcan Ogetbil - 0.13-4 -- Change device order in autodetect. Prevents a possible crash. -- Fix segfault in waveedit when deleting end of waveform. -- Comply with new python guidelines - -* Wed Aug 05 2009 Orcan Ogetbil - 0.13-3 -- Update the .desktop file - -* Fri Jul 24 2009 Fedora Release Engineering - 0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 -- Update to version 0.13 - -* Mon Feb 23 2009 Fedora Release Engineering - 0.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.11-7 -- Rebuild for Python 2.6 - -* Fri Oct 5 2007 Alexander Kahl - 0.11-6 -- added ExludeArch for ppc64 to reflect libzzub unavailability on that arch - -* Thu Sep 27 2007 Alexander Kahl - 0.11-5 -- nailed to pyzzub version 0.2.3 for docpath compatibility - -* Tue Sep 25 2007 Alexander Kahl - 0.11-4 -- updated patch to fix referenced libzzub doc locations - -* Tue Sep 18 2007 Alexander Kahl - 0.11-3 -- generic sf.net source url -- adapted macros wherever feasible (both paths and commands) -- unified buildroot style -- removed redundant ldconfig update call -- new patch to rectify aldrin's installation doc directory and file list -- added missing python module requirement -- added update calls for GTK icon cache and desktop database - -* Tue Sep 18 2007 Alexander Kahl - 0.11-2 -- updated requires to new libzzub w/ integrated pyzzub -- removed redundant requires -- fixed rpm path macros -- fixed CREDITS encoding - -* Mon Sep 3 2007 Alexander Kahl - 0.11-1 -- initial release diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f2396d2 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 9a6924e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -6bdbd4a48883cc7d4734fef3055947b2 aldrin-0.13.tar.gz