Revbump for Darwin (coreaudio) support, bump to EAPI=3 for Prefix support, marked...

Package-Manager: portage-2.2.00.15838-prefix/cvs/Darwin powerpc

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 9cc29868668226d9fcf6e76f634fe9739b0dcb18..466505c89993073186958578425d4abb8eb935f1 100644 (file)
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mediastreamer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.22 2010/02/23 06:51:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.23 2010/03/21 12:08:34 grobian Exp $
+
+*mediastreamer-2.3.0-r1 (21 Mar 2010)
+
+  21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  +mediastreamer-2.3.0-r1.ebuild:
+  Revbump for Darwin (coreaudio) support, bump to EAPI=3 for Prefix support,
+  marked ~ppc-macos and ~x86-macos, bug #310215
 
   23 Feb 2010; Joseph Jezak <josejx@gentoo.org> mediastreamer-2.3.0.ebuild:
   Marked ~ppc64.

diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index d1e0afe7dde1e832e6432ac761f0e216f0970ef3..742b3984004f7bf4afe4d2fb0f51f7aab3bc88e5 100644 (file)
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mediastreamer-2.2.3_p1-autodeps.patch 4398 RMD160 cc3a98a9d7446e15a3fb5f851a18d6f5342e0908 SHA1 7d00b34a333b273680c612b6f0d0ffa092fb66ba SHA256 0cc00eefe8ed05ff63f3a8928c2d5a3d0fe87719c97bfd52c5057a1bba4bcb9c
 DIST mediastreamer-2.2.3.tar.gz 581001 RMD160 ca84cf2f415099ad2fb9219aadfebc1aa2cb3381 SHA1 e3a6d4e5314043ad690da6c1ed55a81e70282941 SHA256 203ab2508efa37831cf2bef76ef222c01e51bf250fd14db1ae85e442ed87cd48
 DIST mediastreamer-2.2.3_p1-linphone-3.1.1.patch.tgz 67833 RMD160 4b6096a989eeea869f10376fd6632b1ffb655054 SHA1 ce4141723c40d36f856723e3073d110577fcbb68 SHA256 1aef7c853e6e76f9137dbaf6c575995a2c9816ae464770e819eadacb81778f67
@@ -8,13 +5,7 @@ DIST mediastreamer-2.2.4.tar.gz 595031 RMD160 b1c191c382c6d33ad8b39711b25124a947
 DIST mediastreamer-2.3.0.tar.gz 669093 RMD160 8d656df1008025b91c3905ef69eb88c35c8741ab SHA1 eae7032fbbf5d31b3c47a54566d34a8b97e38405 SHA256 67b87a094da0b17be43919e67dffe7b5347bc4299f4d87165a8f27282ea7afbd
 EBUILD mediastreamer-2.2.3_p1-r1.ebuild 3818 RMD160 bd2c86eb7f73d3baaadca3c308902087a3803d6b SHA1 f4f1ebc51d9c37e233b4cf4a1ab9fd85c8eee761 SHA256 53478afa2ddb03f3bf68864fc68f4b298fb3ad3425ba15f29ab9a1cae5263d38
 EBUILD mediastreamer-2.2.4.ebuild 3567 RMD160 ce83f0b19ee9fad19eb5c240e2ca5eef515b3058 SHA1 3e8e40866d6cb1a6bda7a65337e33b646814da43 SHA256 18e7024b0558ca62868b822d944675a37405738493b82d3424adc1d95186a8af
+EBUILD mediastreamer-2.3.0-r1.ebuild 3851 RMD160 8de483f9e01fdd2fc857a8f192907bc387eca1a4 SHA1 a03ec12f438ebaf840029e85e4cdbb6c83a139af SHA256 a5b42e044af262d243415a17bfefde214ebe2d197f8b71ec99bd90c8fb1f11d2
 EBUILD mediastreamer-2.3.0.ebuild 3522 RMD160 ebffcc448347c1f0abb10d43d31abfaf3e0a9cba SHA1 cc7f719ca9dc867e2d42167fb85a2b3313e55c74 SHA256 a5aeb2b3f9a4f35a2db351bd2d2b069abaa887463ff59957564324b78b7e800e
