Replace the virtual with USE=libav.

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
index 63c7159f94a6c7e27d12ab95be51d89e529f2d4d..056a0dc2c5198a8751e84602ee1a9c791ccf2468 100644 (file)
--- a/media-libs/mediastreamer/ChangeLog
+++ b/media-libs/mediastreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mediastreamer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.77 2014/11/12 13:59:03 bircoph Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.78 2015/02/07 20:13:52 mgorny Exp $
+
+*mediastreamer-2.9.0-r1 (07 Feb 2015)
+
+  07 Feb 2015; Michał Górny <mgorny@gentoo.org> +mediastreamer-2.9.0-r1.ebuild:
+  Replace the virtual with USE=libav.
 
   12 Nov 2014; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   Update e-mail :/.

diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 0ff8bced1aa3693427780ae654854a69e13d3d44..004669860296c016ec1edc0f41c20b5e7c8e54d8 100644 (file)
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -19,23 +19,26 @@ DIST mediastreamer-2.8.2.tar.gz 882966 SHA256 a62ebb008913db6e03e27bd1ec30bb560a
 DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce29ce78de0afe1e191f4f3c62656acd5 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0 WHIRLPOOL 9e425ff2e461ceb6dae3890e6bd8035de65f5b3fd0590e01b75259c0d27dd54cfd37cb88d43752c2903c954ac44e353e4ed63588d3f08ec690da77293a31ba68
 EBUILD mediastreamer-2.7.3-r3.ebuild 4025 SHA256 fa7ad39d38d81008afdc5ca9525276a04b617e706cb42e2826bc019d61dfc6e3 SHA512 f5d60e1f710524c8313129a5d2297ac156988e65bb2eb18123a7b5c30a5db0e969d7004c848891b579290f5227e7ace156d0f2d9d3224e4f4484d1eed7b5470e WHIRLPOOL 9d8ce54f8ae4b02aee70b21b09fafae9e9d55e8298ffc6fd96bffcc574b6830e3ba3dbca8b29c140ea80268b7db739f6ef3983d93481376803aea0edb579c373
 EBUILD mediastreamer-2.8.2.ebuild 3948 SHA256 7c9c6fd227d2c4926cfc328d96eb0868cbbd3a3c003de11209c284f2360a4f15 SHA512 3a52a03882e891032ee33a546e9e24efc7800bd41e1766d1319775e3adbff8a476415c128cd4a56e0a0020a8c172b03ae9e55ed104d67ed6b316e0f4377f403e WHIRLPOOL b46b4ada0ab8f6f99d374aabbdb90c96f93711350773527b9dc421b9d71d6fc255251ee5d789914583a9ff5545163af62eef87ac028c0bf94c07d1ac14476655
+EBUILD mediastreamer-2.9.0-r1.ebuild 4680 SHA256 5c32198f36c51a674c707ebb7c7c785d43a292d220359151a32bdc037c8c4741 SHA512 cf6a57749cdfae092878cb673d24e9a3b98a7ea6c327eaf82ece74926d5304ed43ed3ad3060eef47dbc7ae323830cc174956bf480f499d75b7914752eb878d16 WHIRLPOOL 869db25e6110da470ea7fc0c279139c71a6f82c900b05d90d855f86030e5ae3d1221272bfd926cc84cdc1c331f48845a953d363cf3145c6a05fc349698d3b7ee
 EBUILD mediastreamer-2.9.0.ebuild 4601 SHA256 13d95adf94a90639131e14c123448cc1df5412e234496a7883a57856dfe80e7e SHA512 d5b4a7c0aec2bc6cbed29756895cd897ef6b3c51e9e26d6b2f6ac3539f37674720ce447f121bd8f4e3dec66c3c5d34aa5a05de114f2e768984a6e7d144b6e92e WHIRLPOOL 66971272480020dca335eae09d0ff4dfdf13356978e5255aee86d8cc3740ae169bf2737b07035f0c6797afcd0e49b3bcee60964410472d5eebe9940efae852c5
