Accepting request 757449 from home:namtrac:branches:multimedia:apps

- Update to version 0.30.0+git.1576544262.0bf0efd6d3:
  * See 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

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/mpv-player/mpv.git</param>
-              <param name="changesrevision">cb2d7c153462a8f0661c640eb8dddfc5afa5b9c1</param></service></servicedata>
+              <param name="changesrevision">0bf0efd6d37d02b2ec7f5fecd5b662d60fc64acf</param></service></servicedata>

mpv-0.30.0+git.1573301895.cb2d7c1534.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ef81db33818b4da8b9b2aa700071be71db34d4d9134764a254e0c9a121894eb
-size 8761869

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

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

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
 

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
 

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 <packman@links2linux.de>
 # Copyright (c) 2012 Jiri Slaby <jslaby@suse.de>
 # Copyright (c) 2011-2012 Pascal Bleser <pascal.bleser@opensuse.org>
@@ -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