From fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Mon, 18 Jan 2016 22:45:47 +0300 Subject: media-video/mpv: revbump to 0.15.0-r1 to fix null pointer dereference Upstream issue: https://github.com/mpv-player/mpv/issues/2729 Package-Manager: portage-2.2.26 --- .../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 ++ media-video/mpv/mpv-0.15.0-r1.ebuild | 302 +++++++++++++++++++++ media-video/mpv/mpv-0.15.0.ebuild | 300 -------------------- 3 files changed, 323 insertions(+), 300 deletions(-) create mode 100644 media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch create mode 100644 media-video/mpv/mpv-0.15.0-r1.ebuild delete mode 100644 media-video/mpv/mpv-0.15.0.ebuild (limited to 'media-video') diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch new file mode 100644 index 000000000000..4cc4c87f3096 --- /dev/null +++ b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch @@ -0,0 +1,21 @@ +commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052 +Author: wm4 +Date: Mon Jan 18 20:10:28 2016 +0100 + + command: fix NULL pointer deref in "video-codec" property + + Fixes #2729. + +diff --git a/player/command.c b/player/command.c +index 3c7cfb2..413349d 100644 +--- a/player/command.c ++++ b/player/command.c +@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop, + { + MPContext *mpctx = ctx; + struct track *track = mpctx->current_track[0][STREAM_VIDEO]; +- const char *c = track->d_video ? track->d_video->decoder_desc : NULL; ++ const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL; + return m_property_strdup_ro(action, arg, c); + } + diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild new file mode 100644 index 000000000000..ca974a9bd286 --- /dev/null +++ b/media-video/mpv/mpv-0.15.0-r1.ebuild @@ -0,0 +1,302 @@ +# 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} ) +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}/${P}-fix-null-pointer-dereference.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) + + --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-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 + + # 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 +} diff --git a/media-video/mpv/mpv-0.15.0.ebuild b/media-video/mpv/mpv-0.15.0.ebuild deleted file mode 100644 index b6a029730825..000000000000 --- a/media-video/mpv/mpv-0.15.0.ebuild +++ /dev/null @@ -1,300 +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} ) -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_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) - - --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-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 - - # 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 -} -- cgit v1.2.3-65-gdbad