From c28429924fde6e4ca2b03745528401caf0f4be3d1e0c38be04e3ca2fa0fc7c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 11 Dec 2015 11:09:34 +0000 Subject: [PATCH 1/3] - Sort out the ffmpeg deps to reduce conditionals OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=24 --- mpv.changes | 5 +++++ mpv.spec | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/mpv.changes b/mpv.changes index 20e2ebb..9327b01 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 11 11:09:13 UTC 2015 - tchvatal@suse.com + +- Sort out the ffmpeg deps to reduce conditionals + ------------------------------------------------------------------- Thu Dec 3 21:04:26 UTC 2015 - dmueller@suse.com diff --git a/mpv.spec b/mpv.spec index 69941b1..de610c8 100644 --- a/mpv.spec +++ b/mpv.spec @@ -56,6 +56,11 @@ BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(lcms2) >= 2.6 BuildRequires: pkgconfig(libass) >= 0.12.1 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) >= 55.0.0 +BuildRequires: pkgconfig(libavfilter) >= 5.0.0 +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbluray) >= 0.3.0 BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libcdio) @@ -63,6 +68,7 @@ BuildRequires: pkgconfig(libcdio_cdda) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libiso9660) BuildRequires: pkgconfig(libpulse) >= 1.0 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libudf) BuildRequires: pkgconfig(libv4l2) @@ -84,21 +90,7 @@ BuildRequires: pkgconfig(zlib) Recommends: youtube-dl BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?BUILD_ORIG} -# ffmpeg pkgconfig not possible on factory due to missing preffer in prjconfigs -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavdevice) >= 55.0.0 -BuildRequires: pkgconfig(libavfilter) >= 5.0.0 -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libmpg123) -BuildRequires: pkgconfig(libswresample) >= 1.1.100 -%else -BuildRequires: libavcodec-devel -BuildRequires: libavdevice-devel -BuildRequires: libavfilter-devel -BuildRequires: libavformat-devel -BuildRequires: libavutil-devel -BuildRequires: libswscale-devel %endif # PDF manual. # JIT for lua. @@ -192,7 +184,7 @@ export CCFLAGS="%{optflags}" %install ./waf --destdir=%{buildroot} install -install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png +install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png %post %desktop_database_post From fee6c9a66693423c27a81e76c9cfee025c3783d4ed1b82217bb2573517a6522c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 11 Dec 2015 11:15:13 +0000 Subject: [PATCH 2/3] - Remove mpg123 as dependency, thus losing need of being on packman. We use the mad implementation anyway if we had FPU and everything we support has to have it anyway. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=25 --- mpv.changes | 7 +++++++ mpv.spec | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mpv.changes b/mpv.changes index 9327b01..90a096d 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 11 11:14:24 UTC 2015 - tchvatal@suse.com + +- Remove mpg123 as dependency, thus losing need of being on packman. + We use the mad implementation anyway if we had FPU and everything + we support has to have it anyway. + ------------------------------------------------------------------- Fri Dec 11 11:09:13 UTC 2015 - tchvatal@suse.com diff --git a/mpv.spec b/mpv.spec index de610c8..8d44ea7 100644 --- a/mpv.spec +++ b/mpv.spec @@ -89,9 +89,6 @@ BuildRequires: pkgconfig(zlib) # Used via LUA scripts Recommends: youtube-dl BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?BUILD_ORIG} -BuildRequires: pkgconfig(libmpg123) -%endif # PDF manual. # JIT for lua. %if 0%{?suse_version} > 1310 From 6197f081b9f9c6858f0145652653f2e385af2b611821d82b81b85a5b438a106e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 14 Dec 2015 09:20:46 +0000 Subject: [PATCH 3/3] - Update to v0.14.0 * Please see https://github.com/mpv-player/mpv/releases/tag/v0.14.0 for the complete changelog. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=26 --- mpv-0.13.0.tar.gz | 3 --- mpv-0.14.0.tar.gz | 3 +++ mpv.changes | 7 +++++++ mpv.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 mpv-0.13.0.tar.gz create mode 100644 mpv-0.14.0.tar.gz diff --git a/mpv-0.13.0.tar.gz b/mpv-0.13.0.tar.gz deleted file mode 100644 index 563c1f9..0000000 --- a/mpv-0.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1372704fd8f5701ef7d60f347fd15fe536e23ef148279bf4a4415e72896912db -size 2874190 diff --git a/mpv-0.14.0.tar.gz b/mpv-0.14.0.tar.gz new file mode 100644 index 0000000..89b887a --- /dev/null +++ b/mpv-0.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 +size 2872619 diff --git a/mpv.changes b/mpv.changes index 90a096d..00ab2e6 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 14 09:10:24 UTC 2015 - idonmez@suse.com + +- Update to v0.14.0 + * Please see https://github.com/mpv-player/mpv/releases/tag/v0.14.0 + for the complete changelog. + ------------------------------------------------------------------- Fri Dec 11 11:14:24 UTC 2015 - tchvatal@suse.com diff --git a/mpv.spec b/mpv.spec index 8d44ea7..6a02a27 100644 --- a/mpv.spec +++ b/mpv.spec @@ -22,7 +22,7 @@ %define _waf_ver 1.8.12 %define lname libmpv1 Name: mpv -Version: 0.13.0 +Version: 0.14.0 Release: 0 Summary: Advanced general-purpose multimedia player License: GPL-2.0+ and BSD-3-Clause @@ -205,7 +205,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps %config %{_sysconfdir}/%{name}/encoding-profiles.conf %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.* #zsh completion %{_datadir}/zsh/site-functions/_mpv %{_mandir}/man?/%{name}.?%{?ext_man}