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 C9670138350 for ; Sun, 26 Apr 2020 08:18:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13908E09BE; Sun, 26 Apr 2020 08:18:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BF01BE09BE for ; Sun, 26 Apr 2020 08:18:07 +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 DD5C534F3B3 for ; Sun, 26 Apr 2020 08:18:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D3291F1 for ; Sun, 26 Apr 2020 08:18:03 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1587889079.1e11fa59470968bb02b533f31d191e93e4298c20.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/xpra-3.0.2.ebuild x11-wm/xpra/xpra-3.0.5.ebuild X-VCS-Directories: x11-wm/xpra/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 1e11fa59470968bb02b533f31d191e93e4298c20 X-VCS-Branch: master Date: Sun, 26 Apr 2020 08:18:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7547f7f-9fdb-42b7-9351-bd759bb1c038 X-Archives-Hash: b5c68026bc1805e26f5c55749d6481cd commit: 1e11fa59470968bb02b533f31d191e93e4298c20 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Apr 26 08:17:05 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Apr 26 08:17:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e11fa59 x11-wm/xpra: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> x11-wm/xpra/xpra-3.0.2.ebuild | 24 ++++++------------------ x11-wm/xpra/xpra-3.0.5.ebuild | 12 +++--------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild index 1b1afa0b121..87c56d0e4a4 100644 --- a/x11-wm/xpra/xpra-3.0.2.ebuild +++ b/x11-wm/xpra/xpra-3.0.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" +IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" REQUIRED_USE="${PYTHON_REQUIRED_USE} clipboard? ( || ( server client ) ) @@ -33,25 +33,13 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile - csc? ( - !libav? ( >=media-video/ffmpeg-1.2.2:0= ) - libav? ( media-video/libav:0= ) - ) - dec_avcodec2? ( - !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] ) - libav? ( media-video/libav:0=[x264,x265] ) - ) - enc_ffmpeg? ( - !libav? ( >=media-video/ffmpeg-3.2.2:0= ) - libav? ( media-video/libav:0= ) - ) + csc? ( >=media-video/ffmpeg-1.2.2:0= ) + dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] ) + enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= ) enc_x264? ( media-libs/x264 - !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] ) - libav? ( media-video/libav:0=[x264] ) - ) + >=media-video/ffmpeg-1.0.4:0=[x264] ) enc_x265? ( media-libs/x265 - !libav? ( >=media-video/ffmpeg-2:0=[x264] ) - libav? ( media-video/libav:0=[x264] ) ) + >=media-video/ffmpeg-2:0=[x264] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio ) diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5.ebuild index f76f7a9fc36..d7d1465aea4 100644 --- a/x11-wm/xpra/xpra-3.0.5.ebuild +++ b/x11-wm/xpra/xpra-3.0.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+client +clipboard csc cups dbus ffmpeg jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" +IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( client server ) @@ -32,14 +32,8 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile - csc? ( - !libav? ( >=media-video/ffmpeg-1.2.2:0= ) - libav? ( media-video/libav:0= ) - ) - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) - libav? ( media-video/libav:0=[x264,x265] ) - ) + csc? ( >=media-video/ffmpeg-1.2.2:0= ) + ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio )