From 40640d6193b1bd2596d2990e9d9102df643e602887408edbc2b7a98acbda4469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 10 Jan 2016 08:11:14 +0000 Subject: [PATCH 1/5] - Set license to GPL-3.0+ so we can enable more OpenGL functionality. - Add pkgconfig(gl) build dependency. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=30 --- mpv.changes | 6 ++++++ mpv.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mpv.changes b/mpv.changes index 53b1d81..67e4426 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/mpv.spec b/mpv.spec index 11def28..73fb6f5 100644 --- a/mpv.spec +++ b/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 # Copyright (c) 2012 Jiri Slaby # Copyright (c) 2011-2012 Pascal Bleser @@ -25,7 +25,7 @@ Name: mpv Version: 0.14.0 Release: 0 Summary: Advanced general-purpose multimedia player -License: GPL-2.0+ and BSD-3-Clause +License: GPL-3.0+ and BSD-3-Clause Group: Productivity/Multimedia/Video/Players # waf is licensed with BSD-3-Clause Url: http://mpv.io/ @@ -53,6 +53,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 @@ -169,6 +170,7 @@ export CCFLAGS="%{optflags}" --libdir="%{_libdir}" \ --docdir="%{_docdir}/%{name}" \ --confdir="%{_sysconfdir}/%{name}" \ + --enable-gpl3 \ --enable-openal \ --enable-cdda \ --enable-libmpv-shared \ From 7dce2929fb20e8135511fdbbc4c0db609ca3a5b11a81e44691859cccb4216520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 18 Jan 2016 20:02:46 +0000 Subject: [PATCH 2/5] - 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 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=31 --- mpv-0.14.0.tar.gz | 3 --- mpv-0.15.0.tar.gz | 3 +++ mpv.changes | 8 ++++++++ mpv.spec | 8 ++++++-- 4 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 mpv-0.14.0.tar.gz create mode 100644 mpv-0.15.0.tar.gz diff --git a/mpv-0.14.0.tar.gz b/mpv-0.14.0.tar.gz deleted file mode 100644 index 89b887a..0000000 --- a/mpv-0.14.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 -size 2872619 diff --git a/mpv-0.15.0.tar.gz b/mpv-0.15.0.tar.gz new file mode 100644 index 0000000..576b32f --- /dev/null +++ b/mpv-0.15.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc +size 2849513 diff --git a/mpv.changes b/mpv.changes index 67e4426..971d046 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/mpv.spec b/mpv.spec index 73fb6f5..ed9ae31 100644 --- a/mpv.spec +++ b/mpv.spec @@ -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-3.0+ and BSD-3-Clause @@ -187,6 +187,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 @@ -205,9 +207,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}.* From 6b8ab24a8b960432f5639f739f020a7d570173f42f9e1a5672e6466972de87a9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 20 Jan 2016 21:33:40 +0000 Subject: [PATCH 3/5] Accepting request 355075 from home:alois:branches:multimedia:apps Backported patch to fix problem with smplayer. OBS-URL: https://build.opensuse.org/request/show/355075 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=32 --- mpv-0.15.0_fix_NULL_ptr.patch | 13 +++++++++++++ mpv.changes | 6 ++++++ mpv.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 mpv-0.15.0_fix_NULL_ptr.patch diff --git a/mpv-0.15.0_fix_NULL_ptr.patch b/mpv-0.15.0_fix_NULL_ptr.patch new file mode 100644 index 0000000..7a05580 --- /dev/null +++ b/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); + } + diff --git a/mpv.changes b/mpv.changes index 971d046..aa63442 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 20 20:07:35 UTC 2016 - aloisio@gmx.com + +- Backported commit 5053f4c to fix hang problem with smplayer + (bug ref. #2729) + ------------------------------------------------------------------- Mon Jan 18 19:52:34 UTC 2016 - idonmez@suse.com diff --git a/mpv.spec b/mpv.spec index ed9ae31..c4c4450 100644 --- a/mpv.spec +++ b/mpv.spec @@ -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 @@ -145,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 From 949d48b4f47c7744129964de58d5bb068fc5eb389b924338c2188437314506fa Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 21 Jan 2016 09:12:15 +0000 Subject: [PATCH 4/5] (bug ref. #2729) mpv-0.15.0_fix_NULL_ptr.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=33 --- mpv.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpv.changes b/mpv.changes index aa63442..a4e00af 100644 --- a/mpv.changes +++ b/mpv.changes @@ -2,7 +2,7 @@ Wed Jan 20 20:07:35 UTC 2016 - aloisio@gmx.com - Backported commit 5053f4c to fix hang problem with smplayer - (bug ref. #2729) + (bug ref. #2729) mpv-0.15.0_fix_NULL_ptr.patch ------------------------------------------------------------------- Mon Jan 18 19:52:34 UTC 2016 - idonmez@suse.com From 8e429f4b7cb3f2fde781cfe4a76db1622c6b7d534f24b4cbe237f888e5190eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 22 Jan 2016 12:52:00 +0000 Subject: [PATCH 5/5] - Drop the --enable-gpl3 options and revert the license to GPL-2.0+ OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=34 --- mpv.changes | 5 +++++ mpv.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mpv.changes b/mpv.changes index a4e00af..3670fd4 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/mpv.spec b/mpv.spec index c4c4450..7f866f9 100644 --- a/mpv.spec +++ b/mpv.spec @@ -25,7 +25,7 @@ Name: mpv Version: 0.15.0 Release: 0 Summary: Advanced general-purpose multimedia player -License: GPL-3.0+ and BSD-3-Clause +License: GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Video/Players # waf is licensed with BSD-3-Clause Url: http://mpv.io/ @@ -172,7 +172,6 @@ export CCFLAGS="%{optflags}" --libdir="%{_libdir}" \ --docdir="%{_docdir}/%{name}" \ --confdir="%{_sysconfdir}/%{name}" \ - --enable-gpl3 \ --enable-openal \ --enable-cdda \ --enable-libmpv-shared \