rpm/mpv
SHA256
1
0
Fork 0
forked from pool/mpv
Code Pull Requests Activity

- Refresh patch mpv-make-ffmpeg-version-check-non-fatal.patch

Browse Source 
* Rather delete the warning as whole, in OBS concept we detect
    abi changes and it misleads the users of stable distributions
    to worry something broke

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=96
This commit is contained in:
Tomáš Chvátal 2017-05-09 15:34:59 +00:00 committed by Git OBS Bridge
parent 5d4f910c0a
commit e912558e98
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mpv-make-ffmpeg-version-check-non-fatal.patch
View File

@ -2,14 +2,17 @@ player: make ffmpeg/libav version check non-fatal
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
Index: mpv-0.21.0/player/main.c
Index: mpv-0.25.0/player/main.c
===================================================================
--- mpv-0.21.0.orig/player/main.c
+++ mpv-0.21.0/player/main.c
@@ -432,13 +432,12 @@ int mp_initialize(struct MPContext *mpct
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.
--- mpv-0.25.0.orig/player/main.c
+++ mpv-0.25.0/player/main.c
@@ -438,18 +438,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. "
@ -17,12 +20,8 @@ Index: mpv-0.21.0/player/main.c
- "misbehavior and crashes.\n\nmpv does not support this "
- "configuration and will not run - rebuild mpv instead.\n");
- return -1;
+ print_libav_versions(mpctx->log, MSGL_WARN);
+ MP_WARN(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\nUpstream does not support this "
+ "configuration.\nPlease rebuild mpv in case of any problems.\n");
}
- }
-
if (!mpctx->playlist->first && !opts->player_idle_mode)
return -3;

8
mpv.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 9 15:35:17 UTC 2017 - tchvatal@suse.com
- Refresh patch mpv-make-ffmpeg-version-check-non-fatal.patch
* Rather delete the warning as whole, in OBS concept we detect
abi changes and it misleads the users of stable distributions
to worry something broke
-------------------------------------------------------------------
Tue May 2 14:02:12 UTC 2017 - tchvatal@suse.com