From 971e542d45a0b698deb12209c9ae07044f99b4899429c6b0e1b4d9ae4a8c9729 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 17 Dec 2019 08:48:56 +0000 Subject: [PATCH] Accepting request 757449 from home:namtrac:branches:multimedia:apps - Update to version 0.30.0+git.1576544262.0bf0efd6d3: * See https://github.com/mpv-player/mpv/compare/cb2d7c1534..0bf0efd6d3 for the complete changelog. - Update mpv-make-ffmpeg-version-check-non-fatal.patch for a simpler logic. OBS-URL: https://build.opensuse.org/request/show/757449 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=175 --- _servicedata | 2 +- mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio | 3 --- mpv-0.30.0+git.1576544262.0bf0efd6d3.obscpio | 3 +++ mpv-make-ffmpeg-version-check-non-fatal.patch | 24 +++++++++---------- mpv.changes | 9 +++++++ mpv.obsinfo | 6 ++--- mpv.spec | 4 ++-- 7 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio create mode 100644 mpv-0.30.0+git.1576544262.0bf0efd6d3.obscpio diff --git a/_servicedata b/_servicedata index c808a61..5248585 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/mpv-player/mpv.git - cb2d7c153462a8f0661c640eb8dddfc5afa5b9c1 \ No newline at end of file + 0bf0efd6d37d02b2ec7f5fecd5b662d60fc64acf \ No newline at end of file diff --git a/mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio b/mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio deleted file mode 100644 index bd88209..0000000 --- a/mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ef81db33818b4da8b9b2aa700071be71db34d4d9134764a254e0c9a121894eb -size 8761869 diff --git a/mpv-0.30.0+git.1576544262.0bf0efd6d3.obscpio b/mpv-0.30.0+git.1576544262.0bf0efd6d3.obscpio new file mode 100644 index 0000000..b1ab7d0 --- /dev/null +++ b/mpv-0.30.0+git.1576544262.0bf0efd6d3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6679d789f33e40eff194ed699dda808e8d12256003bb89788f21b21301f5976 +size 8789005 diff --git a/mpv-make-ffmpeg-version-check-non-fatal.patch b/mpv-make-ffmpeg-version-check-non-fatal.patch index 28bc228..c1f5567 100644 --- a/mpv-make-ffmpeg-version-check-non-fatal.patch +++ b/mpv-make-ffmpeg-version-check-non-fatal.patch @@ -1,13 +1,13 @@ -Index: mpv/player/main.c -=================================================================== ---- mpv.orig/player/main.c -+++ mpv/player/main.c -@@ -384,7 +384,7 @@ int mp_initialize(struct MPContext *mpct - if (handle_help_options(mpctx)) - return 1; // help +diff --git a/common/av_log.c b/common/av_log.c +index 8b0cb09efa..72968aa543 100644 +--- a/common/av_log.c ++++ b/common/av_log.c +@@ -218,7 +218,7 @@ bool print_libav_versions(struct mp_log *log, int v) -- if (!print_libav_versions(mp_null_log, 0)) { -+ if (0 && !print_libav_versions(mp_null_log, 0)) { - print_libav_versions(mpctx->log, MSGL_FATAL); - MP_FATAL(mpctx, "\nmpv was compiled against an incompatible version of " - "FFmpeg/Libav than the shared\nlibrary it is linked against. " + mp_msg(log, v, "%s version: %s\n", LIB_PREFIX, av_version_info()); + +- return !mismatch; ++ return true; + } + + #undef V diff --git a/mpv.changes b/mpv.changes index 2a7f0ef..7d40ab8 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Dec 17 07:38:24 UTC 2019 - idonmez@suse.com + +- Update to version 0.30.0+git.1576544262.0bf0efd6d3: + * See https://github.com/mpv-player/mpv/compare/cb2d7c1534..0bf0efd6d3 + for the complete changelog. +- Update mpv-make-ffmpeg-version-check-non-fatal.patch for a simpler + logic. + ------------------------------------------------------------------- Sat Nov 09 17:46:35 UTC 2019 - idonmez@suse.com diff --git a/mpv.obsinfo b/mpv.obsinfo index 06a52d4..1e62131 100644 --- a/mpv.obsinfo +++ b/mpv.obsinfo @@ -1,5 +1,5 @@ name: mpv -version: 0.30.0+git.1573301895.cb2d7c1534 -mtime: 1573301895 -commit: cb2d7c153462a8f0661c640eb8dddfc5afa5b9c1 +version: 0.30.0+git.1576544262.0bf0efd6d3 +mtime: 1576544262 +commit: 0bf0efd6d37d02b2ec7f5fecd5b662d60fc64acf diff --git a/mpv.spec b/mpv.spec index b3ca948..762aef6 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,7 +1,7 @@ # # spec file for package mpv # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2015 Packman Team # Copyright (c) 2012 Jiri Slaby # Copyright (c) 2011-2012 Pascal Bleser @@ -21,7 +21,7 @@ %define _waf_ver 2.0.9 %define _mbc_ver 3.3.17 -%define _mpv_ver 0.30.0+git.1573301895.cb2d7c1534 +%define _mpv_ver 0.30.0+git.1576544262.0bf0efd6d3 %define lname libmpv1 Name: mpv