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 4A1AF138335 for ; Tue, 6 Nov 2018 11:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A377E0C94; Tue, 6 Nov 2018 11:20:55 +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 EEE96E0C94 for ; Tue, 6 Nov 2018 11:20:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 04357335CC0 for ; Tue, 6 Nov 2018 11:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B22653DD for ; Tue, 6 Nov 2018 11:20:50 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1541503233.d276334e02fd4748584aad9bc304d598d805dd52.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mplayer/metadata.xml media-video/mplayer/mplayer-1.3.0-r5.ebuild X-VCS-Directories: media-video/mplayer/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: d276334e02fd4748584aad9bc304d598d805dd52 X-VCS-Branch: master Date: Tue, 6 Nov 2018 11:20:50 +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: fbb907d5-04bd-44c1-bcb8-bfb1e1ed9413 X-Archives-Hash: 3b12f35e9ba77fd97a6e4114eb653301 commit: d276334e02fd4748584aad9bc304d598d805dd52 Author: Alexis Ballier gentoo org> AuthorDate: Tue Nov 6 11:04:47 2018 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Nov 6 11:20:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d276334e media-video/mplayer: Backport xvmc removal. Manually cherry picked from 68ad2898bf0b99a7b0cd9ef94d7cc926fb100487 Closes: https://bugs.gentoo.org/655442 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Alexis Ballier gentoo.org> media-video/mplayer/metadata.xml | 1 - media-video/mplayer/mplayer-1.3.0-r5.ebuild | 15 ++++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index d6c05ce054c..d4d955ac250 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -34,7 +34,6 @@ Enable twolame MPEG-2 encoding Enables VCD support Support for vidix video output - Enables X-Video Motion Compensation support Enables yuv4mpeg video output Enables ZR360[56]7/ZR36060 video output diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index bd0a05495e9..82a02d5718b 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix -vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran" +vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" VIDEO_CARDS="mga tdfx" for x in ${VIDEO_CARDS}; do @@ -126,7 +126,6 @@ RDEPEND+=" xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) " ASM_DEP="dev-lang/yasm" @@ -160,7 +159,6 @@ fi # ass and freetype font require iconv and ass requires freetype fonts # unicode transformations are usefull only with iconv # radio requires oss or alsa backend -# xvmc requires xvideo support REQUIRED_USE=" dga? ( X ) dvdnav? ( dvd ) @@ -174,8 +172,7 @@ REQUIRED_USE=" vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) - xv? ( X ) - xvmc? ( xv )" + xv? ( X )" RESTRICT="faac? ( bindist )" PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) @@ -287,6 +284,7 @@ src_configure() { --disable-kai --disable-libopus --disable-libilbc + --disable-xvmc $(use_enable network networking) $(use_enable joystick) " @@ -494,11 +492,6 @@ src_configure() { use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" use xscreensaver || myconf+=" --disable-xss" use X || myconf+=" --disable-x11" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi ############################ # OSX (aqua) configuration #