Hello community, here is the log from the commit of package jamin for openSUSE:Factory checked in at Wed Nov 4 12:11:57 CET 2009. -------- --- jamin/jamin.changes 2008-10-15 09:34:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/jamin/jamin.changes 2009-11-02 16:00:33.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 2 15:54:14 CET 2009 - tiwai@suse.de + +- fix the default LADSPA path for x86-64 (bnc#549865) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jamin.spec ++++++ --- /var/tmp/diff_new_pack.m3TrrH/_old 2009-11-04 12:10:33.000000000 +0100 +++ /var/tmp/diff_new_pack.m3TrrH/_new 2009-11-04 12:10:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jamin (Version 0.95.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: alsa-devel fftw3-devel gtk2-devel intltool jack-devel ladspa-devel liblo-devel libxml2-devel perl-XML-Parser shared-mime-info update-desktop-files Summary: JACK Audio Mastering Interface Version: 0.95.0 -Release: 234 +Release: 235 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors Url: http://jamin.sf.net @@ -50,7 +50,7 @@ %prep %setup -q -%patch +%patch -p1 %build intltoolize -f ++++++ jamin-ladspa-path-fix.diff ++++++ --- /var/tmp/diff_new_pack.m3TrrH/_old 2009-11-04 12:10:33.000000000 +0100 +++ /var/tmp/diff_new_pack.m3TrrH/_new 2009-11-04 12:10:33.000000000 +0100 @@ -1,5 +1,11 @@ ---- controller/Makefile.am-dist 2005-07-28 12:42:37.000000000 +0200 -+++ controller/Makefile.am 2005-07-28 12:42:44.000000000 +0200 +--- + controller/Makefile.am | 2 +- + src/Makefile.am | 1 + + src/plugin.c | 6 +++++- + 3 files changed, 7 insertions(+), 2 deletions(-) + +--- a/controller/Makefile.am ++++ b/controller/Makefile.am @@ -1,5 +1,5 @@ plugin_LTLIBRARIES = jamincont_1912.la -plugindir = @prefix@/lib/ladspa @@ -7,3 +13,33 @@ jamincont_1912_la_CFLAGS = @OSC_CFLAGS@ -I../src jamincont_1912_la_LIBADD = @OSC_LIBS@ jamincont_1912_la_LDFLAGS = -module -avoid-version -Wc,-nostartfiles +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -3,6 +3,7 @@ + INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ++ -DPLUGINDIR=\"$(libdir)/ladspa\" \ + @PACKAGE_CFLAGS@ @JAMIN_CFLAGS@ + + # use a convenience library to build non-optimized sources. +--- a/src/plugin.c ++++ b/src/plugin.c +@@ -24,12 +24,16 @@ + + static char *plugin_path; + ++#ifndef PLUGINDIR ++#define PLUGINDIR "/usr/local/lib/ladspa:/usr/lib/ladspa" ++#endif ++ + void plugin_init() + { + if (getenv("LADSPA_PATH")) { + plugin_path = getenv("LADSPA_PATH"); + } else { +- plugin_path = "/usr/local/lib/ladspa:/usr/lib/ladspa"; ++ plugin_path = PLUGINDIR; + } + } + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org