diff options
Diffstat (limited to 'package/mpv')
| -rw-r--r-- | package/mpv/0001-fix-powerpc64-altivec.patch (renamed from package/mpv/0002-fix-powerpc64-altivec.patch) | 0 | ||||
| -rw-r--r-- | package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch | 31 | ||||
| -rw-r--r-- | package/mpv/Config.in | 11 | ||||
| -rw-r--r-- | package/mpv/mpv.hash | 4 | ||||
| -rw-r--r-- | package/mpv/mpv.mk | 46 |
5 files changed, 14 insertions, 78 deletions
diff --git a/package/mpv/0002-fix-powerpc64-altivec.patch b/package/mpv/0001-fix-powerpc64-altivec.patch index 45983fec8f..45983fec8f 100644 --- a/package/mpv/0002-fix-powerpc64-altivec.patch +++ b/package/mpv/0001-fix-powerpc64-altivec.patch diff --git a/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch b/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch deleted file mode 100644 index 544c03c058..0000000000 --- a/package/mpv/0001-wscript-don-t-check-for-fork-on-POSIX-checks.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 61aea32efe675e584121295452fc7ab2a652d021 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Wed, 20 Apr 2016 09:39:30 -0300 -Subject: [PATCH] wscript: don't check for fork() on POSIX checks - -It's not being used, and in fact prevents mpv from being built in nommu -architectures (cortex M, blackfin, ...) - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- -Status: pull request https://github.com/mpv-player/mpv/pull/3068 - - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index a4ffce6..40328e4 100644 ---- a/wscript -+++ b/wscript -@@ -127,7 +127,7 @@ main_dependencies = [ - 'desc': 'POSIX environment', - # This should be good enough. - 'func': check_statement(['poll.h', 'unistd.h', 'sys/mman.h'], -- 'struct pollfd pfd; poll(&pfd, 1, 0); fork(); int f[2]; pipe(f); munmap(f,0)'), -+ 'struct pollfd pfd; poll(&pfd, 1, 0); int f[2]; pipe(f); munmap(f,0)'), - }, { - 'name': 'posix-or-mingw', - 'desc': 'development environment', --- -2.7.3 - diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 697ad57ba6..812491e3a9 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -1,12 +1,15 @@ config BR2_PACKAGE_MPV bool "mpv" + depends on BR2_INSTALL_LIBSTDCPP # libass + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE + select BR2_PACKAGE_LIBASS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # Select xkbcommon for wayland to avoid being mysterious @@ -23,8 +26,10 @@ config BR2_PACKAGE_MPV https://mpv.io/ -comment "mpv needs a toolchain w/ threads, gcc >= 4.5" +comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 734b6a3663..548a0f0159 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz -sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL +sha256 f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4 mpv-0.33.0.tar.gz +sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 6801a0468f..18f307d186 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,11 +4,10 @@ # ################################################################################ -MPV_VERSION = 0.29.1 -MPV_SITE = https://github.com/mpv-player/mpv/archive -MPV_SOURCE = v$(MPV_VERSION).tar.gz +MPV_VERSION = 0.33.0 +MPV_SITE = $(call github,mpv-player,mpv,v$(MPV_VERSION)) MPV_DEPENDENCIES = \ - host-pkgconf ffmpeg zlib \ + host-pkgconf ffmpeg libass zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPL-2.0+ MPV_LICENSE_FILES = LICENSE.GPL @@ -24,12 +23,9 @@ MPV_CONF_OPTS = \ --disable-coreaudio \ --disable-cuda-hwaccel \ --disable-opensles \ - --disable-rsound \ --disable-rubberband \ --disable-uchardet \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - --disable-mali-fbdev + --disable-vapoursynth # ALSA support requires pcm+mixer ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) @@ -80,14 +76,6 @@ else MPV_CONF_OPTS += --disable-libarchive endif -# libass subtitle support -ifeq ($(BR2_PACKAGE_LIBASS),y) -MPV_CONF_OPTS += --enable-libass -MPV_DEPENDENCIES += libass -else -MPV_CONF_OPTS += --disable-libass -endif - # bluray support ifeq ($(BR2_PACKAGE_LIBBLURAY),y) MPV_CONF_OPTS += --enable-libbluray @@ -112,14 +100,6 @@ else MPV_CONF_OPTS += --disable-dvdnav endif -# libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) -MPV_CONF_OPTS += --enable-dvdread -MPV_DEPENDENCIES += libdvdread -else -MPV_CONF_OPTS += --disable-dvdread -endif - # libdrm ifeq ($(BR2_PACKAGE_LIBDRM),y) MPV_CONF_OPTS += --enable-drm @@ -128,16 +108,6 @@ else MPV_CONF_OPTS += --disable-drm endif -# libv4l -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MPV_CONF_OPTS += \ - --enable-libv4l2 \ - --enable-tv -MPV_DEPENDENCIES += libv4l -else -MPV_CONF_OPTS += --disable-libv4l2 -endif - # libvdpau ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MPV_CONF_OPTS += --enable-vdpau @@ -171,14 +141,6 @@ else MPV_CONF_OPTS += --disable-pulse endif -# samba support -ifeq ($(BR2_PACKAGE_SAMBA4),y) -MPV_CONF_OPTS += --enable-libsmbclient -MPV_DEPENDENCIES += samba4 -else -MPV_CONF_OPTS += --disable-libsmbclient -endif - # SDL support # Sdl2 requires 64-bit sync intrinsics ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) |