diff options
| -rw-r--r-- | media-sound/hydrogen/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/hydrogen/Manifest | 13 | ||||
| -rw-r--r-- | media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch | 23 | ||||
| -rw-r--r-- | media-sound/hydrogen/hydrogen-0.9.5.ebuild | 19 |
4 files changed, 49 insertions, 13 deletions
diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog index d53ac7204166..b4f875b928ee 100644 --- a/media-sound/hydrogen/ChangeLog +++ b/media-sound/hydrogen/ChangeLog @@ -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@gentoo.org> 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) diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest index 284323b9c9d8..0341b1849948 100644 --- a/media-sound/hydrogen/Manifest +++ b/media-sound/hydrogen/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 RMD160 8a35bc059153d92f0c138b408820777511ba24b7 SHA1 39d4907dfd5990d24ec92c365efb156cfe666763 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 DIST hydrogen-0.9.4.2.tar.gz 3860898 RMD160 cebf63fb851aa61f149fee75145e59a091cba551 SHA1 7b20e40e90c4c1abdda8900109a5983a314719a9 SHA256 0be373b5d9b46dcfc111209b29ff7788aa84069fd53ad78b14bdf67d5c70b716 DIST hydrogen-0.9.4.tar.gz 3808532 RMD160 9f1514462eaa756fe0a3e8fed3ff647a32ad033d SHA1 e988710f82af858c0c688cb1d1e19d789fca49ef SHA256 982b768b48e8402104949c64fac4d74d804f41b6ab1b90457711840da99685d7 DIST hydrogen-0.9.5.tar.gz 5239702 RMD160 851a99e4ab7eb417a61a78187a083bfd91819436 SHA1 7cb1578aac493483ca984b9f7c3918d3b264e460 SHA256 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 EBUILD hydrogen-0.9.4.2.ebuild 1687 RMD160 22f4bbfe327b08be3eaf5c871565e0d4402607c1 SHA1 9b6003a9cc148046134ef68f325fa83659b2e024 SHA256 91d443926760866f352e1bf2ef06f89ee33d1cea6bef8ef67d63db38c4294d44 EBUILD hydrogen-0.9.4.ebuild 1523 RMD160 e90fac2b9198dc8ae3bae39210047f1fc13f4946 SHA1 693bd0779d2643d5142b6d54eab2a74d4b268fb6 SHA256 69931b6e10c98a6a156ac5ebc633e92146135a3af5f0bffc168177ab7075b7cf -EBUILD hydrogen-0.9.5.ebuild 1646 RMD160 2aff8e9492140aa1f5b903da02ef29af42fa0ce1 SHA1 0a7a462d61b80a72e14d7f777e8aa68e4fa81025 SHA256 5e1cf1762a9db99f80958d2d714b323473d80a2ade50c45a03dcba70372b921a -MISC ChangeLog 14637 RMD160 1b652a8e5fdbd5f4007aa4c304d51b607274d37a SHA1 4cb49b375ed14d7e8eb2b0b6a5b336e5d9905798 SHA256 1b364dec4e749769b5d3bb0a8b126e01350ceac7b470e8791d3901707b1586b9 +EBUILD hydrogen-0.9.5.ebuild 1903 RMD160 95686d39d55b58b67bb9edc59ed4fcd2a9b89f37 SHA1 8bf147c93e830463901686315464b88683229d13 SHA256 73d1581e382b2e6b2bd33741ed956ad449e899003f666de4b85681761e44a099 +MISC ChangeLog 14856 RMD160 78f7657f7b54564d8ab35397a6c791c294655fb6 SHA1 4a8025b7e5b1ceb5105ea788addac76b686d0f79 SHA256 96e75a221829b4deb5d7f2663f27c10dc34412e52e5030fddf9e4b4dbab8e971 MISC metadata.xml 245 RMD160 ed73355f5397581f4771b2ea25f16fd3853e5637 SHA1 a0e7b5c2885c4e764ef7ed793b30865f6aed8384 SHA256 05597fe58e4b04b564fe6ab688cf21d440bdace9db321e23647fa363199a401d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2e7XwACgkQvFcC4BYPU0od+wCfW3VbbEQwa1SVQrW9pmCm+zyq -We0AnA/TIfnZuvaF8Yp/y5q6i9fF4bTy -=FV/g +iF4EAREIAAYFAk4yebIACgkQXkR9YqOcLPGnEQD+L1q7H5FtcHkhL1EfQrN6qVzf +TLix/fwa+F0uthvGbmYA/1RV8P8wSdmJCBuJLTl1HbDPkRxQK6c+v/KJKv9z2iF2 +=cpkK -----END PGP SIGNATURE----- diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch new file mode 100644 index 000000000000..6c862eac5836 --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch @@ -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) + diff --git a/media-sound/hydrogen/hydrogen-0.9.5.ebuild b/media-sound/hydrogen/hydrogen-0.9.5.ebuild index 4e1f99d28ac1..705af211286a 100644 --- a/media-sound/hydrogen/hydrogen-0.9.5.ebuild +++ b/media-sound/hydrogen/hydrogen-0.9.5.ebuild @@ -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 @@ RDEPEND="x11-libs/qt-gui:4 x11-libs/qt-core:4 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_compile() { } 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 |