From: Ilya Tumaykin Date: Thu, 10 Mar 2016 17:48:52 +0000 (+0300) Subject: media-video/mpv: revbump to 0.16.0-r1 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=137f714824e5b676ca22de257d30e9b8977bce31;p=gentoo.git media-video/mpv: revbump to 0.16.0-r1 Prevent NULL dereference on Wayland. Fix known regressions since 0.15.0. Sync with 9999. Package-Manager: portage-2.2.27 Signed-off-by: Patrice Clement --- diff --git a/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch b/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch new file mode 100644 index 000000000000..9af5e246ac2e --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch @@ -0,0 +1,23 @@ +commit 5c2026336419805202fbf7a817b2960b0584ce5d +Author: wm4 +Date: Thu Mar 3 15:30:28 2016 +0100 + + vo_opengl: wayland: don't destroy NULL wl_egl_window + + The wayland client API crashes intentionally when trying to free NULL + objects. (Thanks.) + +diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c +index 63a1453..a100073 100644 +--- a/video/out/opengl/context_wayland.c ++++ b/video/out/opengl/context_wayland.c +@@ -183,7 +183,8 @@ static void waylandgl_uninit(MPGLContext *ctx) + + if (wl->egl_context.egl.ctx) { + eglReleaseThread(); +- wl_egl_window_destroy(wl->egl_context.egl_window); ++ if (wl->egl_context.egl_window) ++ wl_egl_window_destroy(wl->egl_context.egl_window); + eglDestroySurface(wl->egl_context.egl.dpy, wl->egl_context.egl_surface); + eglMakeCurrent(wl->egl_context.egl.dpy, NULL, NULL, EGL_NO_CONTEXT); + eglDestroyContext(wl->egl_context.egl.dpy, wl->egl_context.egl.ctx); diff --git a/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch b/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch new file mode 100644 index 000000000000..2515b3ae7ee9 --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch @@ -0,0 +1,31 @@ +commit 5c1fe2a4f3e559a0c6a010e48b0c225d01c1cd0a +Author: wm4 +Date: Sat Mar 5 12:48:58 2016 +0100 + + demux: delay bitrate calculation on packets with unknown timestamps + + Commit 503c6f7f essentially removed timestamps from "laces" (Block sub- + divisions), which means many audio packets will have no timestamp. + There's no reason why bitrate calculation can't just delayed to a point + when the next timestamp is known. + + Fixes #2903 (no audio bitrate with mkv files). + +diff --git a/demux/demux.c b/demux/demux.c +index bd3211a..a7241d9 100644 +--- a/demux/demux.c ++++ b/demux/demux.c +@@ -681,11 +681,11 @@ static struct demux_packet *dequeue_packet(struct demux_stream *ds) + if (ts != MP_NOPTS_VALUE) + ds->base_ts = ts; + +- if (pkt->keyframe) { ++ if (pkt->keyframe && ts != MP_NOPTS_VALUE) { + // Update bitrate - only at keyframe points, because we use the + // (possibly) reordered packet timestamps instead of realtime. + double d = ts - ds->last_br_ts; +- if (ts == MP_NOPTS_VALUE || ds->last_br_ts == MP_NOPTS_VALUE || d < 0) { ++ if (ds->last_br_ts == MP_NOPTS_VALUE || d < 0) { + ds->bitrate = -1; + ds->last_br_ts = ts; + ds->last_br_bytes = 0; diff --git a/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch b/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch new file mode 100644 index 000000000000..1166b36fb054 --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch @@ -0,0 +1,39 @@ +commit c53c6bbd387ca582091a8bfca33140d65c200be0 +Author: wm4 +Date: Mon Mar 7 15:00:08 2016 +0100 + + video: fix coverart decoding + + Deselecting cover art and then reselecting it did not work. The second + time the cover art picture is not displayed again. (This seems to break + every other month...) + + The reason is commit 6640b22a. It mutates the input packet. And it is + correct that we don't own d_video->header->attached_picture at this + point. Fix it by creating a new packet reference. + +diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c +index e8a5774..fc0b090 100644 +--- a/video/decode/dec_video.c ++++ b/video/decode/dec_video.c +@@ -363,9 +363,10 @@ void video_work(struct dec_video *d_video) + return; + + if (d_video->header->attached_picture) { ++ struct demux_packet *packet = ++ demux_copy_packet(d_video->header->attached_picture); + if (d_video->current_state == DATA_AGAIN && !d_video->cover_art_mpi) { +- d_video->cover_art_mpi = +- decode_packet(d_video, d_video->header->attached_picture, 0); ++ d_video->cover_art_mpi = decode_packet(d_video, packet, 0); + // Might need flush. + if (!d_video->cover_art_mpi) + d_video->cover_art_mpi = decode_packet(d_video, NULL, 0); +@@ -375,6 +376,7 @@ void video_work(struct dec_video *d_video) + d_video->current_mpi = mp_image_new_ref(d_video->cover_art_mpi); + // (DATA_OK is returned the first time, when current_mpi is sill set) + d_video->current_state = DATA_EOF; ++ talloc_free(packet); + return; + } + diff --git a/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch b/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch new file mode 100644 index 000000000000..75ac650ca2ac --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch @@ -0,0 +1,36 @@ +commit a6f8a6977ec59d314b617780c60e374b585ebaca +Author: wm4 +Date: Thu Mar 3 15:30:55 2016 +0100 + + demux_timeline: set correct seekable flags + + Tricky misleading crap. + + Fixes #2898. + +diff --git a/demux/demux.h b/demux/demux.h +index e882e90..2c1e3a2 100644 +--- a/demux/demux.h ++++ b/demux/demux.h +@@ -174,7 +174,7 @@ typedef struct demuxer { + int64_t filepos; // input stream current pos. + char *filename; // same as stream->url + bool seekable; +- bool partially_seekable; // implies seekable=true ++ bool partially_seekable; // true if _maybe_ seekable; implies seekable=true + double start_time; + // File format allows PTS resets (even if the current file is without) + bool ts_resets_possible; +diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c +index 0c6c398..92cf1e6 100644 +--- a/demux/demux_timeline.c ++++ b/demux/demux_timeline.c +@@ -344,7 +344,7 @@ static int d_open(struct demuxer *demuxer, enum demux_check check) + print_timeline(demuxer); + + demuxer->seekable = true; +- demuxer->partially_seekable = true; ++ demuxer->partially_seekable = false; + + demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name; + diff --git a/media-video/mpv/mpv-0.16.0-r1.ebuild b/media-video/mpv/mpv-0.16.0-r1.ebuild new file mode 100644 index 000000000000..ca8e4a158a52 --- /dev/null +++ b/media-video/mpv/mpv-0.16.0-r1.ebuild @@ -0,0 +1,281 @@ +# 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" + 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" +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 ) + 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? ( virtual/opengl ) + 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[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 ) +" + +PATCHES=( + "${FILESDIR}/${P}-fix-srt-subtitles-on-libav.patch" + "${FILESDIR}/${P}-avoid-NULL-dereference-on-wayland.patch" + "${FILESDIR}/${P}-set-correct-seekable-flags.patch" + "${FILESDIR}/${P}-fix-bitrate-calculation.patch" + "${FILESDIR}/${P}-fix-coverart-decoding.patch" +) + +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_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 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) + --disable-coreaudio + + # 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) + $(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) + $(use_enable opengl desktop-gl) + + # 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; 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 +} + +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 +}