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 AD27013829C for ; Tue, 31 May 2016 08:49:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C327B21C01D; Tue, 31 May 2016 08:49:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D4B521C01D for ; Tue, 31 May 2016 08:49:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A485340C44 for ; Tue, 31 May 2016 08:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADE3095D for ; Tue, 31 May 2016 08:49:42 +0000 (UTC) From: "Sam Jorna" 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 Jorna" Message-ID: <1464684546.2bae91d4e99bcaa89239ce9341052d1a9a7065a0.wraeth@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/Manifest media-video/mpv/mpv-0.17.0-r5.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: wraeth X-VCS-Committer-Name: Sam Jorna X-VCS-Revision: 2bae91d4e99bcaa89239ce9341052d1a9a7065a0 X-VCS-Branch: master Date: Tue, 31 May 2016 08:49:42 +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: 7aedca3d-29e9-4e6a-903d-97c3ab40585f X-Archives-Hash: 1940c05001ba3ae4745035cf6151c1cb commit: 2bae91d4e99bcaa89239ce9341052d1a9a7065a0 Author: Ilya Tumaykin gmail com> AuthorDate: Tue May 31 04:37:48 2016 +0000 Commit: Sam Jorna gentoo org> CommitDate: Tue May 31 08:49:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bae91d4 media-video/mpv: revbump to 0.17.0-r5 wrt bug 584418 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=584418 Package-Manager: portage-2.3.0_rc1 media-video/mpv/Manifest | 1 + media-video/mpv/mpv-0.17.0-r5.ebuild | 300 +++++++++++++++++++++++++++++++++++ 2 files changed, 301 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index d5fb1d0..171e223 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,5 @@ DIST mpv-0.17.0-patches-04.tar.gz 7862 SHA256 a6b259cfe3ed605ca5530981670051e38c712c906bbdd0ea7958932660cc6556 SHA512 74dc84ab5baadb950658d55ba5d89300fc169c67cf854ca33ea812e246a1fbbbe9f84d0f07ca6cc3ca5fb97710209974105785a8a3e593166a4aaa696266b1ea WHIRLPOOL 743c9c7443213499d2ec692955c447f29ec10c3305fa13c2e06ae52b10408473b35037772b4b3c4a2f69ff9318fe1a6dd8a7d5c4307928424b0a081447b9018e +DIST mpv-0.17.0-patches-05.tar.gz 12830 SHA256 cc63d7fe5754ceb62bc8c33d50a02376ee0d5d4c3ff0763fc85787624e32b1e1 SHA512 680b5f50e5a4749ffd63712bf6160b64b37bd14bfc9f9b3912afb1a576a1ab754cdaeb20ee206e3484e037126bec395431002590ff3417ea247d2be340b4fd09 WHIRLPOOL 01e76442ed360ca0f29404038d5b082fb87d40dcf7a868377735ac63cd2df51385dd5987fe57ed6c5928ca1aca3fa8938d7fe878360025d6ea8706b7948c8531 DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b diff --git a/media-video/mpv/mpv-0.17.0-r5.ebuild b/media-video/mpv/mpv-0.17.0-r5.ebuild new file mode 100644 index 0000000..54589c6 --- /dev/null +++ b/media-video/mpv/mpv-0.17.0-r5.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV=1.8.12 + +inherit 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 + https://dev.gentoo.org/~wraeth/distfiles/${P}-patches-05.tar.gz + " + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" + DOCS=( RELEASE_NOTES ) +else + EGIT_REPO_URI="git://github.com/mpv-player/mpv.git" + inherit git-r3 +fi +SRC_URI+=" https://waf.io/waf-${WAF_PV}" +DOCS+=( CONTRIBUTING.md README.md ) + +# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. +LICENSE="GPL-2+ BSD ISC" +SLOT="0" +IUSE="aqua +alsa archive bluray cdda +cli coreaudio 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 ) + aqua? ( opengl ) + egl? ( || ( gbm X wayland ) ) + enca? ( iconv ) + gbm? ( drm egl ) + lcms? ( || ( opengl egl ) ) + libguess? ( iconv ) + luajit? ( lua ) + uchardet? ( iconv ) + v4l? ( || ( alsa oss ) ) + vaapi? ( || ( gbm 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? ( virtual/jack ) + 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 ) + opengl? ( !aqua? ( virtual/opengl ) ) + pulseaudio? ( media-sound/pulseaudio ) + raspberry-pi? ( + >=media-libs/raspberrypi-userland-0_pre20160305-r1 + media-libs/mesa[egl,gles2] + ) + 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[drm?,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 ) + 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 +} + +src_prepare() { + cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die + chmod +x "${S}"/waf || die + default_src_prepare + EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch "${WORKDIR}/${PV}" +} + +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 # Don't add '-O2' to CFLAGS. + --disable-debug-build # Don't add '-g' to CFLAGS. + + $(use_enable doc html-build) + $(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-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) + --disable-opensles + $(use_enable alsa) + $(use_enable coreaudio) + + # Video outputs: + $(use_enable aqua 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) + $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') + $(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-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') + $(use_enable libcaca caca) + $(use_enable jpeg) + --disable-android + $(use_enable raspberry-pi rpi) + $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') + + # HWaccels: + # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. + $(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) + + # Miscellaneous features: + --disable-apple-remote # Needs testing first. See Gentoo bug 577332. + ) + + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl 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 + + # bash-completion < 2.3-r1 already installs (mostly broken) mpv completion. + if use cli && ! has_version '