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

@@ -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
 

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}"              \