From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 981691396D9 for ; Sun, 19 Nov 2017 17:46:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEA67E0E87; Sun, 19 Nov 2017 17:46:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86BFEE0E68 for ; Sun, 19 Nov 2017 17:46:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6754B33DDA5 for ; Sun, 19 Nov 2017 17:46:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9ED3A065 for ; Sun, 19 Nov 2017 17:45:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1511111631.14c32b5f21545f3d1e977970b1f9c669c86ff3fe.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mediastreamer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild X-VCS-Directories: media-libs/mediastreamer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 14c32b5f21545f3d1e977970b1f9c669c86ff3fe X-VCS-Branch: master Date: Sun, 19 Nov 2017 17:45:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 23bdaf34-b6a1-4415-992e-286976a3c827 X-Archives-Hash: a9441842096ea5e6d562606888673fde commit: 14c32b5f21545f3d1e977970b1f9c669c86ff3fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 19 17:06:55 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 19 17:13:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14c32b5f media-libs/mediastreamer: Sort DEPENDs Package-Manager: Portage-2.3.14, Repoman-2.3.6 .../mediastreamer/mediastreamer-2.9.0-r2.ebuild | 49 +++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild index cdaaf69423c..b249b139c05 100644 --- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild @@ -20,13 +20,14 @@ IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc silk +speex static-libs test theora upnp v4l video x264 X" REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio ) - video? ( || ( opengl sdl X ) ) + opengl? ( video ) theora? ( video ) - X? ( video ) v4l? ( video ) - opengl? ( video )" + video? ( || ( opengl sdl X ) ) + X? ( video )" -RDEPEND="alsa? ( media-libs/alsa-lib ) +RDEPEND=" + alsa? ( media-libs/alsa-lib ) g726? ( >=media-libs/spandsp-0.0.6_pre1 ) gsm? ( media-sound/gsm ) opus? ( media-libs/opus ) @@ -42,29 +43,38 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) video? ( libav? ( >=media-video/libav-9.12:0= ) !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= ) - - opengl? ( media-libs/glew + opengl? ( + media-libs/glew virtual/opengl - x11-libs/libX11 ) - v4l? ( media-libs/libv4l - sys-kernel/linux-headers ) - theora? ( media-libs/libtheora ) + x11-libs/libX11 + ) sdl? ( media-libs/libsdl[video,X] ) - X? ( x11-libs/libX11 - x11-libs/libXv ) )" + theora? ( media-libs/libtheora ) + v4l? ( + media-libs/libv4l + sys-kernel/linux-headers + ) + 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 ) ) + X? ( x11-proto/videoproto ) +" +PDEPEND=" + amr? ( !bindist? ( media-plugins/mediastreamer-amr ) ) g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) ) ilbc? ( media-plugins/mediastreamer-ilbc ) + silk? ( !bindist? ( media-plugins/mediastreamer-silk ) ) video? ( x264? ( media-plugins/mediastreamer-x264 ) ) - silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )" +" src_prepare() { # variable causes "command not found" warning and is not @@ -120,7 +130,6 @@ src_configure() { # don't use bundled libs --enable-external-ortp $(use_enable alsa) - $(use_enable pulseaudio) $(use_enable coreaudio macsnd) $(use_enable debug) $(use_enable filters) @@ -134,17 +143,17 @@ src_configure() { $(use_enable oss) $(use_enable pcap) $(use_enable portaudio) + $(use_enable pulseaudio) + $(use_enable sdl) $(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 video) $(use_enable X x11) $(use_enable X xv) - $(use doc || echo ac_cv_path_DOXYGEN=false) )