Hello everbody,
While I was packaging hydrogen-0.9.4.1 for Fedora, I came across 3 issues:
1- I realized that the ladspa plugins path is wrong on certain 64bit
distributions which use /usr/lib64/ladspa. Attached path adds
/usr/lib64/ladspa and /usr/local/lib64/ladspa to the directories to be
scanned for ladspa plugins.
2- hydrogen doesn't compile against qt-4.7. The attached patch
resolves the issue. Please double check. See the failed build log:
http://koji.fedoraproject.org/koji/getfile?taskID=2107542&name=build.log
and the succeeded one after the patch:
http://koji.fedoraproject.org/koji/getfile?taskID=2107546&name=build.log
3- I tried to compile the wasp plugins. The qmake build system it uses
includes a hack to replace gcc with pure ld during the linking phase,
which excludes the build ID from the produced binary. Fedora doesn't
like this. So I made a "proper" fix, I pass an extra flag to gcc and
the linking is done correctly.
Cheers,
Orcan
diff -rupN 0.9.4.1.old/libs/hydrogen/src/preferences.cpp 0.9.4.1/libs/hydrogen/src/preferences.cpp
--- 0.9.4.1.old/libs/hydrogen/src/preferences.cpp 2009-08-26 08:12:27.000000000 -0400
+++ 0.9.4.1/libs/hydrogen/src/preferences.cpp 2010-04-10 07:14:14.000000000 -0400
@@ -99,6 +99,8 @@ Preferences::Preferences()
#else
m_ladspaPathVect.push_back( "/usr/lib/ladspa" );
m_ladspaPathVect.push_back( "/usr/local/lib/ladspa" );
+ m_ladspaPathVect.push_back( "/usr/lib64/ladspa" );
+ m_ladspaPathVect.push_back( "/usr/local/lib64/ladspa" );
#endif
}
--- 0.9.4.1.old/libs/hydrogen/src/song.cpp 2009-07-14 21:10:17.000000000 -0400
+++ 0.9.4.1/libs/hydrogen/src/song.cpp 2010-04-10 08:14:54.000000000 -0400
@@ -141,7 +141,7 @@ Song* Song::get_default_song(){
song->set_swing_factor( 0.0 );
InstrumentList* pList = new InstrumentList();
- Instrument *pNewInstr = new Instrument(QString( 0 ), "New instrument", new ADSR());
+ Instrument *pNewInstr = new Instrument(QString( "" ), "New instrument", new ADSR());
pList->add( pNewInstr );
song->set_instrument_list( pList );
diff -rupN 0.9.4.1.old/plugins/wasp/wasp_booster/wasp_booster.pro 0.9.4.1/plugins/wasp/wasp_booster/wasp_booster.pro
--- 0.9.4.1.old/plugins/wasp/wasp_booster/wasp_booster.pro 2007-06-18 14:30:19.000000000 -0400
+++ 0.9.4.1/plugins/wasp/wasp_booster/wasp_booster.pro 2010-04-10 06:43:30.000000000 -0400
@@ -5,14 +5,15 @@ QT -= core
DESTDIR = ../../
INCLUDEPATH += ../include
SOURCES += booster.c
+QMAKE_LFLAGS_PLUGIN += -nostartfiles
linux-g++* {
CONFIG = plugin
# there's something weird in linux qmake...this is a simple and ugly workaround
- QMAKE_LINK_SHLIB_CMD = ld -shared -o libwasp_booster.so booster.o
+ #QMAKE_LINK_SHLIB_CMD = gcc -nostartfiles -lm -shared booster.o -o libwasp_booster.so
}
win32 {
CONFIG = dll
-}
\ No newline at end of file
+}
diff -rupN 0.9.4.1.old/plugins/wasp/wasp_noisifier/wasp_noisifier.pro 0.9.4.1/plugins/wasp/wasp_noisifier/wasp_noisifier.pro
--- 0.9.4.1.old/plugins/wasp/wasp_noisifier/wasp_noisifier.pro 2007-06-18 14:30:19.000000000 -0400
+++ 0.9.4.1/plugins/wasp/wasp_noisifier/wasp_noisifier.pro 2010-04-10 06:44:36.000000000 -0400
@@ -5,14 +5,15 @@ QT -= core
DESTDIR = ../../
INCLUDEPATH += ../include
SOURCES += noisifier.c
+QMAKE_LFLAGS_PLUGIN += -nostartfiles
linux-g++* {
CONFIG = plugin
# there's something weird in linux qmake...this is a simple and ugly workaround
- QMAKE_LINK_SHLIB_CMD = ld -shared -o libwasp_noisifier.so noisifier.o
+ #QMAKE_LINK_SHLIB_CMD = gcc -lm -shared -o wasp_noisifier.so noisifier.o
}
win32 {
CONFIG = dll
-}
\ No newline at end of file
+}
diff -rupN 0.9.4.1.old/plugins/wasp/wasp_xshaper/wasp_xshaper.pro 0.9.4.1/plugins/wasp/wasp_xshaper/wasp_xshaper.pro
--- 0.9.4.1.old/plugins/wasp/wasp_xshaper/wasp_xshaper.pro 2007-06-18 14:30:19.000000000 -0400
+++ 0.9.4.1/plugins/wasp/wasp_xshaper/wasp_xshaper.pro 2010-04-10 06:44:55.000000000 -0400
@@ -5,13 +5,14 @@ QT -= core
DESTDIR = ../../
INCLUDEPATH += ../include
SOURCES += xshaper.c
+QMAKE_LFLAGS_PLUGIN += -nostartfiles
linux-g++* {
CONFIG = plugin
# there's something weird in linux qmake...this is a simple and ugly workaround
- QMAKE_LINK_SHLIB_CMD = ld -shared -o libwasp_xshaper.so xshaper.o
+ #QMAKE_LINK_SHLIB_CMD = gcc -lm -shared -o wasp_xshaper.so xshaper.o
}
win32 {
CONFIG = dll
-}
\ No newline at end of file
+}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Hydrogen-devel mailing list
Hydrogen-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hydrogen-devel