-MISC ChangeLog 3145 RMD160 1dfc4e06fb6a1c51478be583010f09ab405b68cb SHA1 072a7b1de30b22dfe8a8a38edfeb8bb450991293 SHA256 a3fcf62979eae9da88906d00f5876c7a06a85dcdfa84f75e9aec4e32b5731884
+MISC ChangeLog 3396 RMD160 11e6ec51e6c5f36202f2c864bfe79819fe55203b SHA1 92e731c398c211899dcf51d11991ee550f001375 SHA256 5d419a55eb2ead9e1007a11361e30e4b2d2679557acae42f999773b9e1cf5801
 MISC metadata.xml 380 RMD160 24797b26f9f2ef16ea5261c536ebed58e3903e97 SHA1 74bcc7d7e8bd26a92450ee714743a975ed595de0 SHA256 5cd96440722093ad63d25758891be2656d8c7f8b570eddfee1fbdce5860d237a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuDeqsACgkQcsIHjyDViGTChwCgxYT1xiwQqPNkO2ow7P4Ztr9d
-9+gAn2L6aCCetEE0fnIRyJzdULHJuV5i
-=X1qM
------END PGP SIGNATURE-----

diff --git a/media-libs/mediastreamer/mediastreamer-2.3.0-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.3.0-r1.ebuild
new file mode 100644 (file)
index 0000000..c90fa48
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.3.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.3.0-r1.ebuild,v 1.1 2010/03/21 12:08:34 grobian Exp $
+
+EAPI="3"
+
+inherit eutils autotools multilib
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
+SRC_URI="http://download.savannah.nongnu.org/releases/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
+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 )
+       gsm? ( media-sound/gsm )
+       jack? ( media-libs/libsamplerate
+               media-sound/jack-audio-connection-kit )
+       portaudio? ( media-libs/portaudio )
+       speex? ( >=media-libs/speex-1.2_beta3 )
+       video? ( media-libs/libsdl[video,X]
+               media-video/ffmpeg
+               theora? ( media-libs/libtheora )
+               X? ( x11-libs/libX11 ) )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+PDEPEND="ilbc? ( media-plugins/mediastreamer-ilbc )
+       video? ( x264? ( media-plugins/mediastreamer-x264 ) )"
+
+# TODO:
+# run-time test for ipv6 : does it need ortp[ipv6] ?
+
+# NOTES:
+# 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 && ! use coreaudio;
+       then
+               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
+
+       if ! use video && ( use theora || use X ); then
+               ewarn "X and theora support are enabled if video USE flag is enabled"
+               ewarn "If you want X or theora support, consider re-emerge with USE=\"video\""
+       fi
+}
+
+src_prepare() {
+       # too hard to have a flexible lib dir in a clean way
+       sed -i -e "s:\(/usr/kde/3.5/\)lib:\1$(get_libdir):" configure.ac \
+               || die "patching configure.ac failed"
+
+       # respect user's CFLAGS
+       sed -i -e "s:-O2::" configure.ac || die "patching configure.ac failed"
+
+       # change default paths
+       sed -i -e "s:\(\${prefix}/\)lib:\1$(get_libdir):" \
+               -e "s:\(prefix/share\):\1/${PN}:" configure.ac \
+               || die "patching configure.ac failed"
+
+       # fix html doc installation dir
+#      sed -i -e "s:\$(pkgdocdir):\$(docdir):" help/Makefile.am \
+#              || die "patching help/Makefile.am failed"
+       sed -i -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" help/Makefile.am \
+               || die "patching help/Makefile.am failed"
+
+       eautoreconf
+
+       # don't build examples in tests/
+       sed -i -e "s:\(SUBDIRS = .*\) tests \(.*\):\1 \2:" Makefile.in \
+               || die "patching Makefile.in failed"
+}
+
+src_configure() {
+       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
+       # strict: don't want -Werror
+       # external-ortp: don't use bundled libs
+       # arts: arts is deprecated
+       econf \
+               --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+               --datadir="${EPREFIX}"/usr/share/${PN} \
+               --libdir="${EPREFIX}"/usr/$(get_libdir) \
+               --disable-strict \
+               --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) \
+               $(use_enable jack) \
+               $(use_enable oss) \
+               $(use_enable portaudio) \
+               $(use_enable speex) \
+               $(use_enable theora) \
+               $(use_enable video) \
+               $(use_enable X x11)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+
+       if use examples; then
+               insinto /usr/share/doc/${PF}/examples
+               doins tests/*.c || die "doins failed"
+       fi
+}