now with the patches :-S
---------- Forwarded message ----------
From: Jaromír Mikeš <[email protected]>
Date: 2016-11-11 16:02 GMT+01:00
Subject: Hydrogen package in debian
To: Thijs van severen <[email protected]>
Hi Thijs - Hydrogen Team,
I am maintainer of hydrogen package.
I am sending you patches we are applying in debian.
You might be interested apply them upstream.
best regards
mira
--
follow me on my Audio & Linux blog <http://audio-and-linux.blogspot.com/> !
Description: Fix missing #includes to avoid build failures with GCC 4.7
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667203
Author: Matthias Klose <[email protected]>
Forwarded: no
---
src/core/src/IO/portmidi_driver.cpp | 1 +
src/gui/src/MainForm.cpp | 1 +
src/gui/src/SongEditor/SongEditor.cpp | 1 +
3 files changed, 3 insertions(+)
Index: hydrogen/src/core/src/IO/portmidi_driver.cpp
===================================================================
--- hydrogen.orig/src/core/src/IO/portmidi_driver.cpp
+++ hydrogen/src/core/src/IO/portmidi_driver.cpp
@@ -33,6 +33,7 @@
#ifdef WIN32
#include <windows.h>
#endif
+#include <unistd.h>
#ifdef H2CORE_HAVE_PORTMIDI
Index: hydrogen/src/gui/src/SongEditor/SongEditor.cpp
===================================================================
--- hydrogen.orig/src/gui/src/SongEditor/SongEditor.cpp
+++ hydrogen/src/gui/src/SongEditor/SongEditor.cpp
@@ -21,6 +21,7 @@
*/
#include <assert.h>
+#include <unistd.h>
#include <algorithm>
#include <memory>
Index: hydrogen/src/gui/src/MainForm.cpp
===================================================================
--- hydrogen.orig/src/gui/src/MainForm.cpp
+++ hydrogen/src/gui/src/MainForm.cpp
@@ -20,6 +20,7 @@
*
*/
+#include <unistd.h>
#include <hydrogen/event_queue.h>
#include <hydrogen/version.h>
#include <hydrogen/hydrogen.h>
---
src/core/src/IO/PortAudioDriver.h | 3 +++
src/core/src/IO/portaudio_driver.cpp | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
Index: hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
===================================================================
--- hydrogen.orig/src/core/include/hydrogen/IO/PortAudioDriver.h
+++ hydrogen/src/core/include/hydrogen/IO/PortAudioDriver.h
@@ -30,6 +30,9 @@
#ifdef H2CORE_HAVE_PORTAUDIO
+#define PortAudioStream PaStream
+#define PaTimestamp PaTime
+
#include <inttypes.h>
#include <portaudio.h>
Index: hydrogen/src/core/src/IO/portaudio_driver.cpp
===================================================================
--- hydrogen.orig/src/core/src/IO/portaudio_driver.cpp
+++ hydrogen/src/core/src/IO/portaudio_driver.cpp
@@ -68,7 +68,13 @@ int PortAudioDriver::connect()
m_pOut_L = new float[ m_nBufferSize ];
m_pOut_R = new float[ m_nBufferSize ];
- int err = Pa_Initialize();
+ PaError err = Pa_Initialize();
+
+ typedef struct
+ {
+ float left_phase;
+ float right_phase;
+ } paTestData;
if ( err != paNoError ) {
@@ -84,7 +90,7 @@ int PortAudioDriver::connect()
m_nSampleRate, // sample rate
m_nBufferSize, // frames per buffer
portAudioCallback, /* specify our custom callback */
- this ); /* pass our data through to callback */
+ (void*)this ); /* pass our data through to callback */
if ( err != paNoError ) {
Description: Set patch to rubberband CLI
Author: Jonas Smedegaard <[email protected]>
Last-Update: 2011-03-17
---
data/hydrogen.default.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: hydrogen/data/hydrogen.default.conf
===================================================================
--- hydrogen.orig/data/hydrogen.default.conf
+++ hydrogen/data/hydrogen.default.conf
@@ -19,7 +19,7 @@
<hearNewNotes>true</hearNewNotes>
<recordEvents>false</recordEvents>
<quantizeEvents>true</quantizeEvents>
- <path_to_rubberband>Path to Rubberband-CLI</path_to_rubberband>
+ <path_to_rubberband>/usr/bin/rubberband</path_to_rubberband>
<recentUsedSongs />
<recentlyUsedEffects />
<serverList>
Description: The Name entries in the desktop file should not repeat
the description of the program given in the GenericName entries but
only contain the short application name.
.
The following changes have been added by Alessio Treglia <[email protected]>
on 2012-01-27
- Remove deprecated FilePattern, Encoding keys.
- Add trailing ';' to the MimeType field.
- Remove unregistered 'Sound' value from Categories.
From: Ronny Standtke <[email protected]>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640983
Reviewed-by: Alessio Tregli <[email protected]>
Last-Update: 2012-01-27
Forwarded: no
---
linux/hydrogen.desktop | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
Index: hydrogen/linux/hydrogen.desktop
===================================================================
--- hydrogen.orig/linux/hydrogen.desktop
+++ hydrogen/linux/hydrogen.desktop
@@ -1,11 +1,5 @@
[Desktop Entry]
-Name=Hydrogen Drum Machine
-Name[de]=Hydrogen Drumsequencer
-Name[ru]=Драм-машина Hydrogen
-Name[hu]=Hydrogen Dobgép
-Name[tr]=Hydrogen Davul Makinası
-Name[fr]=Boîte à rythme Hydrogen
-
+Name=Hydrogen
Comment=Create drum sequences
Comment[de]=Schlagzeugsequenzen erstellen
Comment[ru]=Создание партий ударных инструментов
@@ -19,16 +13,14 @@ GenericName[ru]=Драм-машина
GenericName[tr]=Davul Makinası
GenericName[fr]=Boîte à rythme
-Encoding=UTF-8
Version=1.0
Type=Application
-Categories=Application;AudioVideo;Sound;Audio;Qt;
+Categories=AudioVideo;Audio;Qt;
Keywords=audio;sound;jackd;sampler;drum;
-MimeType=text/xml
+MimeType=text/xml;
-FilePattern=hydrogen
Exec=hydrogen %F
TryExec=hydrogen
Terminal=false
Description: Add missing -lporttime to LDFLAGS to avoid FTBFS.
Author: Alessio Treglia <[email protected]>
Forwarded: no
---
src/core/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
Index: hydrogen/src/core/CMakeLists.txt
===================================================================
--- hydrogen.orig/src/core/CMakeLists.txt
+++ hydrogen/src/core/CMakeLists.txt
@@ -50,6 +50,7 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${NSMSESSION_LIBRARIES}
+ -lporttime
)
#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER "${hydrogen_INCLUDES}" )
Description: Fix some spelling.
Author: Jaromír Mikeš <[email protected]>
Forwarded: no
Index: hydrogen/src/core/src/IO/jack_output.cpp
===================================================================
--- hydrogen.orig/src/core/src/IO/jack_output.cpp
+++ hydrogen/src/core/src/IO/jack_output.cpp
@@ -152,13 +152,13 @@ int JackOutput::connect()
INFOLOG( "Could not connect so saved out-ports. Connecting to first pair of in-ports" );
const char ** portnames = jack_get_ports ( client, NULL, NULL, JackPortIsInput );
if ( !portnames || !portnames[0] || !portnames[1] ) {
- ERRORLOG( "Could't locate two Jack input port" );
+ ERRORLOG( "Couldn't locate two Jack input port" );
Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
return 2;
}
if ( jack_connect( client, jack_port_name( output_port_1 ), portnames[0] ) != 0 ||
jack_connect( client, jack_port_name( output_port_2 ), portnames[1] ) != 0 ) {
- ERRORLOG( "Could't connect to first pair of Jack input ports" );
+ ERRORLOG( "Couldn't connect to first pair of Jack input ports" );
Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
return 2;
}
Index: hydrogen/src/core/src/IO/midi_input.cpp
===================================================================
--- hydrogen.orig/src/core/src/IO/midi_input.cpp
+++ hydrogen/src/core/src/IO/midi_input.cpp
@@ -254,7 +254,7 @@ void MidiInput::handleNoteOnMessage( con
else if(Preferences::get_instance()->m_bMidiFixedMapping ){
pInstr = instrList->findMidiNote( nNote );
if(pInstr == NULL) {
- ERRORLOG( QString( "Can't find correponding Intrument for note %1" ).arg( nNote ));
+ ERRORLOG( QString( "Can't find corresponding Instrument for note %1" ).arg( nNote ));
return;
}
nInstrument = instrList->index(pInstr);
Index: hydrogen/src/core/src/helpers/legacy.cpp
===================================================================
--- hydrogen.orig/src/core/src/helpers/legacy.cpp
+++ hydrogen/src/core/src/helpers/legacy.cpp
@@ -106,7 +106,7 @@ Drumkit* Legacy::load_drumkit( const QSt
DEBUGLOG( "Using back compatibility code. filename node found" );
QString sFilename = instrument_node.read_string( "filename", "" );
if( sFilename.isEmpty() ) {
- ERRORLOG( "filename back compability node is empty" );
+ ERRORLOG( "filename back compatibility node is empty" );
} else {
Sample* sample = new Sample( dk_path+"/"+sFilename );
Index: hydrogen/src/core/src/helpers/xml.cpp
===================================================================
--- hydrogen.orig/src/core/src/helpers/xml.cpp
+++ hydrogen/src/core/src/helpers/xml.cpp
@@ -159,7 +159,7 @@ bool XMLDoc::write( const QString& filep
{
QFile file( filepath );
if ( !file.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) {
- ERRORLOG( QString( "Unable to open %1 for writting" ).arg( filepath ) );
+ ERRORLOG( QString( "Unable to open %1 for writing" ).arg( filepath ) );
return false;
}
QTextStream out( &file );
Index: hydrogen/src/core/src/lilypond/lilypond.cpp
===================================================================
--- hydrogen.orig/src/core/src/lilypond/lilypond.cpp
+++ hydrogen/src/core/src/lilypond/lilypond.cpp
@@ -30,7 +30,7 @@
* It contains the notation style (states the position of notes), and for this
* it follows the "Guide to Standardized Drumset Notation" by Norman Weinberg.
*
- * Note that the GM-kit uses two unconventionnal intruments: "Stick" and
+ * Note that the GM-kit uses two unconventionnal instruments: "Stick" and
* "Hand Clap", so for those I did what I could and used the recommended
* triangle notehead to distinguish them for drum and cymbal notation.
*/
Index: hydrogen/src/core/src/midi_action.cpp
===================================================================
--- hydrogen.orig/src/core/src/midi_action.cpp
+++ hydrogen/src/core/src/midi_action.cpp
@@ -87,7 +87,7 @@ bool setSong( int songnumber ) {
* in midi_input.cpp .
*
* Each action has two independ parameters. The two parameters are optional and
-* can be used to carry additional informations, which mean
+* can be used to carry additional information, which mean
* only something to this very Action. They can have totally different meanings for other Actions.
* Example: parameter1 is the Mixer strip and parameter 2 a multiplier for the volume change on this strip
*
Index: hydrogen/src/core/src/preferences.cpp
===================================================================
--- hydrogen.orig/src/core/src/preferences.cpp
+++ hydrogen/src/core/src/preferences.cpp
@@ -102,7 +102,7 @@ Preferences::Preferences()
char * ladpath = getenv( "LADSPA_PATH" ); // read the Environment variable LADSPA_PATH
if ( ladpath ) {
- INFOLOG( "Found LADSPA_PATH enviroment variable" );
+ INFOLOG( "Found LADSPA_PATH environment variable" );
QString sLadspaPath = QString::fromLocal8Bit(ladpath);
int pos;
while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
Index: hydrogen/src/gui/src/ExportSongDialog.cpp
===================================================================
--- hydrogen.orig/src/gui/src/ExportSongDialog.cpp
+++ hydrogen/src/gui/src/ExportSongDialog.cpp
@@ -66,7 +66,7 @@ ExportSongDialog::ExportSongDialog(QWidg
setWindowTitle( trUtf8( "Export song" ) );
exportTypeCombo->addItem(trUtf8("Export to a single track"));
- exportTypeCombo->addItem(trUtf8("Export to seperate tracks"));
+ exportTypeCombo->addItem(trUtf8("Export to separate tracks"));
exportTypeCombo->addItem(trUtf8("Both"));
HydrogenApp::get_instance()->addEventListener( this );
Index: hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
===================================================================
--- hydrogen.orig/src/gui/src/PatternEditor/DrumPatternEditor.cpp
+++ hydrogen/src/gui/src/PatternEditor/DrumPatternEditor.cpp
@@ -92,7 +92,7 @@ void DrumPatternEditor::updateEditor()
// check engine state
int state = engine->getState();
if ( (state != STATE_READY) && (state != STATE_PLAYING) ) {
- ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
+ ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
return;
}
Index: hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
===================================================================
--- hydrogen.orig/src/gui/src/SampleEditor/SampleEditor_UI.ui
+++ hydrogen/src/gui/src/SampleEditor/SampleEditor_UI.ui
@@ -641,7 +641,7 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 4 default processing options</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 5 equivalent to --no-lamination --window-short (may be good for drums)</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more informations about you can find here:</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more information about you can find here:</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.breakfastquay.com/rubberband/ "><span style=" text-decoration: underline; color:#0000ff;">http://www.breakfastquay.com/rubberband/ </span></a></p></body></html></string>
</property>
<item>
Index: hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
===================================================================
--- hydrogen.orig/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+++ hydrogen/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
@@ -493,7 +493,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
bool conditionalLoad = false;
bool hasNotes = false;
- INFOLOG("Old kit has " + QString::number( oldCount ) + " intruments, new one has " + QString::number( newCount ) );
+ INFOLOG("Old kit has " + QString::number( oldCount ) + " instruments, new one has " + QString::number( newCount ) );
if ( newCount < oldCount )
{
@@ -520,7 +520,7 @@ void SoundLibraryPanel::on_drumkitLoadAc
QMessageBox msgBox;
msgBox.setWindowTitle("Hydrogen");
msgBox.setIcon( QMessageBox::Warning );
- msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new intruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
+ msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
msgBox.setStandardButtons(QMessageBox::Save);
msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
Index: hydrogen/src/core/src/local_file_mgr.cpp
===================================================================
--- hydrogen.orig/src/core/src/local_file_mgr.cpp
+++ hydrogen/src/core/src/local_file_mgr.cpp
@@ -1078,7 +1078,7 @@ bool LocalFileMng::checkTinyXMLCompatMod
return false;
} else {
_WARNINGLOG( QString("File '%1' is being read in "
- "TinyXML compatability mode")
+ "TinyXML compatibility mode")
.arg(filename) );
return true;
}
Description: Fix install path for man pages.
Author: Jaromír Mikeš <[email protected]>
Forwarded: no
Index: hydrogen/CMakeLists.txt
===================================================================
--- hydrogen.orig/CMakeLists.txt
+++ hydrogen/CMakeLists.txt
@@ -358,7 +358,7 @@ ENDIF()
IF(NOT MINGW AND NOT APPLE)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
ENDIF()
#
------------------------------------------------------------------------------
_______________________________________________
Hydrogen-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/hydrogen-devel
