--- mediastreamer-2.3.0.ebuild 2010-02-23 08:10:26 +0100 +++ mediastreamer-2.3.0.ebuild 2010-03-19 14:19:11 +0100 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.3.0.ebuild,v 1.2 2010/02/23 06:51:31 josejx Exp $ -EAPI="2" +EAPI="3" inherit eutils autotools multilib @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+alsa debug examples gsm ilbc ipv6 jack oss portaudio +speex theora video x264 X" +IUSE="+alsa coreaudio debug examples gsm ilbc ipv6 jack oss portaudio +speex theora video x264 X" RDEPEND=">=net-libs/ortp-0.15.0_p1 alsa? ( media-libs/alsa-lib ) @@ -39,9 +39,9 @@ # in some way, v4l support is auto-magic but keeping it like that atm pkg_setup() { - if ! use oss && ! use alsa && ! use jack && ! use portaudio; + if ! use oss && ! use alsa && ! use jack && ! use portaudio && ! use coreaudio; then - eerror "You must enable at least oss, alsa, jack or portaudio" + eerror "You must enable at least oss, alsa, jack, portaudio or coreaudio" eerror "Please, re-emerge ${PN} with one of this USE flag enabled" die fi @@ -79,21 +79,28 @@ } src_configure() { + local macaqsnd= + # Mac OS X Audio Queue is an audio recording facility, available on + # 10.5 (Leopard, Darwin9) and onward + if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]; + then + macaqsnd="--enable-macaqsnd" + else + macaqsnd="--disable-macaqsnd" + fi # strict: don't want -Werror - # macsnd and macaqsnd: macosx related # external-ortp: don't use bundled libs # arts: arts is deprecated econf \ - --htmldir=/usr/share/doc/${PF}/html \ - --datadir=/usr/share/${PN} \ - --libdir=/usr/$(get_libdir) \ + --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + --datadir="${EPREFIX}"/usr/share/${PN} \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ --disable-strict \ - --disable-macsnd \ - --disable-macaqsnd \ --enable-external-ortp \ --disable-dependency-tracking \ --disable-artsc \ $(use_enable alsa) \ + $(use_enable coreaudio macsnd) ${macaqsnd} \ $(use_enable debug) \ $(use_enable gsm) \ $(use_enable ipv6) \ I think the changes go best in a new revision to be on the safe side. Please accept or comment on the intended changes, thanks.
I would prefer: + local macaqsnd = "--disable-macaqsnd" + # Mac OS X Audio Queue is an audio recording facility, available on + # 10.5 (Leopard, Darwin9) and onward + if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]; + then + macaqsnd="--enable-macaqsnd" + fi It is less verbose, more clear and we have a sane default value. With this fixed, feel free to apply your patch and bump to 2.3.0-r1.
ok, done as you suggested, thanks!
