Make hydrogen look for LADSPA plufins in the right places.
Please note that this patch is not completly correct -- @libdir@
is originally meant to be included in makefiles and could possibly
contain make variables to expand. Nevertheless, when called by
the RPM build system, it is RPM who expands the path from _libdir
macros, so when this is built with RPM, we always get an expanded
path.
--- hydrogen-0.9.3/src/lib/Preferences.cpp.libdir 2007-10-07 19:23:23.000000000 +0200
+++ hydrogen-0.9.3/src/lib/Preferences.cpp 2007-10-07 19:24:29.000000000 +0200
@@ -79,9 +79,8 @@ Preferences::Preferences()
m_ladspaPathVect.push_back(sLadspaPath);
}
else {
- m_ladspaPathVect.push_back( "/usr/lib/ladspa" );
- m_ladspaPathVect.push_back( string( CONFIG_PREFIX ).append( "/lib/hydrogen/plugins" ) );
- m_ladspaPathVect.push_back( "/usr/local/lib/ladspa" );
+ m_ladspaPathVect.push_back( LIBDIR "/ladspa" );
+ m_ladspaPathVect.push_back( LIBDIR "/hydrogen/plugins" );
}
m_pDefaultUIStyle = new UIStyle();
--- hydrogen-0.9.3/hydrogen2Midi.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200
+++ hydrogen-0.9.3/hydrogen2Midi.pro.in 2007-10-07 20:52:54.000000000 +0200
@@ -9,6 +9,8 @@
QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@
QMAKE_LFLAGS+=@ac_qmake_lflags@
+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\"
+
SOURCES += \
src/lib/xml/tinystr.cpp \
src/lib/xml/tinyxml.cpp \
--- hydrogen-0.9.3/hydrogenBenchmark.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200
+++ hydrogen-0.9.3/hydrogenBenchmark.pro.in 2007-10-07 20:52:54.000000000 +0200
@@ -10,6 +10,8 @@
QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@
QMAKE_LFLAGS+=@ac_qmake_lflags@
+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\"
+
SOURCES += \
src/lib/xml/tinystr.cpp \
src/lib/xml/tinyxml.cpp \
--- hydrogen-0.9.3/hydrogenCUI.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200
+++ hydrogen-0.9.3/hydrogenCUI.pro.in 2007-10-07 20:52:54.000000000 +0200
@@ -9,6 +9,8 @@
QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@
QMAKE_LFLAGS+=@ac_qmake_lflags@
+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\"
+
SOURCES += \
src/lib/xml/tinystr.cpp \
src/lib/xml/tinyxml.cpp \
--- hydrogen-0.9.3/hydrogenPlayer.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200
+++ hydrogen-0.9.3/hydrogenPlayer.pro.in 2007-10-07 20:52:54.000000000 +0200
@@ -9,6 +9,8 @@
QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ -g
QMAKE_LFLAGS+=@ac_qmake_lflags@
+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\"
+
SOURCES += \
src/lib/xml/tinystr.cpp \
src/lib/xml/tinyxml.cpp \
--- hydrogen-0.9.3/hydrogen.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200
+++ hydrogen-0.9.3/hydrogen.pro.in 2007-10-07 20:52:54.000000000 +0200
@@ -9,6 +9,7 @@
QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ -g
QMAKE_LFLAGS+=@ac_qmake_lflags@
+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\"
SOURCES += \
src/lib/xml/tinystr.cpp \