Accepting request 355373 from multimedia:apps

- Drop the --enable-gpl3 options and revert the license to GPL-2.0+ 

- Backported commit 5053f4c to fix hang problem with smplayer
  (bug ref. #2729) mpv-0.15.0_fix_NULL_ptr.patch

- Update to v0.15.0
  * Please see https://github.com/mpv-player/mpv/releases/tag/v0.15.0
    for the complete changelog.
- Install mpv.conf & input.conf

- Set license to GPL-3.0+ so we can enable more OpenGL functionality.
- Add pkgconfig(gl) build dependency.

OBS-URL: https://build.opensuse.org/request/show/355373
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpv?expand=0&rev=10

mpv-0.14.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233
-size 2872619

mpv-0.15.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc
+size 2849513

mpv-0.15.0_fix_NULL_ptr.patch

@@ -0,0 +1,13 @@
+Index: mpv-0.15.0/player/command.c
+===================================================================
+--- mpv-0.15.0.orig/player/command.c
++++ mpv-0.15.0/player/command.c
+@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void
+ {
+     MPContext *mpctx = ctx;
+     struct track *track = mpctx->current_track[0][STREAM_VIDEO];
+-    const char *c = track->d_video ? track->d_video->decoder_desc : NULL;
++    const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL;
+     return m_property_strdup_ro(action, arg, c);
+ }
+ 

mpv.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Jan 22 12:51:43 UTC 2016 - idonmez@suse.com
+
+- Drop the --enable-gpl3 options and revert the license to GPL-2.0+ 
+
+-------------------------------------------------------------------
+Wed Jan 20 20:07:35 UTC 2016 - aloisio@gmx.com
+
+- Backported commit 5053f4c to fix hang problem with smplayer
+  (bug ref. #2729) mpv-0.15.0_fix_NULL_ptr.patch
+
+-------------------------------------------------------------------
+Mon Jan 18 19:52:34 UTC 2016 - idonmez@suse.com
+
+- Update to v0.15.0
+  * Please see https://github.com/mpv-player/mpv/releases/tag/v0.15.0
+    for the complete changelog.
+- Install mpv.conf & input.conf
+
+-------------------------------------------------------------------
+Sun Jan 10 08:09:14 UTC 2016 - idonmez@suse.com
+
+- Set license to GPL-3.0+ so we can enable more OpenGL functionality.
+- Add pkgconfig(gl) build dependency.
+
 -------------------------------------------------------------------
 Thu Dec 24 12:46:33 UTC 2015 - tchvatal@suse.com
 

mpv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mpv
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2015 Packman Team <packman@links2linux.de>
 # Copyright (c) 2012 Jiri Slaby <jslaby@suse.de>
 # Copyright (c) 2011-2012 Pascal Bleser <pascal.bleser@opensuse.org>
@@ -22,7 +22,7 @@
 %define _waf_ver 1.8.12
 %define lname   libmpv1
 Name:           mpv
-Version:        0.14.0
+Version:        0.15.0
 Release:        0
 Summary:        Advanced general-purpose multimedia player
 License:        GPL-2.0+ and BSD-3-Clause
@@ -34,6 +34,7 @@ Source:         http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#
 Source1:        http://ftp.waf.io/pub/release/waf-%{_waf_ver}
 Source2:        %{name}.changes
 Source3:        %{name}.png
+Patch0:         %{name}-0.15.0_fix_NULL_ptr.patch
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  ladspa-devel
 BuildRequires:  libjpeg-devel
@@ -53,6 +54,7 @@ BuildRequires:  pkgconfig(dri)
 BuildRequires:  pkgconfig(dvdnav) >= 4.2.0
 BuildRequires:  pkgconfig(dvdread) >= 4.1.0
 BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(lcms2) >= 2.6
 BuildRequires:  pkgconfig(libass) >= 0.12.1
@@ -144,6 +146,7 @@ features.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # As we downloaded specific waf version we need to put and prepare it in place.
 cp -f %{SOURCE1} waf
@@ -185,6 +188,8 @@ export CCFLAGS="%{optflags}"
 ./waf --destdir=%{buildroot} install
 
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+install -D -m 0644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf
+install -D -m 0644 etc/mpv.conf %{buildroot}%{_sysconfdir}/%{name}/mpv.conf
 
 %post
 %desktop_database_post
@@ -203,9 +208,11 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
 %if 0%{?suse_version} > 1315
 %doc build/DOCS/man/mpv.pdf
 %endif
-%doc Copyright LICENSE README.md RELEASE_NOTES etc/example.conf etc/input.conf
+%doc Copyright LICENSE README.md RELEASE_NOTES
 %dir %{_sysconfdir}/%{name}/
 %config %{_sysconfdir}/%{name}/encoding-profiles.conf
+%config %{_sysconfdir}/%{name}/input.conf
+%config %{_sysconfdir}/%{name}/mpv.conf
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*