From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5596159CA4 for ; Sat, 13 Feb 2016 03:56:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9075E07D2; Sat, 13 Feb 2016 03:56:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01ECDE07C9 for ; Sat, 13 Feb 2016 03:56:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D445E340BD1 for ; Sat, 13 Feb 2016 03:56:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63BFB10B8 for ; Sat, 13 Feb 2016 03:56:14 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1455273007.65e3818f6012af6672f7fa4e9dea54dec1fef3fb.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 65e3818f6012af6672f7fa4e9dea54dec1fef3fb X-VCS-Branch: master Date: Sat, 13 Feb 2016 03:56:14 +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: 3d6bc57e-f511-43a1-b54c-d3e146d8dfe3 X-Archives-Hash: 136475beeb09df0ce4fa8d03af05dc32 commit: 65e3818f6012af6672f7fa4e9dea54dec1fef3fb Author: Ilya Tumaykin gmail com> AuthorDate: Fri Feb 12 10:11:22 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Fri Feb 12 10:30:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e3818f media-video/mpv: untie opengl USE from X USE in 9999 opengl USE can now do something else, but enabling GLX. opengl USE now also controls OpenGL support in libmpv. Package-Manager: portage-2.2.27 media-video/mpv/mpv-9999.ebuild | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 02ec44a..cfbfe7b 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -28,7 +28,6 @@ DOCS+=( README.md ) # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC. LICENSE="GPL-2+ BSD ISC" SLOT="0" -# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux @@ -43,7 +42,6 @@ REQUIRED_USE=" lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) - opengl? ( X ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) @@ -89,6 +87,7 @@ COMMON_DEPEND=" luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) + opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) @@ -103,10 +102,7 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) + opengl? ( x11-libs/libXdamage ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) @@ -230,20 +226,21 @@ src_configure() { $(use_enable xv) $(use_enable xinerama) $(use_enable X xrandr) - $(use_enable opengl gl-x11) + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') $(use_enable wayland gl-wayland) $(use_enable vdpau) $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-x-egl + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') $(use_enable libcaca caca) $(use_enable jpeg) + --disable-android $(use_enable raspberry-pi rpi) + $(use_enable opengl desktop-gl) # HWaccels $(use_enable vaapi vaapi-hwaccel) @@ -257,10 +254,11 @@ src_configure() { $(use_enable dvb dvbin) ) - if use vaapi && use X && use egl; then - mywafargs+=(--enable-vaapi-x-egl) - else - mywafargs+=(--disable-vaapi-x-egl) + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl vaapi-x-egl) + ) fi # Create reproducible non-live builds