diff --git a/_servicedata b/_servicedata index a0c207a..619a7f4 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/mpv-player/mpv.git - b6def652a4b0db0f3514a44fec08f4be66187f3b \ No newline at end of file + c833c095d7cf3cd5b0d9d2103e76be9c072a8b33 \ No newline at end of file diff --git a/mpv-0.30.0+git.1569184750.b6def652a4.obscpio b/mpv-0.30.0+git.1569184750.b6def652a4.obscpio deleted file mode 100644 index 2fc8214..0000000 --- a/mpv-0.30.0+git.1569184750.b6def652a4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b489f3e3bcf4cc044a3f2ef3f8fbf56820122c18ef60378900cdeab1d6e5e3e -size 8495629 diff --git a/mpv-0.30.0+git.1569760020.c833c095d7.obscpio b/mpv-0.30.0+git.1569760020.c833c095d7.obscpio new file mode 100644 index 0000000..85651e9 --- /dev/null +++ b/mpv-0.30.0+git.1569760020.c833c095d7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c3478a52477fa0bc0900c97b6643b1028de91ffa35f3401eb79a97a2e9fb3c9 +size 8521229 diff --git a/mpv-make-ffmpeg-version-check-non-fatal.patch b/mpv-make-ffmpeg-version-check-non-fatal.patch index 4f3285c..509ccb5 100644 --- a/mpv-make-ffmpeg-version-check-non-fatal.patch +++ b/mpv-make-ffmpeg-version-check-non-fatal.patch @@ -1,30 +1,13 @@ -player: make ffmpeg/libav version check non-fatal - -We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. - -Index: mpv-0.29.0/player/main.c +Index: mpv/player/main.c =================================================================== ---- mpv-0.29.0.orig/player/main.c -+++ mpv-0.29.0/player/main.c -@@ -381,21 +381,6 @@ int mp_initialize(struct MPContext *mpct +--- mpv.orig/player/main.c ++++ mpv/player/main.c +@@ -382,7 +382,7 @@ int mp_initialize(struct MPContext *mpct if (handle_help_options(mpctx)) return 1; // help - 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. -- // Distro maintainers who patch this out should be aware that mpv -- // intentionally ignores ABI in some places where it's not possible to -- // get by without violating it. -- 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) { - // nothing to play - mp_print_version(mpctx->log, true); ++ if (0 && !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. + // Distro maintainers who patch this out should be aware that mpv diff --git a/mpv.changes b/mpv.changes index 63ce2e7..7c1be7a 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Sep 29 15:08:46 UTC 2019 - idonmez@suse.com + +- Update to version 0.30.0+git.1569760020.c833c095d7: + * See https://github.com/mpv-player/mpv/compare/b6def652a4...c833c095d7 + for the complete changelog. +- Refresh mpv-make-ffmpeg-version-check-non-fatal.patch +- Remove --enable-zsh-comp option, zsh completion is now always enabled + ------------------------------------------------------------------- Mon Sep 23 11:24:25 UTC 2019 - idonmez@suse.com diff --git a/mpv.obsinfo b/mpv.obsinfo index 69dc722..e5b3751 100644 --- a/mpv.obsinfo +++ b/mpv.obsinfo @@ -1,5 +1,5 @@ name: mpv -version: 0.30.0+git.1569184750.b6def652a4 -mtime: 1569184750 -commit: b6def652a4b0db0f3514a44fec08f4be66187f3b +version: 0.30.0+git.1569760020.c833c095d7 +mtime: 1569760020 +commit: c833c095d7cf3cd5b0d9d2103e76be9c072a8b33 diff --git a/mpv.spec b/mpv.spec index 41a7086..24820f4 100644 --- a/mpv.spec +++ b/mpv.spec @@ -21,7 +21,7 @@ %define _waf_ver 2.0.9 %define _mbc_ver 3.3.17 -%define _mpv_ver 0.30.0+git.1569184750.b6def652a4 +%define _mpv_ver 0.30.0+git.1569760020.c833c095d7 %define lname libmpv1 Name: mpv Version: %{_mpv_ver} @@ -227,7 +227,6 @@ python3 ./waf configure \ --enable-dvdnav \ --enable-libsmbclient \ --enable-libmpv-shared \ - --enable-zsh-comp \ --enable-manpage-build \ --enable-libarchive \ --enable-dvbin \