[gentoo-commits] gentoo-x86 commit in media-sound/hydrogen: ChangeLog hydrogen-0.9.5.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    11/07/29 09:15:29

  Modified:             ChangeLog hydrogen-0.9.5.ebuild
  Log:
  Fix building with liblrdf-0.4.0-r20
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.96                 media-sound/hydrogen/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	8 Apr 2011 11:11:50 -0000	1.95
+++ ChangeLog	29 Jul 2011 09:15:29 -0000	1.96
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.95 2011/04/08 11:11:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.96 2011/07/29 09:15:29 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@g.o> hydrogen-0.9.5.ebuild,
+  +files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch:
+  Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h) with
+  liblrdf-0.4.0-r20
 
 *hydrogen-0.9.5 (08 Apr 2011)
 



1.2                  media-sound/hydrogen/hydrogen-0.9.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild?r1=1.1&r2=1.2

Index: hydrogen-0.9.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hydrogen-0.9.5.ebuild	8 Apr 2011 11:11:50 -0000	1.1
+++ hydrogen-0.9.5.ebuild	29 Jul 2011 09:15:29 -0000	1.2
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v 1.1 2011/04/08 11:11:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.5.ebuild,v 1.2 2011/07/29 09:15:29 ssuominen Exp $
 
-EAPI=2
-inherit eutils multilib
+EAPI=4
+inherit eutils multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -24,14 +24,21 @@
 	lash? ( media-sound/lash )
 	portaudio? ( >=media-libs/portaudio-19_pre )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/scons"
 
 src_prepare() {
 	sed -i -e '/cppflags +=/d' Sconstruct || die
-	epatch patches/portaudio.patch
+	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
 
@@ -51,9 +58,9 @@
 }
 
 src_install() {
-	dobin hydrogen || die
+	dobin hydrogen
 	insinto /usr/share/hydrogen
-	doins -r data || die
+	doins -r data
 	doicon data/img/gray/h2-icon.svg
 	domenu hydrogen.desktop
 	dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html