rpms/armstrong/F-11 armstrong-conflict-namespace.patch, NONE, 1.1 armstrong.git-0625ca6e4a4ebf9b6182334f027ed9d79734e28b.patch, NONE, 1.1 armstrong.spec, 1.4, 1.5
Orcan Ogetbil
oget at fedoraproject.org
Sat Feb 13 17:07:28 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/armstrong/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611
Modified Files:
armstrong.spec
Added Files:
armstrong-conflict-namespace.patch
armstrong.git-0625ca6e4a4ebf9b6182334f027ed9d79734e28b.patch
Log Message:
* Sat Feb 13 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.2.6-10
- Link against rtaudio-4.0.7
- Repair lunar support
armstrong-conflict-namespace.patch:
libzzub.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE armstrong-conflict-namespace.patch ---
diff -rupN armstrong.old/src/libzzub/libzzub.cpp armstrong/src/libzzub/libzzub.cpp
--- armstrong.old/src/libzzub/libzzub.cpp 2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/libzzub.cpp 2010-01-30 11:33:39.000000000 -0500
@@ -1447,7 +1447,7 @@ int zzub_plugin_describe_value(zzub_plug
int index = -1;
zzub_plugin_pattern_to_linear_no_connections(plugin, group, 0, column, &index);
- const parameter* para = plugin->_player->back.plugin_get_parameter_info(plugin->id, group, 0, column);
+ const zzub::parameter* para = plugin->_player->back.plugin_get_parameter_info(plugin->id, group, 0, column);
if (index != -1) {
if (value != getNoValue(para)) { // infector crashen when trying to describe novalues (and out-of-range-values)
armstrong.git-0625ca6e4a4ebf9b6182334f027ed9d79734e28b.patch:
libzzub.cpp | 2 +-
player.cpp | 11 +++++++++++
player.h | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
--- NEW FILE armstrong.git-0625ca6e4a4ebf9b6182334f027ed9d79734e28b.patch ---
>From 0625ca6e4a4ebf9b6182334f027ed9d79734e28b Mon Sep 17 00:00:00 2001
From: Timur Batyrshin <erthad at altlinux.org>
Date: Sat, 15 Aug 2009 12:08:02 +0400
Subject: [PATCH] repaired lunar support
---
src/libzzub/libzzub.cpp | 2 +-
src/libzzub/player.cpp | 11 +++++++++++
src/libzzub/player.h | 1 +
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/libzzub/libzzub.cpp b/src/libzzub/libzzub.cpp
index 643b02c..9b1d3ea 100644
--- a/src/libzzub/libzzub.cpp
+++ b/src/libzzub/libzzub.cpp
@@ -251,7 +251,7 @@ int zzub_player_get_pluginloader_count(zzub_player_t *player) {
}
zzub_plugincollection_t *zzub_plugincollection_get_by_uri(zzub_player_t *player, const char *uri) {
- return 0;//player->getPluginlibByUri(uri);
+ return player->getPluginlibByUri(uri);
}
void zzub_plugincollection_configure(zzub_plugincollection_t *collection, const char *key, const char *value) {
diff --git a/src/libzzub/player.cpp b/src/libzzub/player.cpp
index fcc3302..dc6f848 100644
--- a/src/libzzub/player.cpp
+++ b/src/libzzub/player.cpp
@@ -550,6 +550,17 @@ void player::initialize_plugin_libraries() {
initialize_plugin_directory(plugin_folders[i]);
}
}
+/*! \brief Returns a plugin library by URI. */
+pluginlib* player::getPluginlibByUri(const std::string &uri) {
+ for (size_t i=0; i<plugin_libraries.size(); i++) {
+ pluginlib *lib = plugin_libraries[i];
+ if (lib->collection && lib->collection->get_uri() && (uri == lib->collection->get_uri())) {
+ return lib;
+ }
+ }
+ return 0;
+}
+
void player::set_state(player_state newstate) {
op_state_change* o = new op_state_change(newstate);
diff --git a/src/libzzub/player.h b/src/libzzub/player.h
index 748a5a0..4c51fc0 100644
--- a/src/libzzub/player.h
+++ b/src/libzzub/player.h
@@ -46,6 +46,7 @@ struct player : undo_manager, audioworker, midiworker {
void initialize_plugin_libraries();
void initialize_plugin_directory(string folder);
void load_plugin_library(const string &fullpath);
+ pluginlib* getPluginlibByUri(const std::string &uri);
// audioworker
virtual void work_stereo(int sample_count);
--
1.6.3.3
Index: armstrong.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/F-11/armstrong.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- armstrong.spec 14 Jun 2009 20:24:20 -0000 1.4
+++ armstrong.spec 13 Feb 2010 17:07:28 -0000 1.5
@@ -2,7 +2,7 @@
Name: armstrong
Version: 0.2.6
-Release: 7%{?dist}
+Release: 10%{?dist}
Summary: Powerful music sequencing library
Group: System Environment/Libraries
# src/plugins/Geonik is GPL+
@@ -61,6 +61,13 @@ Patch6: armstrong-bcb8dd70b78f.d
# Resolve undefined symbols
# http://bitbucket.org/paniq/armstrong/issue/12/undefined-symbols
Patch7: armstrong-define-symbols.patch
+# Resolve a conflict in the namespace against new boost
+# http://bitbucket.org/paniq/armstrong/issue/17/trunk-fails-to-build-w-boost-graph-140
+Patch8: armstrong-conflict-namespace.patch
+# Repair lunar support
+# http://bitbucket.org/paniq/armstrong/issue/15/lunar-does-not-work
+Patch9: armstrong.git-0625ca6e4a4ebf9b6182334f027ed9d79734e28b.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -78,7 +85,7 @@ BuildRequires: minizip-devel
BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
BuildRequires: python-setuptools-devel
-BuildRequires: rtaudio-static
+BuildRequires: rtaudio-devel
BuildRequires: rubberband-devel
BuildRequires: scons
BuildRequires: zlib-devel
@@ -110,6 +117,8 @@ applications and plugins that use %{name
Summary: Python Bindings For libzzub
Group: System Environment/Libraries
License: GPLv2+
+BuildArch: noarch
+Obsoletes: pyzzub < 0.2.6-9
Requires: %{name} = %{version}-%{release}
%description -n pyzzub
@@ -127,6 +136,13 @@ Python scripts.
%patch5 -p1 -b .64bit
%patch6 -p1 -b .multidssi
%patch7 -p1 -b .symbols
+%patch8 -p1 -b .conflict
+%patch9 -p1 -b .lunarrepair
+
+# To build against portmidi >=184
+%if 0%{fedora} > 12
+sed -i '/porttime/d' src/libzzub/SConscript
+%endif
# Remove the binded libraries. We'll use the system-wide ones
pushd src
@@ -290,6 +306,17 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Sat Feb 13 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.2.6-10
+- Link against rtaudio-4.0.7
+- Repair lunar support
+
+* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.2.6-9
+- Rebuild against portmidi-200 (on F-13+)
+- Make the pyzzub package noarch
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Sat Jun 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.2.6-7
- Fix plugin loading error on 64bit systems
- Build against system ladspa and dssi
More information about the scm-commits
mailing list