Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=jackwip.git;a=commitdiff;h=4c187726cda65db3d840d66b8995e353f2f536e5
commit 4c187726cda65db3d840d66b8995e353f2f536e5
Author: exceed <exceed.ced...@gmail.com>
Date: Tue Apr 20 14:50:15 2010 +0200
hydrogen-0.9.4.1-1-i686
* Version bump
* Removed useless patches
* New scons build
* Build with jack-0.118.0-1
diff --git a/source/xmultimedia-extra/hydrogen/FrugalBuild
b/source/xmultimedia-extra/hydrogen/FrugalBuild
index 4a8d2d9..68758bd 100644
--- a/source/xmultimedia-extra/hydrogen/FrugalBuild
+++ b/source/xmultimedia-extra/hydrogen/FrugalBuild
@@ -1,18 +1,22 @@
-# Compiling Time: ~0.92 SBU
+# Compiling Time: 2.57 SBU
# Maintainer: crazy <cr...@frugalware.org>
pkgname=hydrogen
-pkgver=0.9.3
-pkgrel=4
+pkgver=0.9.4.1
+pkgrel=1
pkgdesc="Hydrogen is an advanced drum machine."
-depends=('liblrdf>=0.4.0-3' 'openssl' 'libstdc++' 'libsndfile' 'jack' 'qt'
'libxml2')
-_F_kde_defaults=0
-Finclude sourceforge kde
+depends=('liblrdf>=0.4.0-7' 'libsndfile' 'jack>=0.118.0' 'qt4' 'libtar' 'zlib'
'libarchive')
+makedepends=('scons')
+Finclude sourceforge
url="http://www.hydrogen-music.org/";
-source=(${sour...@]} gcc411.patch hydrogen-flac113.patch gcc43.patch)
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
-sha1sums=('4c07d3d250922421182f0dd527965628588bcb4a' \
- '4da7dfeda63dff10a6c9d1ba39ff955a8c4e4b07' \
- 'a4a034bab94b71f9d9dc9a546b05d9509a2411a0' \
- '9d333eb4d4fe5e8b73b1cfbbc07db80b623bf479')
+_F_cd_path=$pkgver
+sha1sums=('22ec492737347e89d38c4629d5df54e0e85d2e14')
+
+build()
+{
+ Fcd
+ scons prefix='/usr' || Fdie
+ scons install DESTDIR=$Fdestdir prefix='/usr' || Fdie
+}
diff --git a/source/xmultimedia-extra/hydrogen/gcc411.patch
b/source/xmultimedia-extra/hydrogen/gcc411.patch
deleted file mode 100644
index 14e625a..0000000
--- a/source/xmultimedia-extra/hydrogen/gcc411.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp hydrogen-0.9.3/src/lib/xml/tinyxml.h
hydrogen-0.9.3-p/src/lib/xml/tinyxml.h
---- hydrogen-0.9.3/src/lib/xml/tinyxml.h 2005-10-18 00:32:04.000000000
+0200
-+++ hydrogen-0.9.3-p/src/lib/xml/tinyxml.h 2006-11-15 19:30:03.000000000
+0100
-@@ -823,9 +823,7 @@ public:
- #endif
-
- /// Construct.
-- TiXmlDeclaration::TiXmlDeclaration( const char * _version,
--
const char * _encoding,
--
const char * _standalone );
-+ TiXmlDeclaration( const char * _version, const char * _encoding, const
char * _standalone );
-
- virtual ~TiXmlDeclaration() {}
-
diff --git a/source/xmultimedia-extra/hydrogen/gcc43.patch
b/source/xmultimedia-extra/hydrogen/gcc43.patch
deleted file mode 100644
index 6cfb408..0000000
--- a/source/xmultimedia-extra/hydrogen/gcc43.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -NrU5 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 2008-04-19
16:48:03.000000000 +0200
-+++ hydrogen-0.9.3/src/gui/DrumkitManager.h 2008-04-19 16:48:46.000000000
+0200
-@@ -41,10 +41,11 @@
- #include <qtextedit.h>
- #include <qtimer.h>
- #include <qwidget.h>
-
- #include <vector>
-+#include <cstdlib>
-
- #include "UI/DrumkitManager_UI.h"
- #include "lib/Object.h"
- #include "lib/Song.h"
-
-diff -NrU5 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 2008-04-19 16:48:03.000000000
+0200
-+++ hydrogen-0.9.3/src/gui/main.cpp 2008-04-19 16:48:46.000000000 +0200
-@@ -41,10 +41,11 @@
- #include "lib/Preferences.h"
- #include "lib/DataPath.h"
- #include "lib/Exception.h"
-
- #include <iostream>
-+#include <cstdlib>
- using namespace std;
-
- void showInfo();
- void showUsage();
-
-diff -NrU5 hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp
hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp
---- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp 2008-04-19
16:48:04.000000000 +0200
-+++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp 2008-04-19
16:50:09.000000000 +0200
-@@ -28,10 +28,11 @@
- #ifdef OSS_SUPPORT
-
- #include "../Preferences.h"
-
- #include <pthread.h>
-+#include <cstring>
-
- audioProcessCallback ossDriver_audioProcessCallback;
- bool ossDriver_running;
- pthread_t ossDriverThread;
- int oss_driver_bufferSize = -1;
-diff -NrU5 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-04-19 16:48:04.000000000
+0200
-+++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-04-19 16:48:46.000000000
+0200
-@@ -25,10 +25,11 @@
- #include "FLACFile.h"
- #include "Sample.h"
-
- #include <vector>
- #include <fstream>
-+#include <cstring>
-
- #ifdef FLAC_SUPPORT
-
- //#include "FLAC/file_decoder.h"
- #include <FLAC++/all.h>
-diff -NrU5 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 2008-04-19
16:48:04.000000000 +0200
-+++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp 2008-04-19
16:48:46.000000000 +0200
-@@ -26,10 +26,11 @@
- #include <qapplication.h>
-
- #include <iostream>
- #include <stdio.h>
- #include <string>
-+#include <cstdlib>
-
- #include "lib/Hydrogen.h"
- #include "lib/LocalFileMng.h"
- #include "lib/Preferences.h"
- #include "lib/fx/LadspaFX.h"
diff --git a/source/xmultimedia-extra/hydrogen/hydrogen-flac113.patch
b/source/xmultimedia-extra/hydrogen/hydrogen-flac113.patch
deleted file mode 100644
index 29a263c..0000000
--- a/source/xmultimedia-extra/hydrogen/hydrogen-flac113.patch
+++ /dev/null
@@ -1,45 +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 <FLAC++/all.h>
-
-+#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
- }
-
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
