From 7a7fdda4e8e543e8900978e0da966a6470c77049 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 23 Jun 2019 12:06:10 +0100 Subject: [PATCH 01/11] Rebuild against sdk9 nv-codec-headers --- mpv.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mpv.spec b/mpv.spec index 285a4c7..77ea93b 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.29.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://%{name}.io/ @@ -105,9 +105,8 @@ Libmpv development header files and libraries. %build -CFLAGS="%{optflags}" \ -LDFLAGS="%{?__global_ldflags}" \ -waf configure \ +%set_build_flags +%{_bindir}/waf configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ @@ -127,10 +126,10 @@ waf configure \ --enable-dvbin -waf -v build %{?_smp_mflags} +%{_bindir}/waf -v build %{?_smp_mflags} %install -waf install --destdir=%{buildroot} +%{_bindir}/waf install --destdir=%{buildroot} desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}/ @@ -156,6 +155,10 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Sun Jun 23 2019 Leigh Scott - 0.29.1-6 +- Rebuild against sdk9 nv-codec-headers +- Spec file clean up + * Mon Mar 04 2019 RPM Fusion Release Engineering - 0.29.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 54c98cb25004c9f6b9c12dc8fb26c92def71dc4d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 2 Jul 2019 11:53:28 +0200 Subject: [PATCH 02/11] Implement CI/CD compatible versionning --- mpv.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mpv.spec b/mpv.spec index 77ea93b..9d3faaa 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,10 +1,15 @@ +%global commit c9e7473d67893d9248bedf63530a1e0325a3036a +%global gitdate 20190616 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global gitrelease .%{gitdate}.git%{shortcommit} + Name: mpv Version: 0.29.1 -Release: 6%{?dist} +Release: 6%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ -URL: http://%{name}.io/ -Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: http://mpv.io/ +Source0: https://github.com/mpv-player/mpv/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # set defaults for Fedora Patch0: %{name}-config.patch @@ -101,7 +106,7 @@ Requires: mpv-libs%{?_isa} = %{version}-%{release} Libmpv development header files and libraries. %prep -%autosetup -p1 +%autosetup -p1 -n mpv-%{?commit}%{?!commit:%{version}} %build From b29d96611b4cb4131d6399cd06e75b9a18dc196c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 2 Jul 2019 16:21:55 +0200 Subject: [PATCH 03/11] Obsoletes older ci/cd --- mpv.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpv.spec b/mpv.spec index 9d3faaa..06ec996 100644 --- a/mpv.spec +++ b/mpv.spec @@ -82,6 +82,10 @@ BuildRequires: raspberrypi-vc-devel } %endif +# Obsoletes older ci/cd +Obsoletes: mpv-master < %{version}-100 +Provides: mpv-master = %{version}-100 + Requires: hicolor-icon-theme Provides: mplayer-backend From 2589ad22de0743e27c2a3e7219215f19689ff90e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 2 Jul 2019 16:24:14 +0200 Subject: [PATCH 04/11] Update snapshot --- mpv.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index 06ec996..1d9eb84 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 6%{?gitrelease}%{?dist} +Release: 7%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -164,6 +164,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Jul 02 2019 Nicolas Chauvet - 0.29.1-7.20190616.gitc9e7473 +- Update to 20190616 snapshot + * Sun Jun 23 2019 Leigh Scott - 0.29.1-6 - Rebuild against sdk9 nv-codec-headers - Spec file clean up diff --git a/sources b/sources index d52d6c3..77a7d84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cd070c6aed980786177b7cb5b73664b mpv-0.29.1.tar.gz +5b07d5d34238b6cb03c1958f3c9b4de0 mpv-c9e7473.tar.gz From 24acc7cc0f76621e4ece4a77a939018addd351c0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 2 Jul 2019 16:59:14 +0200 Subject: [PATCH 05/11] Add libplacebo - fix FFmpeg DRM PRIME --- mpv.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mpv.spec b/mpv.spec index 1d9eb84..11b7eb2 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 7%{?gitrelease}%{?dist} +Release: 8%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -45,6 +45,7 @@ BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libguess) BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libplacebo) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) @@ -112,6 +113,8 @@ Libmpv development header files and libraries. %prep %autosetup -p1 -n mpv-%{?commit}%{?!commit:%{version}} +sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" wscript + %build %set_build_flags @@ -164,8 +167,10 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog -* Tue Jul 02 2019 Nicolas Chauvet - 0.29.1-7.20190616.gitc9e7473 +* Tue Jul 02 2019 Nicolas Chauvet - 0.29.1-8.20190616.gitc9e7473 - Update to 20190616 snapshot +- Add libplacebo +- Fix support for FFmpeg DRM PRIME * Sun Jun 23 2019 Leigh Scott - 0.29.1-6 - Rebuild against sdk9 nv-codec-headers From 649c4fd5370e1fe3dae1e53f92a75e5d9706e18a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 6 Aug 2019 21:44:28 +0100 Subject: [PATCH 06/11] Rebuild for new ffmpeg version --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index 11b7eb2..8f0ef8d 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 8%{?gitrelease}%{?dist} +Release: 9%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -167,6 +167,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 06 2019 Leigh Scott - 0.29.1-9.20190616.gitc9e7473 +- Rebuild for new ffmpeg version + * Tue Jul 02 2019 Nicolas Chauvet - 0.29.1-8.20190616.gitc9e7473 - Update to 20190616 snapshot - Add libplacebo From 4d89abdb9fcc1173e7d8ac06ec1204ae142c2fc7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 20 Aug 2019 09:43:11 +0100 Subject: [PATCH 07/11] Update snapshot --- mpv.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mpv.spec b/mpv.spec index 8f0ef8d..2d1b70e 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,11 +1,11 @@ -%global commit c9e7473d67893d9248bedf63530a1e0325a3036a -%global gitdate 20190616 +%global commit cd7bcb9d0c12ee4e252024235cc8bbb395960118 +%global gitdate 20190814 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitrelease .%{gitdate}.git%{shortcommit} Name: mpv Version: 0.29.1 -Release: 9%{?gitrelease}%{?dist} +Release: 10%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enca) -BuildRequires: pkgconfig(libavutil) >= 56.12.100 +BuildRequires: pkgconfig(libavutil) >= 56.27.100 BuildRequires: pkgconfig(libavcodec) >= 58.16.100 BuildRequires: pkgconfig(libavformat) >= 58.9.100 BuildRequires: pkgconfig(libswscale) >= 5.0.101 @@ -167,6 +167,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 20 2019 Leigh Scott - 0.29.1-10.20190814.gitcd7bcb9 +- Update to 20190814 snapshot + * Tue Aug 06 2019 Leigh Scott - 0.29.1-9.20190616.gitc9e7473 - Rebuild for new ffmpeg version diff --git a/sources b/sources index 77a7d84..097337f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b07d5d34238b6cb03c1958f3c9b4de0 mpv-c9e7473.tar.gz +9204ae97d1a9de40f12399fcdb26be2f mpv-cd7bcb9.tar.gz From dd24fc8fad6b832b6a3a2580c2a5918c381326b9 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 27 Aug 2019 09:42:16 +0100 Subject: [PATCH 08/11] Add changes for el8 --- mpv.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mpv.spec b/mpv.spec index 2d1b70e..ce9467a 100644 --- a/mpv.spec +++ b/mpv.spec @@ -34,8 +34,19 @@ BuildRequires: pkgconfig(libswresample) >= 3.0.100 BuildRequires: pkgconfig(ffnvcodec) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) +%if 0%{?fedora} +BuildRequires: libshaderc-devel BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(mujs) +BuildRequires: pkgconfig(uchardet) >= 0.0.5 +BuildRequires: pkgconfig(rubberband) +BuildRequires: pkgconfig(libguess) +BuildRequires: pkgconfig(vulkan) +%else +%ifarch x86_64 +BuildRequires: pkgconfig(vulkan) +%endif +%endif BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libass) @@ -43,21 +54,16 @@ BuildRequires: pkgconfig(libbluray) BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libguess) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libplacebo) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(lua-5.1) +BuildRequires: pkgconfig(lua) >= 5.3.0 BuildRequires: pkgconfig(sdl2) -BuildRequires: pkgconfig(rubberband) -BuildRequires: libshaderc-devel BuildRequires: pkgconfig(smbclient) -BuildRequires: pkgconfig(uchardet) >= 0.0.5 BuildRequires: pkgconfig(vdpau) -BuildRequires: pkgconfig(vulkan) BuildRequires: waf BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) From f10dcb90fa7b1836d810e6f489b142e7a655c951 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 27 Aug 2019 10:21:24 +0100 Subject: [PATCH 09/11] Add pkgconfig(luajit) --- mpv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mpv.spec b/mpv.spec index ce9467a..a957d28 100644 --- a/mpv.spec +++ b/mpv.spec @@ -61,6 +61,7 @@ BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(lua) >= 5.3.0 +BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(vdpau) From 738e2ff45b19402b829f8f25910a6ab539906724 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 27 Aug 2019 10:22:37 +0100 Subject: [PATCH 10/11] Rebuild for switch to lua --- mpv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index a957d28..fe5bd01 100644 --- a/mpv.spec +++ b/mpv.spec @@ -5,7 +5,7 @@ Name: mpv Version: 0.29.1 -Release: 10%{?gitrelease}%{?dist} +Release: 11%{?gitrelease}%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -174,6 +174,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 27 2019 Leigh Scott - 0.29.1-11.20190814.gitcd7bcb9 +- Rebuild for switch to lua + * Tue Aug 20 2019 Leigh Scott - 0.29.1-10.20190814.gitcd7bcb9 - Update to 20190814 snapshot From fc50a972f38ff89b03d6fca57e9b2f87d36c6466 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 27 Aug 2019 10:30:59 +0100 Subject: [PATCH 11/11] remove unused lua br --- mpv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mpv.spec b/mpv.spec index fe5bd01..4a51312 100644 --- a/mpv.spec +++ b/mpv.spec @@ -60,7 +60,6 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libquvi-0.9) BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(lua) >= 5.3.0 BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(smbclient)