diff --git a/hydrogen-0.9.3-build-flac.patch b/hydrogen-0.9.3-build-flac.patch deleted file mode 100644 index 63fb806..0000000 --- a/hydrogen-0.9.3-build-flac.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- src/lib/FLACFile.cpp.old 2007-02-11 20:12:34.000000000 +0100 -+++ src/lib/FLACFile.cpp 2007-02-11 20:18:25.000000000 +0100 -@@ -33,6 +33,13 @@ - //#include "FLAC/file_decoder.h" - #include - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ -+ - /// Reads a FLAC file...not optimized yet - class FLACFile_real : public FLAC::Decoder::File, public Object - { -@@ -164,16 +171,28 @@ - } - - set_metadata_ignore_all(); -+ -+#ifdef LEGACY_FLAC - set_filename( sFilename.c_str() ); - - State s=init(); - if( s != FLAC__FILE_DECODER_OK ) { -+#else -+ FLAC__StreamDecoderInitStatus s=init(sFilename.c_str() ); -+ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) { -+#endif - errorLog( "[load] Error in init()" ); - } - -+#ifdef LEGACY_FLAC - if ( process_until_end_of_file() == false ) { - errorLog( "[load] Error in process_until_end_of_file()" ); - } -+#else -+ if ( process_until_end_of_stream() == false ) { -+ errorLog( "[load] Error in process_until_end_of_stream()" ); -+ } -+#endif - } - diff --git a/hydrogen-0.9.3-g++4.patch b/hydrogen-0.9.3-g++4.patch deleted file mode 100644 index eb298f2..0000000 --- a/hydrogen-0.9.3-g++4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/xml/tinyxml.h~ 2005-10-17 18:32:04.000000000 -0400 -+++ src/lib/xml/tinyxml.h 2006-04-26 16:57:39.000000000 -0400 -@@ -823,7 +823,7 @@ - #endif - - /// Construct. -- TiXmlDeclaration::TiXmlDeclaration( const char * _version, -+ TiXmlDeclaration( const char * _version, - const char * _encoding, - const char * _standalone ); - diff --git a/hydrogen-0.9.3-gcc43.patch b/hydrogen-0.9.3-gcc43.patch deleted file mode 100644 index 865208b..0000000 --- a/hydrogen-0.9.3-gcc43.patch +++ /dev/null @@ -1,60 +0,0 @@ -The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in -unnecessary dependencies which aren't requested by the standard. -This fixes build for gcc-4.3 - -Lubomir Kundrak - -diff -rup hydrogen-0.9.3.orig/src/gui/DrumkitManager.h hydrogen-0.9.3/src/gui/DrumkitManager.h ---- hydrogen-0.9.3.orig/src/gui/DrumkitManager.h 2005-10-18 00:32:04.000000000 +0200 -+++ hydrogen-0.9.3/src/gui/DrumkitManager.h 2008-01-03 21:45:23.000000000 +0100 -@@ -43,6 +43,7 @@ - #include - - #include -+#include - - #include "UI/DrumkitManager_UI.h" - #include "lib/Object.h" -diff -rup hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp ---- hydrogen-0.9.3.orig/src/gui/main.cpp 2005-11-08 15:52:51.000000000 +0100 -+++ hydrogen-0.9.3/src/gui/main.cpp 2008-01-03 21:51:21.000000000 +0100 -@@ -43,6 +43,7 @@ - #include "lib/Exception.h" - - #include -+#include - using namespace std; - - void showInfo(); -diff -rup hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp ---- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp 2008-01-03 21:06:25.000000000 +0100 -+++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-01-03 21:39:52.000000000 +0100 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - #ifdef FLAC_SUPPORT - -diff -rup hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp ---- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp 2005-10-18 00:32:04.000000000 +0200 -+++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp 2008-01-04 23:30:06.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "lib/Hydrogen.h" - #include "lib/LocalFileMng.h" ---- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp 2009-01-25 14:12:53.000000000 +0100 -+++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp 2009-01-25 14:11:18.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "../Preferences.h" - - #include -+#include - - audioProcessCallback ossDriver_audioProcessCallback; - bool ossDriver_running; diff --git a/hydrogen-0.9.6-gcc-4.7.patch b/hydrogen-0.9.6-gcc-4.7.patch deleted file mode 100644 index 2a655ab..0000000 --- a/hydrogen-0.9.6-gcc-4.7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- hydrogen-0.9.6/src/core/src/IO/portmidi_driver.cpp.orig 2012-05-25 14:19:45.000000000 +0200 -+++ hydrogen-0.9.6/src/core/src/IO/portmidi_driver.cpp 2012-07-08 16:09:59.193699959 +0200 -@@ -40,6 +40,7 @@ - #define TIME_START Pt_Start(1, 0, 0) /* timer started w/millisecond accuracy */ - - #include -+#include - - namespace H2Core - { diff --git a/hydrogen.spec b/hydrogen.spec index 5a42d7c..72b85c6 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,8 +1,8 @@ %define majver %(echo %version | cut -d_ -f1) %define pkgver %(echo %version | tr _ -) Name: hydrogen -Version: 1.2.3 -Release: 2mamba +Version: 1.2.4 +Release: 1mamba Summary: Advanced drum machine for GNU/Linux Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -10,11 +10,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://hydrogen-music.org/ Source: https://github.com/hydrogen-music/hydrogen.git/%{version}/hydrogen-%{pkgver}.tar.bz2 -#Source: http://downloads.sourceforge.net/project/hydrogen/Hydrogen/%{majver}%20Sources/hydrogen-%{pkgver}.tar.gz -Patch0: %{name}-0.9.3-g++4.patch -Patch1: %{name}-0.9.3-gcc43.patch -Patch2: %{name}-0.9.3-build-flac.patch -Patch3: %{name}-0.9.6-gcc-4.7.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -22,6 +17,7 @@ BuildRequires: libQt5Core BuildRequires: libQt5Gui BuildRequires: libQt5Network BuildRequires: libQt5Svg-devel +BuildRequires: libQt5Test BuildRequires: libQt5Widgets BuildRequires: libQt5Xml BuildRequires: libQt5XmlPatterns-devel @@ -53,14 +49,11 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description devel 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. - This package contains the headers that programmers will need to develop applications which will use %{name}. -%debug_package %prep %setup -q -#%patch3 -p1 %build QTDIR=%{_qt5_libdir} @@ -68,7 +61,7 @@ LADSPA_PATH=%{_libdir}/ladspa %cmake \ -DCMAKE_COLOR_MAKEFILE=1 \ - -DWANT_DEBUG=1 \ + -DWANT_DEBUG=0 \ -DWANT_JACK=1 \ -DWANT_ALSA=1 \ -DWANT_LIBARCHIVE=1 \ @@ -76,10 +69,13 @@ LADSPA_PATH=%{_libdir}/ladspa -DWANT_OSS=0 \ -DWANT_PORTAUDIO=1 \ -DWANT_PORTMIDI=1 \ - -DWANT_LASH=1 \ + -DWANT_PULSEAUDIO=1 \ -DWANT_LRDF=1 \ -DWANT_COREAUDIO=0 \ - -DWANT_COREMIDI=0 + -DWANT_COREMIDI=0 \ + -DWANT_CPPUNIT=ON + +# -DWANT_LASH=1 \ %cmake_build @@ -117,6 +113,9 @@ LADSPA_PATH=%{_libdir}/ladspa #%doc README.txt %changelog +* Tue Dec 31 2024 Automatic Build System 1.2.4-1mamba +- automatic version update by autodist + * Sat Nov 16 2024 Automatic Build System 1.2.3-2mamba - rebuilt by autoport with build requirements: libportmidi-devel>=1:2.0.4-1mamba