diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index d101d0231143..436ca625967c 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,202 +1,199 @@ PORTNAME= mpv DISTVERSIONPREFIX= v -DISTVERSION= 0.35.1 -PORTREVISION= 5 +DISTVERSION= 0.36.0 PORTEPOCH= 1 CATEGORIES= multimedia audio PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= b95111dda879.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871 -PATCHFILES+= 94c189dae76b.patch:-p1 # https://github.com/mpv-player/mpv/pull/11398 -PATCHFILES+= 362256edbc4f.patch:-p1 # https://github.com/mpv-player/mpv/pull/11398 -PATCHFILES+= 3a2f8d42ab20.patch:-p1 # https://github.com/mpv-player/mpv/pull/11447 +PATCHFILES+= 9c97f6ebccaa.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player WWW= https://mpv.io LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE.GPL LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENSE.LGPL BUILD_DEPENDS= ffmpeg>=4.0.2,1:multimedia/ffmpeg LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libass.so:multimedia/libass USES= compiler:c11 cpe desktop-file-utils iconv jpeg \ meson pkgconfig python:build shebangfix tar:bz2 USE_LDCONFIG= yes SHEBANG_FILES= *.py TOOLS/*.py USE_GITHUB= yes GH_ACCOUNT= mpv-player MESON_ARGS= --auto-features=auto \ -Dshaderc=disabled \ -Dlibmpv=true -OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 MANPAGES MUJS RUBBERBAND TEST UCHARDET EXAMPLES ZIMG +OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 MANPAGES MUJS RUBBERBAND UCHARDET EXAMPLES ZIMG OPTIONS_DEFAULT= ARCHIVE DVDNAV LCMS2 LUAJIT MANPAGES NVDEC OPENGL UCHARDET \ V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDLP OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L VAPOURSYNTH OPTIONS_GROUP_VO= CACA NVDEC OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11 OPTIONS_GROUP_AO= ALSA JACK OPENAL PIPEWIRE PULSEAUDIO SDL SNDIO OPTIONS_RADIO= YOUTUBE OPTIONS_RADIO_YOUTUBE= YTDL YTDLP OPTIONS_SINGLE= LUA OPTIONS_SINGLE_LUA= LUA LUAJIT LUA_NONE OPTIONS_SUB= yes DVDNAV_DESC= DVD menu navigation LUA_NONE_DESC= Disable Lua scripting language support LUAJIT_DESC= Use LuaJIT instead of Lua scripting language support MUJS_DESC= Use MuJS for Javascript language support NVDEC_DESC= NVIDIA decoder with CUDA support RUBBERBAND_DESC= High quality pitch correction with librubberband SIXEL_DESC= Sixel graphics support UCHARDET_DESC= Guess subtitle encoding via uchardet VAPOURSYNTH_DESC= VapourSynth filter bridge VULKAN_DESC= Vulkan output support YTDLP_DESC= Install yt-dlp (youtube-dl fork) YTDL_DESC= Install youtube-dl ZIMG_DESC= High quality software scaling via "z" library IN_DESC= Input VO_DESC= Video Output AO_DESC= Audio Output ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MESON_ENABLED= alsa ARCHIVE_USES= libarchive ARCHIVE_MESON_ENABLED= libarchive CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_MESON_ENABLED= caca CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_MESON_ENABLED= cdda DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils DOCS_MESON_ENABLED= html-build DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_MESON_ENABLED= dvdnav JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_MESON_ENABLED= jack LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms2 LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_MESON_ENABLED= libbluray LUA_USES= lua:51-52 LUA_MESON_ON= -Dlua=lua-${LUA_VER} LUAJIT_USES= luajit LUAJIT_MESON_ON= -Dlua=luajit LUA_NONE_MESON_ON= -Dlua=disabled MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= manpage-build MUJS_LIB_DEPENDS= libmujs.so:lang/mujs MUJS_MESON_ENABLED= javascript NVDEC_BUILD_DEPENDS= ${LOCALBASE}/include/ffnvcodec/dynlink_loader.h:multimedia/ffnvcodec-headers NVDEC_RUN_DEPENDS= ${LOCALBASE}/include/ffnvcodec/dynlink_loader.h:multimedia/ffnvcodec-headers NVDEC_MESON_ENABLED= cuda-hwaccel OPENAL_USES= openal OPENAL_MESON_ENABLED= openal OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} _OPENAL_LDFLAGS_i386= -Wl,-znotext OPENGL_USES= gl OPENGL_USE= GL=egl,gbm OPENGL_MESON_ENABLED= gl PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulse RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband RUBBERBAND_MESON_ENABLED= rubberband SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_MESON_ENABLED= sdl2 SIXEL_LIB_DEPENDS= libsixel.so:graphics/libsixel SIXEL_MESON_ENABLED= sixel SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_MESON_ENABLED= sndio -TEST_MESON_TRUE= tests - UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet UCHARDET_MESON_ENABLED= uchardet V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/dmx.h:multimedia/v4l_compat V4L_MESON_ENABLED= dvbin VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_MESON_ENABLED= vaapi VAPOURSYNTH_LIB_DEPENDS= libvapoursynth-script.so:multimedia/vapoursynth VAPOURSYNTH_MESON_ENABLED= vapoursynth VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_MESON_ENABLED= vdpau VDPAU_IMPLIES= X11 VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libplacebo.so:graphics/libplacebo \ libvulkan.so:graphics/vulkan-loader VULKAN_MESON_ENABLED= vulkan libplacebo WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input-event-codes.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols # pkg-config WAYLAND_MESON_ENABLED= wayland WAYLAND_IMPLIES= OPENGL X11_USES= gnome xorg X11_USE= XORG=x11,xext,xinerama,xorgproto,xpresent,xrandr,xscrnsaver,xv,xxf86vm X11_MESON_ENABLED= x11 YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp YTDL_RUN_DEPENDS= youtube-dl:www/youtube_dl ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg ZIMG_MESON_ENABLED= zimg .include .if ${PORT_OPTIONS:MVAAPI} && ${PORT_OPTIONS:MWAYLAND} MESON_ARGS+= -Dvaapi-wayland=enabled LIB_DEPENDS+= libva-wayland.so:multimedia/libva .else MESON_ARGS+= -Dvaapi-wayland=disabled .endif post-patch-MANPAGES-on: @${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \ -e 's|/usr/local|${PREFIX}|g' -pre-install-TEST-on: - @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} \ - ${MESON_BUILD_DIR}/${PORTNAME} --unittest=all-simple) +pre-test: + @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ + ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ + ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \ + ${TOUCH} ${WRKDIR}/.meson_build_tests; \ + fi .include diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 3bec5e8f408f..95c6605158ec 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,11 +1,5 @@ -TIMESTAMP = 1674924587 -SHA256 (mpv-player-mpv-v0.35.1_GH0.tar.gz) = 41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9 -SIZE (mpv-player-mpv-v0.35.1_GH0.tar.gz) = 3367913 -SHA256 (b95111dda879.patch) = c70c62f01d65c701a161954ef480d60aa8cc19454f9e04c4c61ef115cd4f75b2 -SIZE (b95111dda879.patch) = 1474 -SHA256 (94c189dae76b.patch) = c6e2b219f448f0711033c5618854fc4c323f0860cdc268e01f61015f9ec79757 -SIZE (94c189dae76b.patch) = 1151 -SHA256 (362256edbc4f.patch) = 5e048085eb1ac3bf6f81c99daf471177a5cad1100be84fe2a5a7436687bc81e1 -SIZE (362256edbc4f.patch) = 1587 -SHA256 (3a2f8d42ab20.patch) = 6c0c25936b3aff93a1505e8de92d107fd49a096b441cc90492203893f5bad39e -SIZE (3a2f8d42ab20.patch) = 2058 +TIMESTAMP = 1690132236 +SHA256 (mpv-player-mpv-v0.36.0_GH0.tar.gz) = 29abc44f8ebee013bb2f9fe14d80b30db19b534c679056e4851ceadf5a5e8bf6 +SIZE (mpv-player-mpv-v0.36.0_GH0.tar.gz) = 3409178 +SHA256 (9c97f6ebccaa.patch) = 474a04526f675cf15963d4ba5513c8d5138af3a416151746787ba281a61c45d5 +SIZE (9c97f6ebccaa.patch) = 1472 diff --git a/multimedia/mpv/pkg-plist b/multimedia/mpv/pkg-plist index 6ab66311ca1b..076e15af8bd2 100644 --- a/multimedia/mpv/pkg-plist +++ b/multimedia/mpv/pkg-plist @@ -1,26 +1,26 @@ bin/mpv %%ETCDIR%%/encoding-profiles.conf include/mpv/client.h include/mpv/render.h include/mpv/render_gl.h include/mpv/stream_cb.h lib/libmpv.so lib/libmpv.so.2 -lib/libmpv.so.2.0.0 +lib/libmpv.so.2.1.0 libdata/pkgconfig/mpv.pc %%MANPAGES%%man/man1/mpv.1.gz share/applications/mpv.desktop share/bash-completion/completions/mpv share/icons/hicolor/128x128/apps/mpv.png share/icons/hicolor/16x16/apps/mpv.png share/icons/hicolor/32x32/apps/mpv.png share/icons/hicolor/64x64/apps/mpv.png share/icons/hicolor/scalable/apps/mpv.svg share/icons/hicolor/symbolic/apps/mpv-symbolic.svg %%PORTDOCS%%%%DOCSDIR%%/mpv.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mplayer-input.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mpv.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/restore-old-bindings.conf share/metainfo/mpv.metainfo.xml share/zsh/site-functions/_mpv