| [proaudio] [2251] hydrogen: version bump to 0.9.5.1 and some clean ups |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2251
Author: keenblade
Date: 2012-10-28 09:35:24 +0100 (Sun, 28 Oct 2012)
Log Message:
-----------
hydrogen: version bump to 0.9.5.1 and some clean ups
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
trunk/overlays/proaudio/media-sound/hydrogen/Manifest
trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch
trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/hydrogen/files/0.9.1-OSS.patch
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-segfault.patch
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-9999-configure.patch
trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
Modified: trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,7 +1,16 @@
# ChangeLog for media-sound/hydrogen
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*hydrogen-0.9.5.1 (28 Oct 2012)
+
+ 28 Oct 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx -files/0.9.1-OSS.patch,
+ -files/hydrogen-0.9.2-configure.in.patch, -hydrogen-0.9.3-r1.ebuild,
+ -files/hydrogen-0.9.3-flac113.patch, -files/hydrogen-0.9.3-segfault.patch,
+ +hydrogen-0.9.5.1.ebuild, +files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch,
+ hydrogen-9999.ebuild, -files/hydrogen-9999-configure.patch:
+ version bump to 0.9.5.1. clean up
+
25 Feb 2010; Frieder Buerzele <evermind@xxxxxxxxxxxxx>
hydrogen-0.9.3-r1.ebuild, -hydrogen-0.9.4_beta.ebuild:
cleanup
Modified: trunk/overlays/proaudio/media-sound/hydrogen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,10 +1,6 @@
-AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0
-AUX hydrogen-0.9.2-configure.in.patch 1350 RMD160 66e30255f1edaa5127e78d4bc266af6fde66451f SHA1 f396013d25a9101f94050ada8a913b621af88ba9 SHA256 a94a75fdf3392895aba45a7252155bc5aa5809b9304191677a482cd9d36868c9
-AUX hydrogen-0.9.3-flac113.patch 1065 RMD160 c49ee2d09aab98ea9f93639d86bc60e90fa595e0 SHA1 a4a034bab94b71f9d9dc9a546b05d9509a2411a0 SHA256 6c9024c257217d7b5cdcd8cfe50746274186435a82d1cda5d4bfd02a0ad70232
-AUX hydrogen-0.9.3-segfault.patch 402 RMD160 0f0f5b11a0eb7368b48b9ee8d0fae39e4d2c1403 SHA1 f6c7cb3890e7f5b1a138949ad40947d8ba27dd3b SHA256 e4daeb98116097c90e32ef543ee32a127835e04d647d76ac0332ac0703e1989e
-AUX hydrogen-9999-configure.patch 1389 RMD160 afda9f8885753457b210aca4e8cc59f236a5c8b6 SHA1 553287b8b46b4dd9c2adcd66e434a4dd28056733 SHA256 6dc6a1e7fe1524d8e000528f2311befd5abc74b0def7519a0d8a23c3641f602a
-DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
-EBUILD hydrogen-0.9.3-r1.ebuild 3356 RMD160 6ff63dca7cb1cfc0cf00ada93aa381835aede05b SHA1 5064926d9749f3b1e6de510d33fc0673c00162ea SHA256 5c06fb6ad488d173a9a474b57d47f3c9411a7b99ba6b2c90afb8499d83735001
-EBUILD hydrogen-9999.ebuild 2028 RMD160 235e86b357d56645cfc97f0444ae9de0697ed05d SHA1 b34d51420fc3b22ada36c012154957c6e24f5975 SHA256 8440f83075ea70de0724db10220862d6c01c098d869885f3db184039e5365a00
-MISC ChangeLog 574 RMD160 5a7b6db4c8c0076b12bb2e0405cd488179de6547 SHA1 0c2c0eee205e1a79a061737847347e11b0ec9f0d SHA256 590c07f679c72716db28b3d4e0d8985d7975500fff966fd6c68cc058bc9599cc
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch 858 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31 WHIRLPOOL de87409c530f8a3ce2ef959d43e46bb6462e7310660532be83d85b94ac4ab1dac50daf355d3a301923cc0ac3c4df0e691312640dcdf270ca9d03f23744db8cd5
+DIST hydrogen-0.9.5.1.tar.gz 5515314 SHA256 ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb SHA512 bcbd0684499f8ff019540746ed6ad5b99b5a1af04771365880e4fbdac5c26b5944c7f9815875390f42b8d2b428457d414732ed171589c094da99d99eae3a0873 WHIRLPOOL 14908df1f342b92eb53ed3d4118ddd5a918d3c78e9b0becd85777bc7ceee81a4a990192ad7f40ce3ddd7a7d1eb6b99012696f5ce012e68b7ab04aaf7697e2014
+EBUILD hydrogen-0.9.5.1.ebuild 1830 SHA256 360b9d8698930c498f600a1792318ce493e418ec810469f7cdc7ab882d64a2ef SHA512 e95c1e0441b73b627a7dda03e0e41ebe1c0f19eb5678017716d46e7f0c6955de549ca1405a5831af052a0141db7f38f59502b8f53c452c201220b8ccd7fe5357 WHIRLPOOL 8ec4aef85d9ce08b5d9a7addf15da0cebf0b8c13ec25559a58027f429f9923a9eef8bebd0d2bbb14cc9a7cdd60847df1e1cd7c138de1c2aeaff8a2913ff55a56
+EBUILD hydrogen-9999.ebuild 1973 SHA256 eb0d657befeb96670f701dff34ce397488fc87f54f5b2d8597ab65f8b8e72b56 SHA512 fc687e0733b4e360d73d2c94ce39031dada35d646d124b4fb74d12219087c982606c7667905e7e9b2f1aa843d014dd94cab0fcf78b6601accc784e34f3a9cd1f WHIRLPOOL cd4a0ee2108b04c7a69394fbf8ba07fb701ad967cec396d4718bcc4f65b52c7124137136a9addf8e7e642816b5eb9ee756d1b510920a7a1936526fe5a4e2640a
+MISC ChangeLog 1011 SHA256 d72dfcb5be5e6d8a901e1c13140c99436f3c0d0799719ba4c7745e5da963aa2b SHA512 c5726c9e5f7656c90946c11d85a7c3576400ac6e49bd8a47ca10dad69a6b47be02a8bd33874bdbed4dfaba4b1048d405fc112effb129e03672a01f68694d9628 WHIRLPOOL f1d34f74536ed5d67024bc61b88a925a7b005a2269a4ddf928b240c777dfa4b4bbc348586d3fa9dc82e55160285e004d19ce327a0d56eebc9941465e0f5958cc
+MISC metadata.xml 268 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89 SHA512 3d709a016692f887d642d19b2644c10a09f666133f1f035b8a4c10e5772fbb39fa84a856a496d392594ccf850739fbf46ffa78ecc74214e8342ee97676b375e9 WHIRLPOOL 17c886c5b97925bd9223c0210170a63e55a2c2a238ae81ebf8efa14109d790406f45d0773d63bea825c1e40b058bd9e20a5d9c264da4db7c8fd2e556ecd83b2a
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/files/0.9.1-OSS.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/0.9.1-OSS.patch 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/0.9.1-OSS.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,36 +0,0 @@
---- lib/drivers/OssDriver.cpp.bak 2005-05-07 20:13:45.000000000 -0400
-+++ lib/drivers/OssDriver.cpp 2005-05-07 20:16:06.000000000 -0400
-@@ -241,7 +241,9 @@
- // prepare the 2-channel array of short
- for (uint i = 0; i < (unsigned)oss_driver_bufferSize; i++) {
- audioBuffer[i * 2] = (short)(out_L[i] * 32768.0);
-+ be_swap_short(&audioBuffer[i * 2]);
- audioBuffer[i * 2 + 1] = (short)(out_R[i] * 32768.0);
-+ be_swap_short(&audioBuffer[i * 2 + 1]);
- }
-
- unsigned long written = ::write(fd, audioBuffer, size * 2);
-@@ -253,7 +255,13 @@
- }
-
-
-+void be_swap_short(short *s){
-+ unsigned char swap;
-
-+ swap = (char)(*s & 0xFF);
-+ *s = *s >> 8;
-+ *s = (swap << 8) | *s;
-+}
-
-
- int OssDriver::log2(int n) {
---- lib/drivers/OssDriver.h.bak 2005-05-07 20:28:24.000000000 -0400
-+++ lib/drivers/OssDriver.h 2005-05-07 20:29:09.000000000 -0400
-@@ -31,6 +31,7 @@
- // check if OSS support is enabled
- #ifdef OSS_SUPPORT
-
-+void be_swap_short(short *s);
-
- #ifdef __NetBSD__
- #include <soundcard.h>
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,36 +0,0 @@
---- a/configure.in.orig 2006-05-07 04:59:45.000000000 +0300
-+++ b/configure.in 2006-05-07 05:28:24.000000000 +0300
-@@ -15,8 +15,8 @@
- -----------------------------------------------------------------
-
- "
--#ac_qmake_lflags="-static"
--#AC_SUBST(ac_qmake_lflags)
-+ac_qmake_lflags="${LDFLAGS}"
-+AC_SUBST(ac_qmake_lflags)
-
-
- # static build
-@@ -38,8 +38,9 @@
- AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.])
-
-
--AC_ARG_ENABLE(profile, [ --enable-profile enable profile info (default=no)], [useProfile="yes"], [useProfile="no"])
-+AC_ARG_ENABLE(profile, [ --enable-profile enable profile info (default=no)], [useProfile=$enableval])
- if test "x$useProfile" = "xyes"; then
-+ echo " * Profile mode enabled."
- ac_qmake_cflags="-pg"
- ac_qmake_cxxflags="-pg"
- ac_qmake_lflags="-pg"
-@@ -49,9 +50,9 @@
- fi
-
- dnl Enable debugging argument option.
--AC_ARG_ENABLE(debug, [ --enable-debug enable debugging (default=no)], [ac_debug="debug"], [ac_debug="release"])
-+AC_ARG_ENABLE(debug, [ --enable-debug enable debugging (default=no)], [debug_enabled=$enableval])
- AC_SUBST(ac_debug)
--if test "x$ac_debug" = "xdebug"; then
-+if test "x$ac_debug" = "xyes"; then
- AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
- features_list="${features_list} (Debug)"
- echo " * Debug mode enabled."
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -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
- }
-
-
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-segfault.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-segfault.patch 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.3-segfault.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,11 +0,0 @@
---- ./src/gui/PatternEditor/PatternEditor.cpp.org 2007-01-09 17:03:16.000000000 +0100
-+++ ./src/gui/PatternEditor/PatternEditor.cpp 2007-01-09 17:03:46.000000000 +0100
-@@ -874,6 +874,8 @@
-
- notePoint = m_notePoint[i];
- notePoint += QPoint(tempRegion.left(), tempRegion.top() );
-+ if (notePoint.isNull())
-+ continue;
- int x = notePoint.x();
- int y = notePoint.y();
-
Added: trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -0,0 +1,23 @@
+conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead
+
+--- Sconstruct
++++ Sconstruct
+@@ -268,7 +268,8 @@
+ env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
+ env.Append( LIBS = [ "pthread" ] )
+
+- if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
++ if str(env['lrdf']) == "1":
++ env.ParseConfig('pkg-config --cflags --libs lrdf')
+ if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
+ if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
+ if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
+@@ -449,7 +450,7 @@
+ Exit(1)
+
+ #lrdf: categorizing of ladspa effects
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
++if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'):
+ print 'lrdf must be installed!'
+ Exit(1)
+
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-9999-configure.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-9999-configure.patch 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-9999-configure.patch 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,39 +0,0 @@
---- configure.orig 2007-06-29 22:00:47.000000000 +0300
-+++ configure 2007-06-29 22:05:35.000000000 +0300
-@@ -40,10 +40,11 @@
- /usr/local/Trolltech/Qt-4.1.2 \
- /usr/local/Trolltech/Qt-4.1.1 \
- /usr/local/Trolltech/Qt-4.1.0 \
-- /usr \
-+ /usr/lib \
-+ /usr/lib/qt4 \
- ; do
- if test "x$ac_qtlib" = "x"; then
-- if test -f $X/lib/libQtCore.a -o -f $X/lib/libQtCore.so -o -d $X/lib/QtCore.framework -o -f $X/lib/libQtCore.dylib; then
-+ if test -f $X/libQtCore.a -o -f $X/libQtCore.so -o -d $X/QtCore.framework -o -f $X/libQtCore.dylib; then
- ac_qtlib=$X
- QTDIR=$X
- echo " Found QT4 libraries in $X"
-@@ -55,7 +56,7 @@
- echo ""
- ac_qtlib=""
- if test "x$ac_qtlib" = "x"; then
-- if test -f $QTDIR/lib/libQtCore.so -o -f $QTDIR/lib/libQtCore.a -o -f $QTDIR/lib/libQtCore_debug.so -o -f $QTDIR/lib/libQtCore_debug.a -o -d $QTDIR/lib/QtCore.framework -o -f $QTDIR/lib/libQtCore.dylib; then
-+ if test -f $QTDIR/libQtCore.so -o -f $QTDIR/libQtCore.a -o -f $QTDIR/libQtCore_debug.so -o -f $QTDIR/libQtCore_debug.a -o -d $QTDIR/QtCore.framework -o -f $QTDIR/libQtCore.dylib; then
- ac_qtlib=$QTDIR
- echo " * Searching for QT library in $QTDIR [ OK ]"
- else
-@@ -71,11 +72,11 @@
- fi
-
-
--QMAKE_BIN=$QTDIR/bin/qmake
-+QMAKE_BIN=/usr/bin/qmake
-
- if [ -f $QTDIR/bin/qmake-qt4 ]
- then
-- QMAKE_BIN=$QTDIR/bin/qmake-qt4
-+ QMAKE_BIN=/usr/bin/qmake-qt4
- fi
-
- echo ""
Deleted: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils patcher autotools multilib
-EAPI=1
-
-DESCRIPTION="Linux Drum Machine"
-HOMEPAGE="http://hydrogen.sourceforge.net/";
-SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug jack ladspa oss portaudio"
-
-RDEPEND="dev-libs/libxml2
- media-libs/libsndfile
- media-libs/audiofile
- media-libs/flac
- portaudio? ( =media-libs/portaudio-18.1* )
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- ladspa? ( media-libs/liblrdf )
- x11-libs/qt:3"
-
- # disabled
-DEPEND="${RDEPEND}"
- # app-text/docbook-sgml-utils is only needed to support:
- # data/doc/updateManuals.sh (we don't run this)
-
-src_unpack() {
- unpack ${A}
- if use ppc; then
- cd ${S}/src
- epatch ${FILESDIR}/0.9.1-OSS.patch || die "patching failed"
- fi
- cd ${S}
- # fix gcc 4 issue
- sed -i -e 's|TiXmlDeclaration::TiXmlDeclaration|TiXmlDeclaration|g' src/lib/xml/tinyxml.h
-
- mv data/doc/man ${S}
- # broken or portability issue
- find . -iname Makefile.in -exec sed -i -e "s:update-menus::" {} \;
- sed -e "s:lib/hydrogen:$(get_libdir)/hydrogen:g" -i plugins/wasp/Makefile.in
- ### fix broken portaudio-18 include (if portaudio-19 also installed)
- if use portaudio ;then
- # find PortAudio/Midi files
- sed -e "s:pa_unix_oss:lib:g" -e "s:pa_common:include:g" \
- -e "s:pm_linux:lib:g" -e "s:pm_common:include:g" \
- -i configure.in
-
- grep -q PortAudioStream /usr/include/portaudio/portaudio.h && \
- sed -i 's@\(#include\ *<\)\(portaudio.*\)@\1portaudio/\2@g' \
- src/lib/drivers/PortAudioDriver.h
- fi ###
-
- # configure.in.patch [20070109] fixes use_enable debug
- patcher "${FILESDIR}/hydrogen-0.9.2-configure.in.patch" -a -f
-
- # fixes a segfault while changing pattern change
- # see bug: http://proaudio.tuxfamily.org/bugs/view.php?id=2
- patcher "${FILESDIR}/hydrogen-0.9.3-segfault.patch" -a -f
- epatch "${FILESDIR}/${P}-flac113.patch"
- make -f Makefile.cvs
-}
-
-src_compile() {
- need-autoconf 2.5
-
- export PORTAUDIOPATH="${ROOT}usr"
- # PortMidi not yet in the repository
- # export PORTMIDIPATH="${ROOT}usr"
-
- econf $(use_enable jack jack-support) \
- $(use_enable portaudio) \
- $(use_enable alsa) \
- $(use_enable debug) \
- $(use_enable ladspa) \
- $(use_enable ladspa lrdf-support) \
- $(use_enable oss oss-support) \
- econf || die "Failed configuring hydrogen!"
- emake -j1 || die "Failed making hydrogen!"
-}
-
-src_install() {
- pushd data/i18n
- ./updateTranslations.sh
- rm *.ts updateTranslations.sh
- popd
-
- pushd data/doc
- ./updateManuals.sh
- rm *.docbook updateManuals.sh
- popd
-
- make DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog README TODO
- dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
- doman man/C/hydrogen.1
-
- for N in 16 24 32 48 64 ; do
- dodir /usr/share/icons/hicolor/${N}x${N}/apps
- dosym /usr/share/hydrogen/data/img/gray/icon${N}.png \
- /usr/share/icons/hicolor/${N}x${N}/apps/hydrogen.png
- done
- dodir /usr/share/icons/hicolor/scalable/apps
- dosym /usr/share/hydrogen/data/img/gray/icon.svg \
- /usr/share/icons/hicolor/scalable/apps/hydrogen.svg
-
- # fix fdo category
- sed -i -e "s/AudioVideo;Sound;Audio;Qt;/Qt;AudioVideo;Audio;Sequencer;/" \
- "${D}/usr/share/applications/${PN}.desktop"
-}
Copied: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild (from rev 2250, trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild 2012-10-28 08:35:24 UTC (rev 2251)
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa +archive debug jack ladspa lash oss portaudio"
+
+RDEPEND="x11-libs/qt-gui:4 x11-libs/qt-core:4
+ archive? ( app-arch/libarchive )
+ !archive? ( >=dev-libs/libtar-1.2.11-r3 )
+ >=media-libs/libsndfile-1.0.18
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )
+ ladspa? ( media-libs/liblrdf )
+ lash? ( media-sound/lash )
+ portaudio? ( >=media-libs/portaudio-19_pre )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/scons"
+
+src_prepare() {
+ sed -i -e '/cppflags +=/d' Sconstruct || die
+ epatch \
+ patches/portaudio.patch \
+ "${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch
+}
+
+src_compile() {
+ # FIXME: The -I/usr/include/raptor2 gets lost in middle of build
+ # despite -use_lrdf_pkgconfig.patch
+ use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
+ export QTDIR="/usr/$(get_libdir)"
+ local myconf='portmidi=0' #90614
+
+ use alsa || myconf+=' alsa=0'
+ use archive && myconf+=' libarchive=1'
+ use debug || myconf+=' debug=0'
+ use jack || myconf+=' jack=0'
+ use ladspa || myconf+=' lrdf=0'
+ use lash && myconf+=' lash=1'
+ use oss || myconf+=' oss=0'
+ use portaudio && myconf+=' portaudio=1'
+
+ scons \
+ prefix=/usr \
+ DESTDIR="${D}" \
+ optflags="${CXXFLAGS}" \
+ ${myconf} || die
+}
+
+src_install() {
+ dobin hydrogen
+ insinto /usr/share/hydrogen
+ doins -r data
+ doicon data/img/gray/h2-icon.svg
+ domenu hydrogen.desktop
+ dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
+ dodoc AUTHORS ChangeLog README.txt
+}
Modified: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild 2012-10-26 14:21:05 UTC (rev 2250)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild 2012-10-28 08:35:24 UTC (rev 2251)
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=1
+EAPI=4
-inherit eutils qt4 subversion
+inherit eutils subversion
DESCRIPTION="Linux Drum Machine"
HOMEPAGE="http://hydrogen.sourceforge.net/";
@@ -16,11 +16,7 @@
KEYWORDS=""
IUSE="alsa debug flac jack ladspa lash portaudio"
-RDEPEND="
- || ( (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4 )
- >=x11-libs/qt-4.1:4 )
+RDEPEND="x11-libs/qt-core:4 x11-libs/qt-gui:4
dev-libs/libxml2
media-libs/libsndfile
media-libs/audiofile
@@ -42,8 +38,8 @@
export QMAKE_CXX=$(tc-getCXX)
export QMAKE_LINK=$(tc-getCXX)
export QMAKE_CFLAGS_RELEASE="${CFLAGS}"
- export QMAKE_CFLAGS_DEBUG="${CFLAGS}"
- export QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"
+ export QMAKE_CFLAGS_DEBUG="${CFLAGS}"
+ export QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"
export QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}"
export QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
export QMAKE_LFLAGS_DEBUG="${LDFLAGS}"