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