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 4D037139085 for ; Tue, 7 Feb 2017 23:35:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 696A1E0CE2; Tue, 7 Feb 2017 23:35:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48E6FE0CE2 for ; Tue, 7 Feb 2017 23:35:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A3E3414D6 for ; Tue, 7 Feb 2017 23:35:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 916593DC6 for ; Tue, 7 Feb 2017 23:35:17 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1486510499.8068ed348f5f5654309a0442d0d677c79810a945.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/metadata.xml x11-wm/xpra/xpra-1.0.2.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 8068ed348f5f5654309a0442d0d677c79810a945 X-VCS-Branch: master Date: Tue, 7 Feb 2017 23:35:17 +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: f107a497-81b1-4ed2-be3c-d372caae7c5b X-Archives-Hash: 460dd20237506c9018f96f8692a3b5be commit: 8068ed348f5f5654309a0442d0d677c79810a945 Author: Michael Weber gentoo org> AuthorDate: Tue Feb 7 23:34:59 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Tue Feb 7 23:34:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8068ed34 x11-wm/xpra: rename ambigious USE=ffmpeg to USE=enc_ffmpeg, enc_ffmpeg supports both ffmpeg and libav. Package-Manager: Portage-2.3.3, Repoman-2.3.1 x11-wm/xpra/metadata.xml | 1 + x11-wm/xpra/xpra-1.0.2.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml index 1554d1e..f8a239b 100644 --- a/x11-wm/xpra/metadata.xml +++ b/x11-wm/xpra/metadata.xml @@ -14,6 +14,7 @@ Enable csc softscaler support Enable dec_avcodec support Enable dec_avcodec2 support + Enable advanced ffmpeg/libav encoder support Enable support for lz4 compression Enable rencode support Build server-side code diff --git a/x11-wm/xpra/xpra-1.0.2.ebuild b/x11-wm/xpra/xpra-1.0.2.ebuild index a861b71..eb8e8e1 100644 --- a/x11-wm/xpra/xpra-1.0.2.ebuild +++ b/x11-wm/xpra/xpra-1.0.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+client +clipboard csc cups dec_av2 ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" +IUSE="+client +clipboard csc cups dec_av2 enc_ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" REQUIRED_USE="${PYTHON_REQUIRED_USE} clipboard? ( || ( server client ) ) @@ -42,7 +42,7 @@ COMMON_DEPEND=""${PYTHON_DEPS}" !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) - ffmpeg? ( + enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) @@ -118,7 +118,7 @@ python_configure_all() { $(use_with csc csc_swscale) $(use_with cups printing) $(use_with dec_av2 dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) + $(use_with enc_ffmpeg) $(use_with opengl) $(use_with server shadow) $(use_with server)