Revision: 2541
Author: lilrc
Date: 2013-03-17 23:43:59 +0100 (Sun, 17 Mar 2013)
Log Message:
-----------
media-sound/hydrogen-0.9.5.1: Add jack version patch (closes #0000157). Thanks
to dbautista for reporting the bug. Add portmidi support. Unkeyword ~ppc.
Improve the lrdf patch. Move to base and scons-utils eclass. Update EAPI.
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
trunk/overlays/proaudio/media-sound/hydrogen/Manifest
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
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-jack-version.patch
Modified: trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog 2013-03-17
19:42:13 UTC (rev 2540)
+++ trunk/overlays/proaudio/media-sound/hydrogen/ChangeLog 2013-03-17
22:43:59 UTC (rev 2541)
@@ -3,6 +3,18 @@
# $Header: $
17 Mar 2013; Karl Linden (lilrc) <[email protected]>
+ hydrogen-0.9.5.1.ebuild, +files/hydrogen-0.9.5.1-jack-version.patch,
+ files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch:
+ Update EAPI.
+ Add portmidi support.
+ Unkeyword for ~ppc (media-libs/portmidi does not support ~ppc).
+ Move to base and scons-utils eclasses.
+ Improve the lrdf patch.
+ Add patch so that the package can compile against
+ media-sound/jack-audio-connection-kit-1.9.9.5 (closes #0000157). Thanks
+ to dbautista for reporting the bug.
+
+ 17 Mar 2013; Karl Linden (lilrc) <[email protected]>
hydrogen-0.9.5.1.ebuild, hydrogen-9999.ebuild:
Keyword hydrogen-0.9.5.1 for ~x86 ~amd64 ~ppc to avoid repoman
warnings as virtual/liblash is not yet stable.
Modified: trunk/overlays/proaudio/media-sound/hydrogen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2013-03-17
19:42:13 UTC (rev 2540)
+++ trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2013-03-17
22:43:59 UTC (rev 2541)
@@ -1,6 +1,7 @@
-AUX hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch 858 SHA256
829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 SHA512
251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
WHIRLPOOL
de87409c530f8a3ce2ef959d43e46bb6462e7310660532be83d85b94ac4ab1dac50daf355d3a301923cc0ac3c4df0e691312640dcdf270ca9d03f23744db8cd5
+AUX hydrogen-0.9.5.1-jack-version.patch 468 SHA256
6889c4234d8cdcc8ef40e9954765847ac40bffd88f52d903e0574fa548aee184 SHA512
435f9fa79eef51870e058f1edcea87e5bf46f0cea5f3faed2cbc6e8d89a7d59f41f1f9ad5971bec0cc788b8e9ccf7562781d42dc4835150ce99b3c8556aba8a1
WHIRLPOOL
39374ddb4c00735d2aa9d528cc1f955ab3fbfa5e84e625b4f3cc9e660ee3b074142d90a386295e05f5a1e6f3e11582b33bf3a93d5f1d17238df1a858532d5c15
+AUX hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch 1306 SHA256
9c0c25fe77816efd4c1951cd06e5a1e69dddb0aa455ba16b32d0278489a78cc1 SHA512
ed408ee5e912527689f42e2f0d16ef550bd458b6edd56853add8b0d8fbf1158ec78c026c146fa1e6f9804d12544b67415fb44913f2fc08aef9dfa3357c4e05f0
WHIRLPOOL
97f87b189ec3d671dcc2f8cfbd5d624319b5134512bab9ef81b76bc2d305e796372b50ca59f18c8c36f87cd7a123d079cdb91a2a587735d98aa62505a956ba19
DIST hydrogen-0.9.5.1.tar.gz 5515314 SHA256
ebe105fec9ce8e2129f9e1bb5bfe675f1c7143a80babda40620cb3ef9eb97ebb SHA512
bcbd0684499f8ff019540746ed6ad5b99b5a1af04771365880e4fbdac5c26b5944c7f9815875390f42b8d2b428457d414732ed171589c094da99d99eae3a0873
WHIRLPOOL
14908df1f342b92eb53ed3d4118ddd5a918d3c78e9b0becd85777bc7ceee81a4a990192ad7f40ce3ddd7a7d1eb6b99012696f5ce012e68b7ab04aaf7697e2014
-EBUILD hydrogen-0.9.5.1.ebuild 1821 SHA256
253ff1fef16623fef670a93323f18e9314818f8dbadc0607e1b8594818888308 SHA512
1941b729dec57d404987e78e535a26cda089047720bdab4aaa7e6c0064df2834549cff7581a329fb4d164d657bf247ebcc55b4d4e9e95a79efba617950552a49
WHIRLPOOL
fd8801d9db411091426828504a55b170f88434f55da6f5dd1cf51059c9ec75d052bbb4017d83fe0ce81c0dbe1ac1dbddf25f5033e2408f8b9f362d0ad503e189
+EBUILD hydrogen-0.9.5.1.ebuild 1692 SHA256
7194ae782b79e530f7c4ac7863d7a5d0e55d0b94fd81b86efe9c80e010222789 SHA512
5dc1a3dd23b0eaae995f8a2d2824c5aabea3dcb1d2db8549e2a81185d237dcd93cf217336f632b579299c407c11c5be44093c4be0e54625d37efd284cf7e76d4
WHIRLPOOL
a25093e56120d666ffb92c998e78e4c4e383bb9365abc3273cd28880597c31e2e2eb69e9c85e928f84248f8aa8ade535d34304b5ac2cbad6278b399991d353ac
EBUILD hydrogen-9999.ebuild 1476 SHA256
4a8b8b03718a41b0d19a7d334e3dd0d6734ef01e28e8b2c9f91e73629acf2b73 SHA512
fa10a5f3cdf31f69da7b528fa99696a72e7d350c84bb06b5acefc290bcc80f1435b241768d561a314d54d831b211d34040e4d52b603f2aadb9e32aaaec0757c6
WHIRLPOOL
7ffba0a095a847fe37b30987f35c9fbe06da680f3bd16dac04121f76753349cb638130efe811a6f0100b4a5a033569b7922d7b61b71452c3e39804c041b5b747
-MISC ChangeLog 2480 SHA256
04b0f91c8c430fcf14e083d2f73959274376e7a8cf58b6ebbcd974823b5423c6 SHA512
2c43257b1aae714f94f0d68c550bc429c3210a8672882753fc4f84b3259f255bb8d21957e90f6ca6635e1f3a9d7be471ebc8da33b321ad169e85f1ed37eb7c7e
WHIRLPOOL
ff7a7eb093408cf45fd47f123f669ceaeae14ff67ce951bdca4bb89ddb1462902229f76dc0dfc81031157f8260539fe445c9bc2762371b1f3dca077e9fa97e25
+MISC ChangeLog 3006 SHA256
2cdcab87755b81dcc0ee02a8ac4b920efee8db91bedb49189fd3d2304ac443d7 SHA512
9a9bc07bb8f0ac963699cc02440302e67175ced8923193b941859ef11528c32084071b05fea131c22e0377216903399706738cd62afba25b6ec2c31b3bcee3cd
WHIRLPOOL
6ff6da83a346ba37cf75496ae64ee7046d1234dc3535bf3861d14f9af1d524b90b2c154ed8298d8cbc5dacd4bdfdb876b95500918fb030174855d3e3bd5c9c47
MISC metadata.xml 539 SHA256
b7adc5808150a9e2cdbbb85b8a0ac87e442b09e68233e98b2b5d51648b363d5f SHA512
769b036e40f510a8232caaaa7e67813168cd7a6c1f665f2233c19e2e6ff56e9d415e20e52ef4782a650c6dfdce8a33c28f74ed890b52e06e507e76946da1edea
WHIRLPOOL
625025e8cbf0160ecc2867ee4bd4e02fff423615efca0c2357c147cfbf301590f55f8fc975daf377c1d3e7ddb9989488b45d75c9bd0d4114e9bb6aa1945dc0ca
Added:
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-jack-version.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-jack-version.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-jack-version.patch
2013-03-17 22:43:59 UTC (rev 2541)
@@ -0,0 +1,12 @@
+diff -Naur hydrogen-0.9.5.1.orig/Sconstruct hydrogen-0.9.5.1/Sconstruct
+--- hydrogen-0.9.5.1.orig/Sconstruct 2013-03-17 21:42:42.655692555 +0100
++++ hydrogen-0.9.5.1/Sconstruct 2013-03-17 21:43:59.258694221 +0100
+@@ -322,7 +322,7 @@
+
+
+ def get_jack_api_flags(xenv, pkg_ver):
+- (major, minor, patch) = pkg_ver.rstrip().split('.')
++ (major, minor, patch) = pkg_ver.rstrip().split('.')[0:3]
+ major = int(major)
+ minor = int(minor)
+ patch = int(patch)
Modified:
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
2013-03-17 19:42:13 UTC (rev 2540)
+++
trunk/overlays/proaudio/media-sound/hydrogen/files/hydrogen-0.9.5.1-use_lrdf_pkgconfig.patch
2013-03-17 22:43:59 UTC (rev 2541)
@@ -1,8 +1,17 @@
-conf.CheckCHeader lrdf.h check fails because of missing
-I/usr/include/raptor2, use pkg-config instead
-
---- Sconstruct
-+++ Sconstruct
-@@ -268,7 +268,8 @@
+diff -Naur hydrogen-0.9.5.1.orig/Sconstruct hydrogen-0.9.5.1/Sconstruct
+--- hydrogen-0.9.5.1.orig/Sconstruct 2013-03-17 21:42:42.655692555 +0100
++++ hydrogen-0.9.5.1/Sconstruct 2013-03-17 23:19:57.663819411 +0100
+@@ -193,7 +193,8 @@
+ env.ParseConfig('pkg-config --modversion jack',
get_jack_api_flags)
+ if str(env['lash']) == "1":
+ env.ParseConfig('pkg-config --cflags --libs lash-1.0')
+-
++ if str(env['lrdf']) == "1":
++ env.ParseConfig('pkg-config --cflags --libs lrdf')
+
+ #env.Decider is not known in older scons version
+ try:
+@@ -268,7 +269,8 @@
env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
env.Append( LIBS = [ "pthread" ] )
@@ -12,7 +21,7 @@
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 @@
+@@ -450,7 +452,7 @@
Exit(1)
#lrdf: categorizing of ladspa effects
Modified: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild
2013-03-17 19:42:13 UTC (rev 2540)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-0.9.5.1.ebuild
2013-03-17 22:43:59 UTC (rev 2541)
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI="5"
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit base multilib scons-utils
DESCRIPTION="Advanced drum machine"
HOMEPAGE="http://www.hydrogen-music.org";
@@ -12,8 +12,8 @@
LICENSE="GPL-2 ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +archive debug jack ladspa lash oss portaudio"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +archive debug jack ladspa lash oss portaudio portmidi"
RDEPEND="dev-qt/qtgui:4
dev-qt/qtcore:4
@@ -24,40 +24,44 @@
jack? ( media-sound/jack-audio-connection-kit )
ladspa? ( media-libs/liblrdf )
lash? ( virtual/liblash )
- portaudio? ( >=media-libs/portaudio-19_pre )"
+ portaudio? ( >=media-libs/portaudio-19_pre )
+ portmidi? ( media-libs/portmidi )"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-util/scons"
+ virtual/pkgconfig"
+DOCS=( AUTHORS ChangeLog README.txt )
+PATCHES=(
+ "patches/portaudio.patch"
+ "${FILESDIR}/${P}-use_lrdf_pkgconfig.patch"
+ "${FILESDIR}/${P}-jack-version.patch" #0000157
+)
+
src_prepare() {
+ base_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)
+src_configure() {
+ export QTDIR="${EPREFIX}/usr/$(get_libdir)"
- export QTDIR="/usr/$(get_libdir)"
- local myconf='portmidi=0' #90614
+ myesconsargs=(
+ $(use_scons alsa)
+ $(use_scons archive libarchive)
+ $(use_scons debug)
+ $(use_scons jack)
+ $(use_scons ladspa lrdf)
+ $(use_scons lash)
+ $(use_scons oss)
+ $(use_scons portaudio)
+ $(use_scons portmidi)
+ prefix="${EPREFIX}/usr"
+ DESTDIR="${D}"
+ optflags="${CXXFLAGS}"
+ )
+}
- 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_compile() {
+ escons
}
src_install() {
@@ -67,5 +71,5 @@
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
+ base_src_install_docs
}
