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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56F6415808B for ; Mon, 21 Mar 2022 23:42:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03303E08E5; Mon, 21 Mar 2022 23:42:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1656E08E5 for ; Mon, 21 Mar 2022 23:42:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A3A134315D for ; Mon, 21 Mar 2022 23:42:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA878330 for ; Mon, 21 Mar 2022 23:42:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647905910.d6677d5548a0c421fb40b7986d296c8c1c4464a6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-0.34.1.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d6677d5548a0c421fb40b7986d296c8c1c4464a6 X-VCS-Branch: master Date: Mon, 21 Mar 2022 23:42:45 +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: 4f088472-a3f3-4922-9913-4477f9802a26 X-Archives-Hash: 5c570be56ccd3d16fa221ca219121535 commit: d6677d5548a0c421fb40b7986d296c8c1c4464a6 Author: Sam James gentoo org> AuthorDate: Mon Mar 21 23:38:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 21 23:38:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6677d55 media-video/mpv: rebase 0.34.1 on 0.34.0 changes for nvenc Signed-off-by: Sam James gentoo.org> media-video/mpv/mpv-0.34.1.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media-video/mpv/mpv-0.34.1.ebuild b/media-video/mpv/mpv-0.34.1.ebuild index dd43d1178adb..e0f0ee5c96cf 100644 --- a/media-video/mpv/mpv-0.34.1.ebuild +++ b/media-video/mpv/mpv-0.34.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,20 +29,20 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. LICENSE="LGPL-2.1+ GPL-2+ BSD ISC" SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua - openal +opengl pulseaudio raspberry-pi rubberband sdl + nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" || ( cli libmpv ) aqua? ( opengl ) - cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) lua? ( ${LUA_REQUIRED_USE} ) + nvenc? ( opengl ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) @@ -118,11 +118,11 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} - cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) dvb? ( virtual/linuxtv-dvb-headers ) + nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 ) " RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) + nvenc? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( ${PYTHON_DEPS} ) " @@ -224,8 +224,8 @@ src_configure() { # HWaccels: # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable cuda cuda-hwaccel) - $(use_enable cuda cuda-interop) + $(use_enable nvenc cuda-hwaccel) + $(use_enable nvenc cuda-interop) # TV features: $(use_enable dvb dvbin)