From 57f3f23d5d94eab48934945ffc658521317f3a4f9a481dbd9f925eb52e550150 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 27 Jun 2016 08:26:37 +0000 Subject: [PATCH 1/5] Accepting request 404890 from home:X0F:branches:multimedia Reverting previous GPL3 change due to upstream's replacement of GPL3-licensed prescaling with generic shader processing. Instead, https://github.com/bjin/mpv-prescalers/tree/master shaders should be packaged. It's not yet clear, however, what upstream would do on the next release regarding "prescaling" (high-quality high-demand power-of-two scaling algorithms) since the new code is not feature-complete to be actually able to replace the old one. OBS-URL: https://build.opensuse.org/request/show/404890 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=47 --- mpv.changes | 6 ++++++ mpv.spec | 13 +------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mpv.changes b/mpv.changes index 6f98ff8..1cf753a 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 26 22:05:13 UTC 2016 - virtuousfox@gmail.com + +- Remove mpv_gpl3 Packman condition due to upstream's decision + to drop "prescaling" code in favour of generic shader hooks. + ------------------------------------------------------------------- Sat Jun 25 06:00:02 UTC 2016 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 682559a..5a35fef 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,20 +19,13 @@ # -%bcond_with mpv_gpl3 -%if %{with mpv_gpl3} -%define _license GPL-3.0+ and BSD-3-Clause -%else -%define _license GPL-2.0+ and BSD-3-Clause -%endif - %define _waf_ver 1.8.12 %define lname libmpv1 Name: mpv Version: 0.18.0 Release: 0 Summary: Advanced general-purpose multimedia player -License: %{_license} +License: GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Video/Players # waf is licensed with BSD-3-Clause Url: http://mpv.io/ @@ -173,10 +166,6 @@ myopts="--disable-sdl1 --disable-sdl2" myopts+=" --disable-build-date" # Debug just adds -g and we do that over optflags anyway. myopts+=" --disable-debug" -# nnedi3 feature that's hidden behind GPL3-switch activates openSUSE lawyers -%if %{with mpv_gpl3} -myopts+=" --enable-gpl3" -%endif export CCFLAGS="%{optflags}" ./waf configure \ --prefix="%{_prefix}" \ From 5de8c527259a9c3622e12909a267b02260d00f58f5784c494bfb9b4ea979004d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 10 Jul 2016 07:46:34 +0000 Subject: [PATCH 2/5] Accepting request 407558 from home:alois:branches:multimedia:apps Update to version 0.18.1 OBS-URL: https://build.opensuse.org/request/show/407558 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=48 --- mpv-0.18.0.tar.gz | 3 --- mpv-0.18.1.tar.gz | 3 +++ mpv.changes | 55 +++++++++++++++++++++++++++++++++++++++++++++++ mpv.spec | 2 +- 4 files changed, 59 insertions(+), 4 deletions(-) delete mode 100644 mpv-0.18.0.tar.gz create mode 100644 mpv-0.18.1.tar.gz diff --git a/mpv-0.18.0.tar.gz b/mpv-0.18.0.tar.gz deleted file mode 100644 index 5d8636c..0000000 --- a/mpv-0.18.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b -size 2758960 diff --git a/mpv-0.18.1.tar.gz b/mpv-0.18.1.tar.gz new file mode 100644 index 0000000..348c38e --- /dev/null +++ b/mpv-0.18.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 +size 2763392 diff --git a/mpv.changes b/mpv.changes index 1cf753a..9cc57dd 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Sun Jul 10 07:30:12 UTC 2016 - aloisio@gmx.com + +- Update to version 0.18.1 + * Note: Running mpv with different versions of the + FFmpeg/Libav libraries than it was compiled with + is no longer supported. Even supposedly ABI-compatible + versions have been a source of trouble, and it creates + far too much complexity with little to no benefit, + coupled with absurd and unusable FFmpeg API artifacts. + Instead, mpv will exit with an error when such a + situation is detected. + This simply means that mpv needs to be rebuilt whenever + FFmpeg libraries change. + New Features: + * d3d: implement screenshots for --hwdec=d3d11va + * vo_opengl: add output_size uniform to custom shader + * vo_opengl: implement the Panasonic V-Log function + (#3157) + * vo_opengl: implement ARIB STD-B68 (HLG) HDR TRC + Options and oommands: + * command: pack sub image data in overlay-add command + * options: deprecate --heartbeat-cmd + * audio: deprecate --softvol + * audio: drop --softvol=no and --softvol=auto (#3322) + Fixes and minor enhancements: + * video: fix deinterlace filter handling on pixel + format changes + * x11: silence xdg-screensaver + * vo_opengl: angle: update the swapchain on resize + (#3301) + * vo_opengl: error out gracefully when trying to use + FBOs without FBO API + * vd_lavc: expose mastering display side data reference + peak (improves results with HDR content) + * vo_opengl: generalize HDR tone mapping mechanism + (#3293) + * vo_opengl: don't constantly resize the output FBO + * vo_opengl: use ringbuffer of PBOs + * Windows: make WM_NCHITTEST simpler and more accurate + * ao_oss: do not add an entry to audio-device-list if + device file missing + * dec_audio: fix segment boudnary switching + * ao_lavc, vo_lavc: Migrate to new FFmpeg encoding API + * vo_opengl: explicitly use main framebuffer when + reading window content (#3284) + * vo_xv: fix behavior with odd sizes + * audio: insert auto-inserted filters at end of chain + * x11: add missing FocusChangeMask (disables key repeat + when losing focus while a key is down) + * ao_coreaudio: error out when selecting invalid device + * ad_lavc: work around misbehavior of some FFmpeg + decoders like wmapro (#3297) + * player: cut off status line on terminal width + ------------------------------------------------------------------- Sun Jun 26 22:05:13 UTC 2016 - virtuousfox@gmail.com diff --git a/mpv.spec b/mpv.spec index 5a35fef..1285308 100644 --- a/mpv.spec +++ b/mpv.spec @@ -22,7 +22,7 @@ %define _waf_ver 1.8.12 %define lname libmpv1 Name: mpv -Version: 0.18.0 +Version: 0.18.1 Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0+ and BSD-3-Clause From 95be747e6b4d8ac2da71356f0331f9f28275ea8ae6cb63fe25683d3ff0590e72 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 12 Jul 2016 11:39:27 +0000 Subject: [PATCH 3/5] - Force rebuilding with every minor update of ffmpeg OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=49 --- mpv.changes | 5 +++++ mpv.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/mpv.changes b/mpv.changes index 9cc57dd..d839a65 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 11:38:54 UTC 2016 - mpluskal@suse.com + +- Force rebuilding with every minor update of ffmpeg + ------------------------------------------------------------------- Sun Jul 10 07:30:12 UTC 2016 - aloisio@gmx.com diff --git a/mpv.spec b/mpv.spec index 1285308..02be804 100644 --- a/mpv.spec +++ b/mpv.spec @@ -91,6 +91,9 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) +# we need to rebuild with every new minor version of ffmpeg +# update soname once it changes +%requires_eq libavcodec56 # Used via LUA scripts Recommends: youtube-dl # Obsoletion of mplayer2 that is dead for 2 years now From a8a27f3dfb8b6cdac52d7b812985943d160acef947ad07dfa86723c3015ed932 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 12 Jul 2016 14:37:34 +0000 Subject: [PATCH 4/5] Accepting request 407900 from home:dimstar:Factory %requires_eq does not do what we need, so we just do the right thing by ourselves: the resulting rpm: rpm -q --requires -p /var/tmp/build-root/openSUSE_Factory-x86_64/home/abuild/rpmbuild/RPMS/x86_64/mpv-0.18.1-0.x86_64.rpm | grep avcod libavcodec.so.56()(64bit) libavcodec.so.56(LIBAVCODEC_56)(64bit) libavcodec56 = 2.8.6 OBS-URL: https://build.opensuse.org/request/show/407900 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=50 --- mpv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 02be804..08545d3 100644 --- a/mpv.spec +++ b/mpv.spec @@ -93,7 +93,7 @@ BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) # we need to rebuild with every new minor version of ffmpeg # update soname once it changes -%requires_eq libavcodec56 +Requires: %(rpm -qf $(readlink -f %{_libdir}/libavcodec.so) --qf "%%{name} = %%{version}") # Used via LUA scripts Recommends: youtube-dl # Obsoletion of mplayer2 that is dead for 2 years now From bd4845582ec4321e366cf4ef8e33b1281eba3144269b13c24ef3e30f86e46148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 13 Jul 2016 13:21:52 +0000 Subject: [PATCH 5/5] - Update waf to 1.9.1 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=51 --- .gitattributes | 2 +- mpv.changes | 5 +++++ mpv.spec | 4 ++-- waf-1.8.12 | 3 --- waf-1.9.1 | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 waf-1.8.12 create mode 100644 waf-1.9.1 diff --git a/.gitattributes b/.gitattributes index 2188578..2d02893 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -waf-1.8.12 filter=lfs diff=lfs merge=lfs -text +waf-1.9.1 filter=lfs diff=lfs merge=lfs -text diff --git a/mpv.changes b/mpv.changes index d839a65..ae6aaf8 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 11:45:19 UTC 2016 - tchvatal@suse.com + +- Update waf to 1.9.1 + ------------------------------------------------------------------- Tue Jul 12 11:38:54 UTC 2016 - mpluskal@suse.com diff --git a/mpv.spec b/mpv.spec index 08545d3..ddbfc90 100644 --- a/mpv.spec +++ b/mpv.spec @@ -19,7 +19,7 @@ # -%define _waf_ver 1.8.12 +%define _waf_ver 1.9.1 %define lname libmpv1 Name: mpv Version: 0.18.1 @@ -31,7 +31,7 @@ Group: Productivity/Multimedia/Video/Players Url: http://mpv.io/ Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Can't use system one as it breaks quite often with updates -Source1: http://ftp.waf.io/pub/release/waf-%{_waf_ver} +Source1: http://waf.io/waf-%{_waf_ver} Source2: %{name}.changes BuildRequires: hicolor-icon-theme Requires: hicolor-icon-theme diff --git a/waf-1.8.12 b/waf-1.8.12 deleted file mode 100644 index 0ed1d27..0000000 --- a/waf-1.8.12 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b -size 97567 diff --git a/waf-1.9.1 b/waf-1.9.1 new file mode 100644 index 0000000..9102d04 --- /dev/null +++ b/waf-1.9.1 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c71b0372a4bea1c02e2ff5e1aa52484ab9d2e81076538be2cda4e85498d7021 +size 98734