Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at Fri Apr 1 10:22:55 CEST 2011.
-------- --- KDE/hydrogen/hydrogen.changes 2010-03-26 20:48:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/hydrogen/hydrogen.changes 2011-04-01 01:59:59.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Mar 18 01:18:26 UTC 2011 - [email protected] + +- Update to Version 0.9.5 added portaudio.patch from upstream. +- Made hydrogen-no-current-time.patch use __TIMESTAMP__ instead of + __DATE__ +- No more kde3 dependency since version 0.9.4, now uses Qt4. +- Added man page created with hepl2man. +- Added hydrogen-0.9.5-desktopfile.patch which replaces + linux/hydrogen.desktop file which is installed with the one in + the top source directory. +- Upstream changes : + *load playlists at startup + *midi-learn works now with shift-click on some gui elements + *multi-track export and LADI support + *maximum number of bars is now configurable + *added czech translation + *fixed serveral export song failures + *added ogg, flac, aiff export support + *added some new commandline parameter for no_gui version + *added rubberband-cli support + *several improvements on sample editor + *added support for app bundles on OSX + *non destructive sample editor + *piano roll editor and instrument midi out + *destructive midi recording and added czech translation + *support for midi "note off" messages & virtual patterns + *time line to change song tempo and add tags + *director and at least several small changes + *Xml handling is now done by QtXml instead of TinyXML + *improved support for non-ascii filenames / strings + *remove direct dependencies to libflac +- For earlier 0.9.4 changes see ChangeLog + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hydrogen-0.9.3.tar.bz2 hydrogen-flac-1.1.4-fix.diff hydrogen-gcc4.1-fix.diff hydrogen-gcc43-fixes.diff hydrogen-gcc44-fixes.diff hydrogen-plugin-compile-fix.diff hydrogen.desktop New: ---- hydrogen-0.9.5-desktopfile.patch hydrogen-0.9.5.tar.bz2 hydrogen-no-current-time.patch hydrogen-no-return-in-nonvoid-function.patch hydrogen.1 portaudio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hydrogen.spec ++++++ --- /var/tmp/diff_new_pack.I1EcOt/_old 2011-04-01 10:14:06.000000000 +0200 +++ /var/tmp/diff_new_pack.I1EcOt/_new 2011-04-01 10:14:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package hydrogen (Version 0.9.3) +# spec file for package hydrogen # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,71 +19,118 @@ Name: hydrogen -BuildRequires: flac-devel kdelibs3-devel liblrdf-devel libsndfile-devel -%if %suse_version > 1020 -BuildRequires: libraptor-devel -%else -BuildRequires: raptor-devel -%endif +BuildRequires: alsa-devel flac-devel libjack-devel liblrdf-devel libqt4-devel libsndfile-devel +BuildRequires: ladspa-devel lash-devel libarchive-devel libraptor-devel portaudio-devel zlib-devel +BuildRequires: fdupes gcc-c++ help2man hicolor-icon-theme rsync scons subversion update-desktop-files Summary: A Real-Time Drum Machine and Sequencer -Version: 0.9.3 -Release: 249 +Version: 0.9.5 +Release: 1 License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.hydrogen-music.org/ -Source: %{name}-%{version}.tar.bz2 -Source1: hydrogen.desktop -Patch1: hydrogen-gcc4.1-fix.diff -Patch2: hydrogen-plugin-compile-fix.diff -Patch3: hydrogen-flac-1.1.4-fix.diff -Patch4: hydrogen-gcc43-fixes.diff -Patch5: hydrogen-gcc44-fixes.diff +Source0: %{name}-%{version}.tar.bz2 +Source1: hydrogen.1 +Patch1: portaudio.patch +Patch2: hydrogen-no-return-in-nonvoid-function.patch +Patch3: hydrogen-no-current-time.patch +Patch4: hydrogen-0.9.5-desktopfile.patch %description -Hydrogen is a simple real-time Drum machine and sequencer for computer -aided composition (CAC). It supports OSS and JACK outputs and ALSA -sequencer MIDI input. +Hydrogen is an advanced drum machine for GNU/Linux. +It's main goal is to bring professional yet simple and intuitive +pattern-based drum programming. sequencer MIDI input. +Very user-friendly, modular, fast and intuitive graphical +interface based on QT4. +Sample-based stereo audio engine, with import of sound samples +in .wav, .au and .aiff formats. +Pattern-based sequencer, with unlimited number of patterns and +ability to chain patterns into a song. +Up to 64 ticks per pattern with individual level per event and +variable pattern length. +32 instrument tracks with volume, mute, solo, pan capabilities. +Multi layer support for instruments (up to 16 samples for each +instrument). +Ability to import/export song files. +Unique human velocity, human time, pitch and swing functions. +Multiple patterns playing at once. +JACK, ALSA, PortAudio and OSS audio drivers. +ALSA MIDI input with assignable midi-in channel (1..16, ALL). +Import/export of drumkits. +Export song to wav file. +Export song to midi file. + +Authors +------- + Alessandro Cominu (aka Comix) + <[email protected]> %prep %setup -q %patch1 %patch2 -%if %suse_version > 1020 %patch3 -%endif %patch4 -%patch5 -p1 -find . -name CVS | xargs rm -rf -. /etc/opt/kde3/common_options -# update_admin --no-unsermake -update_admin %build -. /etc/opt/kde3/common_options -export QTDIR=/usr/lib/qt3 -./configure $configkde -do_make + +build() { +#%%{?jobs:--jobs=%%jobs} +scons %{?jobs:--jobs=%jobs} \ + libarchive=1 \ + prefix=%{_prefix} \ + optflags="%{optflags} -fPIC -ggdb" \ + portaudio=1 \ + lash=1 \ + $* + +if test $? != 0; then + tail -500 config.log + : scons failed + exit 1 +fi +} +export QTDIR=%{_libdir}/qt4/ +build gui=1 %install -. /etc/opt/kde3/common_options -make DESTDIR="$RPM_BUILD_ROOT" install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp data/img/gray/icon.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/hydrogen.svg -rm -f $RPM_BUILD_ROOT/opt/kde3/share/applications/*.desktop -%suse_update_desktop_file -i hydrogen AudioVideo Sequencer + +export QTDIR=%{_libdir}/qt4/ +scons %{?jobs:--jobs=%jobs} --cache-force DESTDIR="%{buildroot}" install + +# Add man page from help2man +mkdir -p %{buildroot}%{_mandir}/man1 +cp %{S:1} %{buildroot}%{_mandir}/man1/ + +# Make con avalable for desktop file +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +ln -s ../../../../pixmaps/h2-icon.svg hydrogen.svg +ln -s ../../../../pixmaps/h2-icon.svg h2-icon.svg + +%suse_update_desktop_file -i %{name} AudioVideo Sequencer +#%%find_lang --with-qt %%{name} +%fdupes %{buildroot}%{_datadir}/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + +%post +update-desktop-database &> /dev/null || : + +%postun +update-desktop-database &> /dev/null || : %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog README -/opt/kde3/bin/* -/opt/kde3/share/hydrogen -/opt/kde3/lib/hydrogen -# /opt/kde3/share/applications/*.desktop -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/hydrogen* +%{_bindir}/hydrogen +%doc AUTHORS COPYING ChangeLog README.txt +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/* +%{_mandir}/man1/hydrogen.1.gz +%{_datadir}/%{name}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/h2-icon.svg +%{_datadir}/icons/hicolor/scalable/apps/* %changelog ++++++ hydrogen-0.9.5-desktopfile.patch ++++++ Index: linux/hydrogen.desktop =================================================================== --- linux/hydrogen.desktop.orig 2008-11-18 04:20:01.000000000 +0200 +++ linux/hydrogen.desktop 2011-04-01 01:44:51.262302484 +0200 @@ -2,26 +2,27 @@ Name=Hydrogen Drum Machine Name[de]=Hydrogen Drumsequencer Name[ru]=Драм-машина Hydrogen -Name[hu]=Hydrogen Dobgép - +Name[tr]=Hydrogen Davul Makinası Comment=Create drum sequences Comment[de]=Schlagzeugsequenzen erstellen Comment[ru]=Создание партий ударных инструментов -Comment[hu]=Dobszekvenciákat lehet vele készíteni +Comment[tr]=Davul partisyonu yaz +GenericName=Drum Machine +GenericName[de]=Drumsequencer +GenericName[ru]=Драм-машина +GenericName[tr]=Davul Makinası -Encoding=UTF-8 Version=1.0 Type=Application -Categories=Application;AudioVideo;Sound;Audio;Qt; +Categories=AudioVideo;X-Sound;Audio;Qt; -MimeType=text/xml +MimeType=text/xml; -FilePattern=hydrogen Exec=hydrogen %F TryExec=hydrogen Terminal=false StartupNotify=true -Icon=@ac_prefix@/share/pixmaps/icon.svg \ No newline at end of file +Icon=h2-icon ++++++ hydrogen-0.9.3.tar.bz2 -> hydrogen-0.9.5.tar.bz2 ++++++ ++++ 242935 lines of diff (skipped) ++++++ hydrogen-no-current-time.patch ++++++ Index: gui/src/main.cpp =================================================================== --- gui/src/main.cpp.orig 2010-12-29 00:15:52.000000000 +0200 +++ gui/src/main.cpp 2011-03-20 13:47:57.306332380 +0200 @@ -420,7 +420,7 @@ int main(int argc, char *argv[]) */ void showInfo() { - cout << "\nHydrogen " + get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]"; << endl; + cout << "\nHydrogen " + get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]"; << endl; cout << "Copyright 2002-2008 Alessandro Cominu" << endl; // _INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; Index: gui/src/AboutDialog.cpp =================================================================== --- gui/src/AboutDialog.cpp.orig 2011-02-08 21:45:28.000000000 +0200 +++ gui/src/AboutDialog.cpp 2011-03-20 13:51:53.479323328 +0200 @@ -44,7 +44,7 @@ AboutDialog::AboutDialog(QWidget* parent move( 240, 100 ); QString about; - about += QString("<center><b>Hydrogen Drum Machine %1 [%2] </b><br>").arg( get_version().c_str() ).arg( __DATE__ ); + about += QString("<center><b>Hydrogen Drum Machine %1 [%2] </b><br>").arg( get_version().c_str() ).arg( __TIMESTAMP__ ); about += tr( "<b>Website</b><br>" ); about += "http://www.hydrogen-music.org<br><br>"; about += tr( "<b>Project page</b><br>"); Index: no_gui/main.cpp =================================================================== --- no_gui/main.cpp.orig 2009-11-25 19:39:27.000000000 +0200 +++ no_gui/main.cpp 2011-03-20 13:50:15.607814849 +0200 @@ -307,7 +307,7 @@ int main(int argc, char *argv[]) */ void showInfo() { - cout << "\nHydrogen " + get_version() + " [" + __DATE__ + "] [http://www.hydrogen-music.org]"; << endl; + cout << "\nHydrogen " + get_version() + " [" + __TIMESTAMP__ + "] [http://www.hydrogen-music.org]"; << endl; cout << "Copyright 2002-2008 Alessandro Cominu" << endl; // _INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES) << endl; Index: gui/src/SplashScreen.cpp =================================================================== --- gui/src/SplashScreen.cpp.orig 2009-12-09 14:46:21.000000000 +0200 +++ gui/src/SplashScreen.cpp 2011-03-20 13:53:07.589383001 +0200 @@ -54,7 +54,7 @@ SplashScreen::SplashScreen() p.setFont( font ); p.setPen( QColor( 20, 20, 20 ) ); - QString version = QString( "v%1 (%2)" ).arg( get_version().c_str() ).arg( __DATE__ ); + QString version = QString( "v%1 (%2)" ).arg( get_version().c_str() ).arg( __TIMESTAMP__ ); p.drawText( 5, 5, width - 10, 40, Qt::AlignRight | Qt::AlignTop, version ); // p.drawText( 5, height - 45, width - 10, 40, Qt::AlignHCenter | Qt::AlignBottom, QString( trUtf8( "Modules: %1" ) ).arg( COMPILED_FEATURES ) ); ++++++ hydrogen-no-return-in-nonvoid-function.patch ++++++ Index: libs/hydrogen/src/sampler/sampler.cpp =================================================================== --- libs/hydrogen/src/sampler/sampler.cpp.orig 2011-02-08 21:45:28.000000000 +0200 +++ libs/hydrogen/src/sampler/sampler.cpp 2011-03-19 07:57:48.416397664 +0200 @@ -872,6 +872,7 @@ bool Sampler::is_instrument_playing( Ins } } + return false; } }; ++++++ hydrogen-0.9.3.tar.bz2 -> hydrogen.1 ++++++ Files KDE/hydrogen/hydrogen-0.9.3.tar.bz2 and /mounts/work_src_done/STABLE/hydrogen/hydrogen.1 differ ++++++ portaudio.patch ++++++ Index: libs/hydrogen/src/IO/PortAudioDriver.h =================================================================== --- libs/hydrogen/src/IO/PortAudioDriver.h.orig 2008-02-05 03:00:25.000000000 +0200 +++ libs/hydrogen/src/IO/PortAudioDriver.h 2011-03-18 02:48:47.563442960 +0200 @@ -28,6 +28,11 @@ #ifdef PORTAUDIO_SUPPORT + + +#define PortAudioStream PaStream +#define PaTimestamp PaTime + #include <inttypes.h> #include <portaudio.h> Index: libs/hydrogen/src/IO/portaudio_driver.cpp =================================================================== --- libs/hydrogen/src/IO/portaudio_driver.cpp.orig 2009-07-15 14:24:37.000000000 +0200 +++ libs/hydrogen/src/IO/portaudio_driver.cpp 2011-03-18 02:48:47.564442900 +0200 @@ -10,10 +10,11 @@ namespace H2Core { int portAudioCallback( - void *inputBuffer, + const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, - PaTimestamp outTime, + const PaStreamCallbackTimeInfo* timeInfo, + PaStreamCallbackFlags statusFlags, void *userData ) { @@ -66,9 +67,16 @@ 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 ) { ERRORLOG( "Portaudio error in Pa_Initialize: " + QString( Pa_GetErrorText( err ) ) ); return 1; @@ -81,9 +89,9 @@ int PortAudioDriver::connect() paFloat32, /* 32 bit floating point output */ m_nSampleRate, // sample rate m_nBufferSize, // frames per buffer - 0, // number of buffers, if zero then use default minimum + //0, // number of buffers, if zero then use default minimum portAudioCallback, /* specify our custom callback */ - this ); /* pass our data through to callback */ + (void*)this ); /* pass our data through to callback */ if ( err != paNoError ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
