[dssi/f13/master] - Fix 64bit plugin paths, once again
Orcan Ogetbil
oget at fedoraproject.org
Sun Sep 26 05:36:27 UTC 2010
commit ffac0960ea62a88984ee6b3f56d3a4169bc04722
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Sun Sep 26 01:36:29 2010 -0400
- Fix 64bit plugin paths, once again
dssi-lib64.patch | 38 +++++++++++++++++++++++++++++++-------
dssi.spec | 5 ++++-
2 files changed, 35 insertions(+), 8 deletions(-)
---
diff --git a/dssi-lib64.patch b/dssi-lib64.patch
index 2a37812..dea0d35 100644
--- a/dssi-lib64.patch
+++ b/dssi-lib64.patch
@@ -1,7 +1,7 @@
-diff -rupN dssi-1.0.0.old/doc/jack-dssi-host.1 dssi-1.0.0/doc/jack-dssi-host.1
---- dssi-1.0.0.old/doc/jack-dssi-host.1 2009-01-05 15:43:48.000000000 -0500
-+++ dssi-1.0.0/doc/jack-dssi-host.1 2009-05-30 00:03:04.000000000 -0400
-@@ -91,7 +91,7 @@ by the environment variable
+diff -rupN dssi-1.1.0.old/doc/jack-dssi-host.1 dssi-1.1.0/doc/jack-dssi-host.1
+--- dssi-1.1.0.old/doc/jack-dssi-host.1 2010-09-19 02:14:42.000000000 -0400
++++ dssi-1.1.0/doc/jack-dssi-host.1 2010-09-26 00:29:23.000000000 -0400
+@@ -94,7 +94,7 @@ by the environment variable
.B DSSI_PATH,
which is a colon-separated list of directories. If
.B DSSI_PATH
@@ -10,9 +10,33 @@ diff -rupN dssi-1.0.0.old/doc/jack-dssi-host.1 dssi-1.0.0/doc/jack-dssi-host.1
/usr/local/lib/dssi, and (assuming the environment variable HOME is
set,) $HOME/.dssi is used.
.br
-diff -rupN dssi-1.0.0.old/jack-dssi-host/jack-dssi-host.c dssi-1.0.0/jack-dssi-host/jack-dssi-host.c
---- dssi-1.0.0.old/jack-dssi-host/jack-dssi-host.c 2009-01-04 16:48:26.000000000 -0500
-+++ dssi-1.0.0/jack-dssi-host/jack-dssi-host.c 2009-07-13 00:58:43.000000000 -0400
+diff -rupN dssi-1.1.0.old/examples/dssi_analyse_plugin.c dssi-1.1.0/examples/dssi_analyse_plugin.c
+--- dssi-1.1.0.old/examples/dssi_analyse_plugin.c 2010-06-27 15:30:09.000000000 -0400
++++ dssi-1.1.0/examples/dssi_analyse_plugin.c 2010-09-26 00:32:00.000000000 -0400
+@@ -408,7 +408,7 @@ main(int argc, char *argv[])
+ char *pathtmp, *element;
+
+ if (!dssi_path) {
+- dssi_path = "/usr/local/lib/dssi:/usr/lib/dssi";
++ dssi_path = "/usr/local/lib64/dssi:/usr/lib64/dssi:/usr/local/lib/dssi:/usr/lib/dssi";
+ fprintf(stderr, "Warning: DSSI_PATH not set, defaulting to '%s'\n", dssi_path);
+ } else if (verbose) {
+ printf("Searching DSSI_PATH '%s'...\n", dssi_path);
+diff -rupN dssi-1.1.0.old/examples/dssi_list_plugins.c dssi-1.1.0/examples/dssi_list_plugins.c
+--- dssi-1.1.0.old/examples/dssi_list_plugins.c 2010-06-27 15:30:09.000000000 -0400
++++ dssi-1.1.0/examples/dssi_list_plugins.c 2010-09-26 00:32:20.000000000 -0400
+@@ -200,7 +200,7 @@ main(int argc, char *argv[])
+
+ path = getenv("DSSI_PATH");
+ if (!path) {
+- path = "/usr/local/lib/dssi:/usr/lib/dssi";
++ path = "/usr/local/lib64/dssi:/usr/lib64/dssi:/usr/local/lib/dssi:/usr/lib/dssi";
+ fprintf(stderr, "warning: DSSI_PATH not set, defaulting to '%s'\n", path);
+ }
+
+diff -rupN dssi-1.1.0.old/jack-dssi-host/jack-dssi-host.c dssi-1.1.0/jack-dssi-host/jack-dssi-host.c
+--- dssi-1.1.0.old/jack-dssi-host/jack-dssi-host.c 2010-09-19 01:12:15.000000000 -0400
++++ dssi-1.1.0/jack-dssi-host/jack-dssi-host.c 2010-09-26 00:29:23.000000000 -0400
@@ -492,10 +492,10 @@ load(const char *dllName, void **dll, in
if (!defaultDssiPath) {
const char *home = getenv("HOME");
diff --git a/dssi.spec b/dssi.spec
index 3b09a0c..9a8f2dc 100644
--- a/dssi.spec
+++ b/dssi.spec
@@ -1,7 +1,7 @@
Summary: Disposable Soft Synth Interface
Name: dssi
Version: 1.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: Applications/Multimedia
URL: http://dssi.sourceforge.net/
@@ -106,6 +106,9 @@ tests/controller
%{_libdir}/pkgconfig/dssi.pc
%changelog
+* Sun Sep 26 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1.0-2
+- Fix 64bit plugin paths, once again
+
* Sat Sep 25 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1.0-1
- Update to 1.1.0
More information about the scm-commits
mailing list