summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-02-12 19:23:13 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-02-12 19:23:13 +0000
commitdec0e9ed5f5b7edeb84a49ed8913c564ff5605c4 (patch)
tree569b517a1f55d06036f9f5078985c9b082e9d052 /media-sound
parentstable on amd64 (diff)
downloadgentoo-2-dec0e9ed5f5b7edeb84a49ed8913c564ff5605c4.tar.gz
gentoo-2-dec0e9ed5f5b7edeb84a49ed8913c564ff5605c4.tar.bz2
gentoo-2-dec0e9ed5f5b7edeb84a49ed8913c564ff5605c4.zip
~dep to flac 1.1.2, rev bump in ~arch with a flac 1.1.3 compatibility fix, bug #152007
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/hydrogen/ChangeLog11
-rw-r--r--media-sound/hydrogen/files/digest-hydrogen-0.9.3-r13
-rw-r--r--media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch45
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.0.ebuild6
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.1.ebuild6
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.2.ebuild6
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild92
-rw-r--r--media-sound/hydrogen/hydrogen-0.9.3.ebuild4
8 files changed, 161 insertions, 12 deletions
diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index bd92e9c62bc7..1e99d1936c3c 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-sound/hydrogen
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.46 2007/02/02 14:33:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.47 2007/02/12 19:23:13 aballier Exp $
+
+*hydrogen-0.9.3-r1 (12 Feb 2007)
+
+ 12 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/hydrogen-0.9.3-flac113.patch, hydrogen-0.9.0.ebuild,
+ hydrogen-0.9.1.ebuild, hydrogen-0.9.2.ebuild, hydrogen-0.9.3.ebuild,
+ +hydrogen-0.9.3-r1.ebuild:
+ ~dep to flac 1.1.2, rev bump in ~arch with a flac 1.1.3 compatibility fix,
+ bug #152007
02 Feb 2007; Simon Stelling <blubb@gentoo.org> hydrogen-0.9.3.ebuild:
multilib-strict fix; bug 155967; credit to Malcolm Lashley
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1 b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1
new file mode 100644
index 000000000000..6b770b479057
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1
@@ -0,0 +1,3 @@
+MD5 d5840b5d330d433d00ea1727efb0fc7f hydrogen-0.9.3.tar.gz 2771792
+RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 hydrogen-0.9.3.tar.gz 2771792
+SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a hydrogen-0.9.3.tar.gz 2771792
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
new file mode 100644
index 000000000000..29a263c26273
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
@@ -0,0 +1,45 @@
+--- 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
+ }
+
+
diff --git a/media-sound/hydrogen/hydrogen-0.9.0.ebuild b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
index 610ad4d4faf3..3d25b6b33125 100644
--- a/media-sound/hydrogen/hydrogen-0.9.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.13 2006/09/23 00:27:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.14 2007/02/12 19:23:13 aballier Exp $
inherit eutils kde-functions
@@ -16,7 +16,7 @@ IUSE="alsa jack ladspa"
DEPEND=">=media-libs/libsndfile-1.0.0
alsa? ( media-libs/alsa-lib )
>=media-libs/audiofile-0.2.3
- >=media-libs/flac-1
+ ~media-libs/flac-1.1.2
jack? ( media-sound/jack-audio-connection-kit )
ladspa? ( media-libs/liblrdf )"
need-qt 3
diff --git a/media-sound/hydrogen/hydrogen-0.9.1.ebuild b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
index ac112fa555e2..7834d9a47f94 100644
--- a/media-sound/hydrogen/hydrogen-0.9.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.7 2006/09/23 00:27:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.8 2007/02/12 19:23:13 aballier Exp $
inherit eutils kde-functions
@@ -15,7 +15,7 @@ IUSE="alsa jack ladspa"
DEPEND=">=media-libs/libsndfile-1.0.0
>=media-libs/audiofile-0.2.3
- >=media-libs/flac-1
+ ~media-libs/flac-1.1.2
=x11-libs/qt-3*
alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/hydrogen/hydrogen-0.9.2.ebuild b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
index 6695fc5c5b89..dd43b962e014 100644
--- a/media-sound/hydrogen/hydrogen-0.9.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.2.ebuild,v 1.4 2007/02/04 08:23:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.2.ebuild,v 1.5 2007/02/12 19:23:13 aballier Exp $
inherit eutils kde-functions autotools
@@ -15,7 +15,7 @@ IUSE="alsa debug jack ladspa oss"
RDEPEND="media-libs/libsndfile
media-libs/audiofile
- media-libs/flac
+ ~media-libs/flac-1.1.2
media-libs/portaudio
alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..8ec0e2b24870
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild,v 1.1 2007/02/12 19:23:13 aballier Exp $
+
+inherit eutils kde-functions autotools multilib
+
+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 )
+ alsa? ( media-libs/alsa-lib )
+ jack? ( media-sound/jack-audio-connection-kit )
+ ladspa? ( media-libs/liblrdf )"
+
+need-qt 3
+
+src_unpack() {
+ unpack ${A}
+ if use ppc; then
+ cd ${S}/src
+ epatch ${FILESDIR}/0.9.1-OSS.patch || die "patching failed"
+ fi
+ cd ${S}
+
+ mv data/doc/man ${S}
+ # broken or portability issue
+ find . -iname Makefile.in -exec sed -i -e "s:update-menus::" {} \;
+ # 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
+ sed -e "s:lib/hydrogen:$(get_libdir)/hydrogen:g" -i plugins/wasp/Makefile.in
+ make -f Makefile.cvs
+
+ epatch ${FILESDIR}/hydrogen-0.9.2-configure.in.patch
+ epatch ${FILESDIR}/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch
+ epatch "${FILESDIR}/${P}-flac113.patch"
+}
+
+src_compile() {
+ export PORTAUDIOPATH="${ROOT}usr"
+ # PortMidi not yet in the repository
+ # export PORTMIDIPATH="${ROOT}usr"
+
+ local myconf="$(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)"
+
+ eautoconf
+ econf ${myconf} || 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
+ 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
+}
diff --git a/media-sound/hydrogen/hydrogen-0.9.3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
index 53284747700f..aa3dd4e6748d 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.12 2007/02/02 14:33:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.13 2007/02/12 19:23:13 aballier Exp $
inherit eutils kde-functions autotools multilib
@@ -16,7 +16,7 @@ IUSE="alsa debug jack ladspa oss portaudio"
RDEPEND="dev-libs/libxml2
media-libs/libsndfile
media-libs/audiofile
- media-libs/flac
+ ~media-libs/flac-1.1.2
portaudio? ( media-libs/portaudio )
alsa? ( media-libs/alsa-lib )
jack? ( media-sound/jack-audio-connection-kit )