-MISC ChangeLog 11791 SHA256 d49235a9dc05a35d0d801faf648d4c2bf94627e2c16766ba0bfd5b6deffa7349 SHA512 6759bbeaab554a23dea13237ed6b5ba070e3e82d6144bb6dfcd3ff51ea3fa6dcea51261f55c86e6dd1f4792e50e49a55cadaaf36c8e3e6202812f216ceafc054 WHIRLPOOL e3f4ba9e8cf224141074cd0557bbdd446cf47ecde1704651eb4bc1d6c69dfaee26829429f806c571768f05ce57b04ae57b08489455aeb074890484ce260f7960
+MISC ChangeLog 11950 SHA256 9572c90df5aefb1e4ce629cd8d33a6d0ec5b2d4467a00823cfcb0c9279ef135f SHA512 e53a252826e558ff1a15c91e86750a69c05218b6c7eeb5ce9da5155f655c9bb7b7b25efcf52736ad05fd0d854ae8036ccb3d8ec591d1040928ecdfb581033e9e WHIRLPOOL db760d6b9b46c0496681c41c17ca40cb04058365b093736a9802e44e4914a9dde103dafd20a078f6bdd23f17702af3f4780b920917b234358e1e2cd960128ec5
 MISC metadata.xml 920 SHA256 b363ba88b937dbe020a37a44881afa09f1d8830c58aabd7a8ab8eac17cbbcf52 SHA512 36dc3531ded59776f715856e8f527be20e5e4160db78faa9ab7f8899b3e2dbd620a4cc2050ae49a5eb67f159020605ae74d6f5530de734e5ee15230810f2faea WHIRLPOOL 6e7d3d3f59b11842f120d7a485b58ae47e1e784fdbda84d226ed67c69d1a77347b2c76b82a312f32341e4322d1e8a76bdca2d716fd4b54b80a7ee3e964137f78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUY2eoAAoJEFZZU7lTcnVsLC0P/1FU4jiVFGJjYsAmdVACmEL2
-Dv8fQq0je1NZyN7v5bLoUZQqKxuo50Wq0OqVrVgx83F8W8sNRAvxS/FwV0d+a4fT
-L1vhSgyK0iqpLTA+gIGhpRnmdrDkPHsx1oC5kiYUT1vDIMFBKgTKd4UaCoWz6zhG
-3vLbVAbkuSItUQffre71Pgd4Dseu090CG98X8tFd1J6XJNVg3SuIyjJ4M/tTSrjo
-5Xfw5mTM/EMPKKH9DXSIQv2mPjihgoiTqmmbEUSDvGHzoYa9B3glymK+CzAhUfBY
-tGWgvQUYbkpG0QPPfidu4cdiJF4x95OjlxTYK9ukwVraJruBz0Jx9xoa1BgN7Lwn
-TAqZ9YyyXW30vKOUpAeAXn5Pj9Bm89a+LrS4SWyvxntkk9jnXaXSZHKsUZS8ZtsQ
-+RBKolFO+k106zgOCdq0w6d7b/SFqZ0nA/Mkblu+5eOFWfQOc6nmieDtJzcLlJTB
-frAD0zx0Nj5Accuob23pmMgtts77Cfe3Yj0FtAc0vMu92LLO4jFqBc6gi3krRk85
-Asr+l2mqQiOVH5xcErHNJ/a2KZEZ7tKE1hCv0cX9Jd5BK4kcdETmAcUKetn0S75H
-mz+Vfr/6twtUbZM4jFLIfNttSyzA0LPhEmEi5pgWlSUVFAUz/BMgr78NJuak/kCn
-3eAyDdB9TkeVHxJIKcVM
-=55QC
+iQJ8BAEBCABmBQJU1nIFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzy8QAIag6hJTzEk/16Trfn8GsGwF
+9ZzOZhOfDjuu+zReGYLPl7twCK1kVPsrVNJ+cbpm3WYFvoEBceoNPO8xM2pWKeXv
+FUNaIjFiP4WcrZyrA4Ad9XIHjcqqPh3udl+3JoSj7ZqYpPYFNUrckNgZDJ7ijqOz
+iTehsyfAlTrt1Un/Kfp+Yy13wNAo9CZP9HJl95Vcdmxlsz4gOuLHoOx03iaPe89O
+0lp+48EBLqasRnO97yJWcKFMlrdc6ZD79b2FqCe/Ndu2ZxtmyC6skgYhuRdpFQor
+QQvGoADjriOecuTBv98+s98E3cV3v6/5bUo5/iQ5LmT4i+wlwe2wWIxgOlamhNw8
+URT8MYReM0vzZ2wpHd7ozLGAw4v4Aguyyt/e0o0GJL46i6QcJGEBQ8O1aceCyHgM
+6tUnTDsyxM27E6AudGrvmS+cm6fcniPShT9rB45IJ9NzjCqTOUGn6vOSQHTr9Uw7
+KrMQlvYwxH/HP8UgBfGm2XQ+AQXE4Za6w87/hk53IhE306gThQa9Frtasrt68Ctv
+hfc4swMv8nHfAPDn1VXRq7jTmUdB4MoIf9VE28YGExm8IqQLUXV6Js4cUZz8gJjh
+KgQUOhm3VJQoWfHeqZCIlB/xIyw8Jm8h5PVGu/qRwwRrxyMds5S8kbVF91j8TDE2
+S4qde6PorXP2X0BMPZGX
+=YBNK
 -----END PGP SIGNATURE-----

diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
new file mode 100644 (file)
index 0000000..7d25530
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild,v 1.1 2015/02/07 20:13:52 mgorny Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Many cameras will not work or will crash an application if mediastreamer2 is
+# not built with v4l2 support (taken from configure.ac)
+# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
+IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
+       ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
+       silk +speex static-libs test theora upnp v4l video x264 X"
+
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
+       video? ( || ( opengl sdl X ) )
+       theora? ( video )
+       X? ( video )
+       v4l? ( video )
+       opengl? ( video )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+       g726? ( >=media-libs/spandsp-0.0.6_pre1 )
+       gsm? ( media-sound/gsm )
+       opus? ( media-libs/opus )
+       ortp? ( >=net-libs/ortp-0.21.0[ipv6?] )
+       pcap? ( sys-libs/libcap )
+       portaudio? ( media-libs/portaudio )
+       pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+       speex? ( >=media-libs/speex-1.2_beta3 )
+       upnp? ( net-libs/libupnp )
+       video? (
+               libav? ( >=media-video/libav-9.12:0= )
+               !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
+
+               opengl? ( media-libs/glew
+                       virtual/opengl
+                       x11-libs/libX11 )
+               v4l? ( media-libs/libv4l
+                       sys-kernel/linux-headers )
+               theora? ( media-libs/libtheora )
+               sdl? ( media-libs/libsdl[video,X] )
+               X? ( x11-libs/libX11
+                       x11-libs/libXv ) )"
+DEPEND="${RDEPEND}
+       dev-util/intltool
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       opengl? ( dev-util/xxdi )
+       test? ( >=dev-util/cunit-2.1_p2[ncurses] )
+       X? ( x11-proto/videoproto )"
+
+PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+       g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
+       ilbc? ( media-plugins/mediastreamer-ilbc )
+       video? ( x264? ( media-plugins/mediastreamer-x264 ) )
+       silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
+
+src_prepare() {
+       # variable causes "command not found" warning and is not
+       # needed anyway
+       sed -i \
+               -e 's/$(ACLOCAL_MACOS_FLAGS)//' \
+               Makefile.am || die
+
+       # respect user's CFLAGS
+       sed -i \
+               -e "s:-O2::;s: -g::" \
+               configure.ac || die "patching configure.ac failed"
+
+       # change default paths
+       sed -i \
+               -e "s:\(prefix/share\):\1/${PN}:" \
+               configure.ac || die "patching configure.ac failed"
+
+       # fix doc installation dir
+       sed -i \
+               -e "s:\$(pkgdocdir):\$(docdir):" \
+               help/Makefile.am || die "patching help/Makefile.am failed"
+
+       # fix html installation dir
+       sed -i \
+               -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
+               help/Makefile.am || die "patching help/Makefile.am failed"
+
+       # linux/videodev.h dropped in 2.6.38
+       sed -i \
+               -e 's:linux/videodev.h ::' \
+               configure.ac || die
+
+       epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
+               "${FILESDIR}/${P}-libav9.patch" \
+               "${FILESDIR}/${P}-underlinking.patch" \
+               "${FILESDIR}/${P}-tests.patch" \
+               "${FILESDIR}/${P}-xxd.patch"
+
+       eautoreconf
+}
+
+src_configure() {
+       local myeconfargs=(
+               --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+               --datadir="${EPREFIX}"/usr/share/${PN}
+               # arts is deprecated
+               --disable-artsc
+               # don't want -Werror
+               --disable-strict
+               --disable-libv4l1
+               # don't use bundled libs
+               --enable-external-ortp
+               $(use_enable alsa)
+               $(use_enable pulseaudio)
+               $(use_enable coreaudio macsnd)
+               $(use_enable debug)
+               $(use_enable filters)
+               $(use_enable g726 spandsp)
+               $(use_enable gsm)
+               $(use_enable ipv6)
+               $(use_enable ntp-timestamp)
+               $(use_enable opengl glx)
+               $(use_enable opus)
+               $(use_enable ortp)
+               $(use_enable oss)
+               $(use_enable pcap)
+               $(use_enable portaudio)
+               $(use_enable speex)
+               $(use_enable static-libs static)
+               $(use_enable theora)
+               $(use_enable upnp)
+               $(use_enable video)
+               $(use_enable v4l)
+               $(use_enable v4l libv4l2)
+               $(use_enable sdl)
+               $(use_enable X x11)
+               $(use_enable X xv)
+
+               $(use doc || echo ac_cv_path_DOXYGEN=false)
+       )
+
+       # 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
+               myeconfargs+=( --enable-macaqsnd )
+       else
+               myeconfargs+=( --disable-macaqsnd )
+       fi
+
+       econf "${myeconfargs[@]}"
+}
+
+src_test() {
+       default
+       cd tester || die
+       ./mediastreamer2_tester || die
+}
+
+src_install() {
+       default
+       prune_libtool_files
+
+       if use examples; then
+               insinto /usr/share/doc/${PF}/examples
+               doins tester/*.c
+       fi
+}