mpv: Update to 0.27.0

This commit is contained in:
Alexey Pavlov
2017-12-14 08:08:58 +03:00
parent e1c656ae5b
commit ff9ba8a848
2 changed files with 36 additions and 6 deletions

View File

@@ -0,0 +1,29 @@
Description: Surpress ffmpeg version mismatch error
Requiring an exact ffmpeg version isn't helpful in a distribution where all ABI
issues should already be handled by package dependencies. Rebuilding every time
ffmpeg is updated is also completely unmaintainable.
Author: James Cowgill <jcowgill@debian.org>
Bug-Debian: https://bugs.debian.org/831537
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/player/main.c
+++ b/player/main.c
@@ -447,18 +447,6 @@ int mp_initialize(struct MPContext *mpct
handle_deprecated_options(mpctx);
- if (!print_libav_versions(mp_null_log, 0)) {
- // Using mismatched libraries can be legitimate, but even then it's
- // a bad idea. We don't acknowledge its usefulness and stability.
- print_libav_versions(mpctx->log, MSGL_FATAL);
- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
- "This is most likely a broken build and could\nresult in "
- "misbehavior and crashes.\n\nmpv does not support this "
- "configuration and will not run - rebuild mpv instead.\n");
- return -1;
- }
-
if (!mpctx->playlist->first && !opts->player_idle_mode)
return -3;

View File

@@ -4,7 +4,7 @@
_realname=mpv
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.25.0
pkgver=0.27.0
pkgrel=1
pkgdesc="Video player based on MPlayer/mplayer2 (mingw-w64)"
url="https://mpv.io/"
@@ -29,14 +29,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"perl"
"pkg-config"
"python")
source=(${_realname}-${pkgver}.tar.gz::https://github.com/mpv-player/${_realname}/archive/v${pkgver}.tar.gz)
sha256sums=('07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce')
source=(${_realname}-${pkgver}.tar.gz::https://github.com/mpv-player/${_realname}/archive/v${pkgver}.tar.gz
001-ffmpeg-abi.patch)
sha256sums=('341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c'
'4e7541054ffc44e07c4580bac3863a38428ee22467580407f6f7105ada58742c')
# strip doesn't work well with the mpv.com wrapper, so strip manually instead
options=(!strip !emptydirs)
prepare() {
cd ${_realname}-${pkgver}
patch -p1 -i ${srcdir}/001-ffmpeg-abi.patch
[[ -x ./waf ]] || /usr/bin/python3 ./bootstrap.py
sed -i 's:bin/env python$:bin/env python3:' waf
}
@@ -79,9 +83,6 @@ package() {
export PYTHON=${MINGW_PREFIX}/bin/python3
/usr/bin/python3 ./waf install --destdir="${pkgdir}"
# For some reason waf installs DLLs to /lib, so move to /bin
mv "${pkgdir}${MINGW_PREFIX}/lib/mpv-1.dll" "${pkgdir}${MINGW_PREFIX}/bin/"
# Strip binaries manually
${MINGW_PREFIX}/bin/strip "${STRIP_BINARIES}" "${pkgdir}${MINGW_PREFIX}/bin/mpv.exe"
${MINGW_PREFIX}/bin/strip "${STRIP_BINARIES}" "${pkgdir}${MINGW_PREFIX}/bin/mpv.com"