[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/

[Ian Delaney]

commit:     d5c7520d1570c6495046164ed1246c8d56daf789
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 14:32:17 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 19:28:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c7520d

media-video/mpv: remove old

Package-Manager: portage-2.2.27

 media-video/mpv/Manifest                           |   1 -
 .../files/mpv-0.14.0-support-GNU-__thread.patch    |  37 ---
 .../mpv/files/mpv-fix-include-in-tests.patch       |  17 --
 media-video/mpv/mpv-0.14.0-r1.ebuild               | 304 ---------------------
 4 files changed, 359 deletions(-)

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a60de5b..e8307fd 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
-DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
 DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
 DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe

diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
deleted file mode 100644
index 6e17314..0000000
--- a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
-
-Upstream commits:
-https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
-https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
-
-diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
-index 00cd535..f607c23 100644
---- a/video/out/opengl/common.c
-+++ b/video/out/opengl/common.c
-@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
- }
- 
- #if HAVE_C11_TLS
--static _Thread_local MPGLContext *current_context;
-+#define MP_TLS _Thread_local
-+#elif defined(__GNU__)
-+#define MP_TLS __thread
-+#endif
-+
-+#ifdef MP_TLS
-+static MP_TLS MPGLContext *current_context;
- 
- static void * GLAPIENTRY get_native_display(const char *name)
- {
-diff --git a/wscript b/wscript
-index a5e6914..969d9cc 100644
---- a/wscript
-+++ b/wscript
-@@ -718,7 +718,6 @@ video_output_features = [
-     }, {
-         'name': 'vaapi-egl',
-         'desc': 'VAAPI EGL',
--        'deps': [ 'c11-tls' ], # indirectly
-         'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
-         'func': check_true,
-     }, {

diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch
deleted file mode 100644
index b020119..0000000
--- a/media-video/mpv/files/mpv-fix-include-in-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 867334395765ae7d2765e0834f9fd3dd5de53cab
-Author: Ilya Tumaykin <itumaykin@×××××.com>
-Date:   Tue Dec 22 17:10:12 2015 +0300
-
-    tests: fix #include
-
-diff --git a/test/gl_video.c b/test/gl_video.c
-index 253ab35..97fee94 100644
---- a/test/gl_video.c
-+++ b/test/gl_video.c
-@@ -1,5 +1,5 @@
- #include "test_helpers.h"
--#include "video/out/gl_video.h"
-+#include "video/out/opengl/video.h"
- 
- static void test_scale_ambient_lux_limits(void **state) {
-     float x;

diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.14.0-r1.ebuild
deleted file mode 100644
index 40ccf88..0000000
--- a/media-video/mpv/mpv-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV='1.8.12'
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-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
-	test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
-	xv zsh-completion"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	egl? ( || ( gbm X wayland ) )
-	enca? ( iconv )
-	gbm? ( drm egl )
-	lcms? ( || ( opengl egl ) )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( X )
-	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( X wayland ) )
-	vdpau? ( X )
-	wayland? ( egl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-	zsh-completion? ( cli )
-"
-
-COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0 )
-	cdda? ( dev-libs/libcdio-paranoia )
-	drm? ( x11-libs/libdrm )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		enca? ( app-i18n/enca )
-		libguess? ( >=app-i18n/libguess-1.0 )
-		uchardet? ( dev-libs/uchardet )
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
-	v4l? ( media-libs/libv4l )
-	vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.2.0
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	virtual/pkgconfig
-	doc? ( dev-python/rst2pdf )
-	test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
-		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
-	fi
-
-	if ! use libass; then
-		ewarn "You have disabled the libass support."
-		ewarn "OSD and subtitles won't be available."
-	fi
-
-	if use openal; then
-		ewarn "You have enabled the openal audio output. Be warned that"
-		ewarn "this output is considered experimental by upstream."
-	fi
-
-	if use sdl; then
-		ewarn "You have enabled the sdl video and audio outputs. Note that"
-		ewarn "upstream provides these outputs for compatibility reasons only."
-		ewarn "You probably don't need them under the normal circumstances."
-	fi
-
-	if use libav; then
-		elog "You have enabled media-video/libav instead of media-video/ffmpeg."
-		elog "Upstream recommends media-video/ffmpeg, as some functionality"
-		elog "is not provided by media-video/libav."
-	fi
-
-	einfo "mpv optionally supports many different audio and video formats."
-	einfo "You will need to enable support for the desired formats in your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/ffmpeg or media-video/libav"
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-
-	epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
-	epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mywafargs=(
-		--confdir="${EPREFIX}"/etc/${PN}
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		--disable-gpl3		# Unclear license info. See Gentoo bug 571728.
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		# See deep down below for build-date
-		--disable-libmpv-static
-		--disable-static-build
-		--disable-optimize		# Do not add '-O2' to CFLAGS
-		--disable-debug-build	# Do not add '-g' to CFLAGS
-
-		$(use_enable doc pdf-build)
-		$(use_enable vf-dlopen vf-dlopen-filters)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable enca)
-		$(use_enable libguess)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavfilter
-		--enable-libavdevice
-
-		# Audio outputs
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		$(use_enable alsa)
-		--disable-coreaudio
-		--disable-dsound
-
-		# Video outputs
-		--disable-cocoa
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xscreensaver xss)
-		$(use_enable X xext)
-		$(use_enable xv)
-		$(use_enable xinerama)
-		$(use_enable X xrandr)
-		$(use_enable opengl 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
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable raspberry-pi rpi)
-
-		# HWaccels
-		$(use_enable vaapi vaapi-hwaccel)
-		# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
-
-		# TV features
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-	)
-
-	if use vaapi && use X && use egl; then
-		mywafargs+=(--enable-vaapi-x-egl)
-	else
-		mywafargs+=(--disable-vaapi-x-egl)
-	fi
-
-	# Create reproducible non-live builds
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}usr/bin/${PN}"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}