Accepting request 493786 from multimedia:apps

- 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 - Remove the pdf build, it is same as manpage - Switch to python3 subpkgs as we use python3 anyway (Fixes TW build) - Dropped openal. It's pointless these days and it creates a problem when used with pulse (gh#mpv-player/mpv#4311) - Removed portaudio requirement (support was dropped in 0.8.0!) - Update to version 0.25.0 * Support for some optical media functionality (DVD/CD) is now disabled by default. * More parts of the player are now licensed under LGPL. In particular: + OSD symbol font + ass_mp, sd_ass + common.h + demux/packet + demux_mkv (with minor exceptions), ebml, matroska.h + sd_lavc + sub/osd Thanks to all contributors who have agreed to relicensing of their changes! See #2033 for details. * Starting with this release, releases will be tagged on the master branch. The release/current branch is thus abandoned. Added features: OBS-URL: https://build.opensuse.org/request/show/493786 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpv?expand=0&rev=29
2017-05-17 08:48:17 +00:00 · 2017-05-17 08:48:17 +00:00 · 8f7f8137c3
commit 8f7f8137c3
parent ad4edf0399 e912558e98
9 changed files with 197 additions and 48 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+waf-1.9.9 filter=lfs diff=lfs merge=lfs -text
--- a/mpv-0.24.0.tar.gz
+++ b/mpv-0.24.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15
-size 2835920
--- a/mpv-0.25.0.tar.gz
+++ b/mpv-0.25.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce
+size 2874584
--- a/mpv-bash-completion-3.3.12.tar.gz
+++ b/mpv-bash-completion-3.3.12.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9291ef730af6f69cc0efc82e88d170d43d79266a1500461b08719130507870ef
-size 19310
--- a/mpv-bash-completion-3.3.13.tar.gz
+++ b/mpv-bash-completion-3.3.13.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65172975bfca59f9921afd9788c1e1532c734c068a6af21517eeec63b9a1ea34
+size 19726
--- a/mpv-make-ffmpeg-version-check-non-fatal.patch
+++ b/mpv-make-ffmpeg-version-check-non-fatal.patch
@ -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;
+ 
--- a/mpv.changes
+++ b/mpv.changes
@ -1,3 +1,154 @@
+-------------------------------------------------------------------
+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
+
+- Remove the pdf build, it is same as manpage
+- Switch to python3 subpkgs as we use python3 anyway (Fixes TW build)
+
+-------------------------------------------------------------------
+Sun Apr 23 15:42:03 UTC 2017 - aloisio@gmx.com
+
+- Dropped openal. It's pointless these days and it creates
+  a problem when used with pulse (gh#mpv-player/mpv#4311)
+- Removed portaudio requirement (support was dropped in
+  0.8.0!)
+
+-------------------------------------------------------------------
+Sun Apr 23 07:18:05 UTC 2017 - aloisio@gmx.com
+
+- Update to version 0.25.0
+  * Support for some optical media functionality (DVD/CD) is now 
+    disabled by default.
+  * More parts of the player are now licensed under LGPL. In 
+    particular:
+      + OSD symbol font
+      + ass_mp, sd_ass
+      + common.h
+      + demux/packet
+      + demux_mkv (with minor exceptions), ebml, matroska.h
+      + sd_lavc
+      + sub/osd
+    Thanks to all contributors who have agreed to relicensing of 
+    their changes! See #2033 for details.
+  * Starting with this release, releases will be tagged on the 
+    master branch. The release/current branch is thus abandoned.
+  Added features:
+  * TOOLS: add acompressor.lua script for runtime acompressor ffmpeg
+    filter control
+  * dvb: add support for DVB-T2
+  * lavfi: support hwdec filters for --lavfi-complex
+  * osc: add volume button (mouse wheel to change volume)
+  * sub: add SDH subtitle filter
+  * vo_opengl: add experimental vdpauglx backend
+  Removed features:
+  * image_writer: remove useless formats (PPM, PGM, TGA)
+  * af_drc: remove (use --af=acompressor instead; higher quality)
+  Added options and commands:
+  * --demuxer-lavf-probe-info
+  * --sub-filter-sdh, --sub-filter-sdh-harder
+  * add automatic libavfilter bridges to option parsing
+  * command: add better runtime filter toggling method
+  * command: add demux-start-time property
+  * command: add property notifications for hwdec properties (#4289)
+  * input: add "async" flag
+  * osc: add user_opts.boxmaxchars for box layout title limit
+  * player: add --keep-open-pause=no option
+  * va_vavpp: reversal-bug=no
+  * vo_opengl: --opengl-es=force2
+  * vo_opengl: add --opengl-shader-cache-dir option for caching 
+    shaders on disk (mostly for ANGLE)
+  * vo_opengl: angle: add --angle-flip to set the ANGLE present model
+  Changed options and features:
+  * command: update sub-fps etc. options on runtime changes
+  * vo_opengl: prefer X11 backends over Wayland backends
+  * options: change --audio-file-auto default to not to load any 
+    files
+  Deprecated options and features:
+  * audio: deprecate most non-lavfi audio filters
+    (channels, equalizer, pan, volume)
+  * video: deprecate almost all non-lavfi video filters
+    (buffer, crop, dlopen, dsize, eq, expand, flip, gradfun, mirror, 
+    noformat, pullup, rotate, scale, stereo3d, sub, yadif)
+  * options: deprecate --loop semantics (planned alias to 
+    --loop-file)
+  Fixes and minor enhancements:
+  * ao_alsa: close lost audio devices (#4189)
+  * ao_alsa: filter fewer devices
+  * ao_alsa: fix an error check (#4188)
+  * ao_jack: update latency on buffer_size/graph change
+  * ao_wasapi: do not pass nonsense to drivers with double precision 
+    formats
+  * ass_mp: reallocate cached subtitle image data on format changes 
+    (#4325)
+  * build: decouple dvdnav check from dvdread (#4290)
+  * build: encode_lavc: fix build failure after libavcodec major bump
+  * build: fix build with HAVE_GL==0
+  * build: replace android-gl check with a standard GLES3 check
+  * build: update bundled waf to 1.9.8
+  * build: vd_lavc: fix potential build failure with vaapi
+  * demux_lavf: disable half-working mp4 edit list support in 
+    libavcodec
+  * demux_lavf: skip avformat_find_stream_info() for some formats 
+    (hls, mp4, mkv by default)
+  * etc/encoding_profiles.conf: update and remove deprecated stuff
+  * etc/mpv.conf: remove deprecated options
+  * external_files: actually try to autoload from fallback paths
+  * external_files: enable autoloading with URLs (#3264)
+  * image_writer: make it work with libavcodec's jpg encoder
+  * osc: bottom/topbar: add fullscreen button
+  * osc: bottom/topbar: don't clip title vertically
+  * osc: bottom/topbar: increase timecodes width a bit (#3952)
+  * osc: fix PlayResX undefined warning when aspect is 0
+  * osc: fix window dragging with showwindowed=no (#1819)
+  * osc: make title configurable and use property expansion on it 
+    (#4221)
+  * osc: refactor osc message scaling (#4081, #4083, #4102)
+  * player: don't block playback stop when seeking
+  * player: enable "buffering" pausing for DASH streams too
+  * player: fix core-idle and eof-reached update notifcations
+  * player: make screenshot commands honor the async flag (#4250)
+  * player: reduce blocking on VO when switching pause (#4152)
+  * sd_ass: disable --sub-fix-timing if sub style override is fully 
+    disabled
+  * stream/stream_dvdnav: don't ignore setting title (#4283)
+  * stream_dvd: fix subs/audio detection on DVDs containing 
+    multi-PGC titles
+  * vf_vavpp: add advanced deint bug compatibility for Intel vaapi 
+    drivers
+  * vf_vavpp: fix first-field mode
+  * vo_opengl: fix crash with temporal dithering in dumb mode
+  * vo_opengl: hwdec_d3d11egl: make it work with some ANGLE DLL 
+    versions
+  * vo_x11: reduce flickering on playlist navigation
+  * wayland: correctly map mouse buttons
+
+-------------------------------------------------------------------
+Wed Apr 19 11:48:00 UTC 2017 - tchvatal@suse.com
+
+- Use localy present waf to adhere upstream requirements
+
+-------------------------------------------------------------------
+Sat Apr 15 19:11:46 UTC 2017 - tchvatal@suse.com
+
+- Enable luajit on aarch64 and update bit the conditional for wayland
+
+-------------------------------------------------------------------
+Fri Apr 14 13:25:27 UTC 2017 - aloisio@gmx.com
+
+- Update mpv-bash-completion to 3.3.13
+  * Dynamic completion for --drm-connector based on currently
+    connected displays
+  * Fixes for options audio-demuxer, audio-spdif, cscale-window,
+    demuxer, dscale, dscale-window, opengl-hwdec-interop,
+    scale-window, sub-demuxer
+
 -------------------------------------------------------------------
 Fri Apr  7 18:24:27 UTC 2017 - aloisio@gmx.com

--- a/mpv.spec
+++ b/mpv.spec
@ -19,8 +19,9 @@
 #


-%define _mbc_ver 3.3.12
-%define _mpv_ver 0.24.0
+%define _waf_ver 1.9.9
+%define _mbc_ver 3.3.13
+%define _mpv_ver 0.25.0
 %define lname   libmpv1
 Name:           mpv
 Version:        %{_mpv_ver}
@ -30,6 +31,7 @@ License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://mpv.io/
 Source:         http://github.com/mpv-player/%{name}/archive/v%{_mpv_ver}.tar.gz#/%{name}-%{_mpv_ver}.tar.gz
+Source1:        https://waf.io/waf-%{_waf_ver}
 Source2:        %{name}.changes
 # mpv-bash-completion is licensed with GPL-3.0+
 Source3:        https://github.com/2ion/mpv-bash-completion/archive/%{_mbc_ver}.tar.gz#/mpv-bash-completion-%{_mbc_ver}.tar.gz
@ -46,12 +48,11 @@ BuildRequires:  lua
 BuildRequires:  ncurses-devel
 BuildRequires:  perl
 BuildRequires:  pkgconfig
-BuildRequires:  python-docutils
+BuildRequires:  python3-docutils
 BuildRequires:  update-desktop-files
-BuildRequires:  waf
 BuildRequires:  yasm
 BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(caca)
+BuildRequires:  pkgconfig(caca) >= 0.99.beta18
 BuildRequires:  pkgconfig(dri)
 BuildRequires:  pkgconfig(dvdnav) >= 4.2.0
 BuildRequires:  pkgconfig(dvdread) >= 4.1.0
@ -77,17 +78,15 @@ BuildRequires:  pkgconfig(libswresample) >= 2.3.100
 BuildRequires:  pkgconfig(libswscale) >= 4.2.100
 BuildRequires:  pkgconfig(libudf)
 BuildRequires:  pkgconfig(libv4l2)
-BuildRequires:  pkgconfig(libva)
-BuildRequires:  pkgconfig(libva-x11)
+BuildRequires:  pkgconfig(libva) >= 0.36.0
+BuildRequires:  pkgconfig(libva-x11) >= 0.36.0
 BuildRequires:  pkgconfig(lua)
-BuildRequires:  pkgconfig(openal) >= 1.13
-BuildRequires:  pkgconfig(portaudio-2.0)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(vdpau)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xinerama)
-BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xext) >= 1.0.0
+BuildRequires:  pkgconfig(xinerama) >= 1.0.0
+BuildRequires:  pkgconfig(xrandr) >= 1.2.0
 BuildRequires:  pkgconfig(xscrnsaver)
 BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(xxf86vm)
@ -103,15 +102,13 @@ Recommends:     youtube-dl
 Provides:       mplayer2 = 20140101
 Obsoletes:      mplayer2 < 20140101
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# PDF manual.
 # JIT for lua.
 %if 0%{?suse_version} > 1320
-BuildRequires:  python-rst2pdf
-%ifarch %{ix86} x86_64
+%ifarch aarch64 %{ix86} x86_64
 BuildRequires:  pkgconfig(luajit)
 %endif
 %endif
-%if 0%{?suse_version} != 1315
+%if 0%{?suse_version} >= 1315
 # Testing framework: disabled for now as it runs just 1 test
 # BuildRequires:  pkgconfig(cmocka) >= 0.4.1
 # Wayland and libguess.
@ -119,7 +116,7 @@ BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(libguess)
 BuildRequires:  pkgconfig(wayland-client) >= 1.6.0
 BuildRequires:  pkgconfig(wayland-cursor) >= 1.6.0
-BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-egl) >= 9.0.0
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.3.0
@ -193,6 +190,10 @@ features.
 %setup -q -a 3 -n %{name}-%{_mpv_ver}
 %patch0 -p1

+# As we downloaded specific waf version we need to put and prepare it in place.
+cp -f %{SOURCE1} waf
+chmod a+x waf
+
 # I hate UNKNOWN so lets put decent info there.
 MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")"
 DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")"
@ -206,25 +207,21 @@ myopts+=" --disable-build-date"
 # Debug just adds -g and we do that over optflags anyway.
 myopts+=" --disable-debug"
 export CCFLAGS="%{optflags}"
-waf configure \
+./waf configure \
  --prefix="%{_prefix}"              \
  --bindir="%{_bindir}"              \
  --mandir="%{_mandir}"              \
  --libdir="%{_libdir}"              \
  --docdir="%{_docdir}/%{name}"      \
  --confdir="%{_sysconfdir}/%{name}" \
-  --enable-openal                    \
  --enable-cdda                      \
  --enable-libmpv-shared             \
  --enable-zsh-comp                  \
  --enable-manpage-build             \
  --enable-libarchive                \
-%if 0%{?suse_version} > 1320
-  --enable-pdf-build                 \
-%endif
  ${myopts}

-waf build --verbose %{?_smp_mflags}
+./waf build --verbose %{?_smp_mflags}

 pushd mpv-bash-completion-%{_mbc_ver}
 export MPV_BASHCOMPGEN_MPV_CMD=../build/mpv
@ -232,7 +229,7 @@ make %{?_smp_mflags}
 popd

 %install
-waf --destdir=%{buildroot} install
+./waf --destdir=%{buildroot} install

 pushd mpv-bash-completion-%{_mbc_ver}
 %make_install
@ -254,9 +251,6 @@ install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf

 %files
 %defattr(-,root,root)
-%if 0%{?suse_version} > 1320
-%doc build/DOCS/man/mpv.pdf
-%endif
 %doc Copyright LICENSE README.md RELEASE_NOTES
 %doc %{_defaultdocdir}/%{name}/input.conf
 %doc %{_defaultdocdir}/%{name}/mplayer-input.conf
--- a/waf-1.9.9
+++ b/waf-1.9.9
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32fa8b9468c87ee900def85fb41da8bdf50e68001e266d8edafae747fd15d459
+size 100910