From 996f8a0cc20d4ba46f8745583fe75d125d0fabf4ff9f62367c5dffc9187ac872 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 15 May 2015 09:20:00 +0000 Subject: [PATCH] Accepting request 307251 from home:scarabeus_iv:branches:multimedia:apps - Sync with packman spec-file - Update to 0.9.1 OBS-URL: https://build.opensuse.org/request/show/307251 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=7 --- .gitattributes | 2 + v0.9.1.tar.gz => mpv-0.9.1.tar.gz | 0 mpv.changes | 8 +- mpv.spec | 186 ++++++++++++++++++------------ waf-1.8.9 | 3 + 5 files changed, 123 insertions(+), 76 deletions(-) rename v0.9.1.tar.gz => mpv-0.9.1.tar.gz (100%) create mode 100644 waf-1.8.9 diff --git a/.gitattributes b/.gitattributes index 9b03811..5905ad0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +waf-1.8.9 filter=lfs diff=lfs merge=lfs -text diff --git a/v0.9.1.tar.gz b/mpv-0.9.1.tar.gz similarity index 100% rename from v0.9.1.tar.gz rename to mpv-0.9.1.tar.gz diff --git a/mpv.changes b/mpv.changes index 79cdf92..8a905bb 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Fri May 15 08:19:20 UTC 2015 - tchvatal@suse.com + +- Sync with packman spec-file + ------------------------------------------------------------------- Wed May 6 12:49:29 UTC 2015 - mpluskal@suse.com -- Update to 0.9.2 +- Update to 0.9.1 * mpv's IRC channel moved from #mpv-player to #mpv on chat.freenode.net. * Documentation updates. * The default value for the --ytdl-format option is now best, in order to work around youtube-dl's 2015.04.26 release enabling DASH by default, as FFmpeg / Libav do not yet properly support DASH. @@ -34,6 +39,7 @@ Wed May 6 12:49:29 UTC 2015 - mpluskal@suse.com * Options that have multiple options and also include a "yes" option now default to that if specified with no arguments. * The default value of --cache-default is now 150000 (153.6 MB, ~146 MiB). * JPEG screenshots now use the same subsampling as the source video. The images are still RGB regardless of source format though. + ------------------------------------------------------------------- Thu Apr 23 11:27:19 UTC 2015 - mpluskal@suse.com diff --git a/mpv.spec b/mpv.spec index 7eee1b8..e0ea3f6 100644 --- a/mpv.spec +++ b/mpv.spec @@ -2,6 +2,7 @@ # spec file for package mpv # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 Packman Team # Copyright (c) 2012 Jiri Slaby # Copyright (c) 2011-2012 Pascal Bleser # @@ -18,73 +19,68 @@ # -%define libname libmpv1 +%define _waf_ver 1.8.9 +%define lname libmpv1 Name: mpv Version: 0.9.1 Release: 0 -Summary: Advanced General Purpose Video Player -License: GPL-2.0+ +Summary: Advanced general-purpose multimedia player +License: GPL-2.0+ and BSD-3-Clause Group: Productivity/Multimedia/Video/Players +# waf is licensed with BSD-3-Clause Url: http://mpv.io/ -Source0: https://github.com/mpv-player/mpv/archive/v%{version}.tar.gz -Source1: %{name}.changes +Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Can't use system one as it breaks quite often with updates +Source1: http://ftp.waf.io/pub/release/waf-%{_waf_ver} +Source2: %{name}.changes BuildRequires: hicolor-icon-theme BuildRequires: ladspa-devel -BuildRequires: libavcodec-libav-devel -BuildRequires: libavdevice-libav-devel -BuildRequires: libavfilter-libav-devel -BuildRequires: libavformat-libav-devel -BuildRequires: libavutil-libav-devel +BuildRequires: libavcodec-devel +BuildRequires: libavdevice-devel +BuildRequires: libavfilter-devel +BuildRequires: libavformat-devel +BuildRequires: libavutil-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel -BuildRequires: libswscale-libav-devel -BuildRequires: libv4l-devel +BuildRequires: libswscale-devel BuildRequires: linux-kernel-headers BuildRequires: lirc-devel -BuildRequires: lua-devel -BuildRequires: luajit-devel BuildRequires: ncurses-devel +BuildRequires: perl BuildRequires: pkg-config -BuildRequires: pulseaudio-devel BuildRequires: python-docutils -BuildRequires: python-rst2pdf BuildRequires: python3 BuildRequires: update-desktop-files -BuildRequires: waf BuildRequires: yasm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(caca) BuildRequires: pkgconfig(dri) -BuildRequires: pkgconfig(dvdnav) -BuildRequires: pkgconfig(dvdread) -BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(dvdnav) >= 4.2.0 +BuildRequires: pkgconfig(dvdread) >= 4.1.0 BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(jack) -BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libass) -BuildRequires: pkgconfig(libavresample) -BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(lcms2) >= 2.6 +BuildRequires: pkgconfig(libass) >= 0.12.1 +BuildRequires: pkgconfig(libbluray) >= 0.3.0 BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_cdda) BuildRequires: pkgconfig(libcdio_paranoia) -BuildRequires: pkgconfig(libguess) BuildRequires: pkgconfig(libiso9660) +BuildRequires: pkgconfig(libpulse) >= 1.0 +BuildRequires: pkgconfig(libswresample) +BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libudf) +BuildRequires: pkgconfig(libv4l2) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva-x11) -BuildRequires: pkgconfig(openal) +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(openal) >= 1.13 BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(vdpau) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xinerama) -BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) @@ -93,27 +89,51 @@ 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 +BuildRequires: python-rst2pdf +BuildRequires: pkgconfig(luajit) +%endif +%if 0%{?suse_version} != 1315 +# Testing framework: disabled for now as it runs just 1 test +# BuildRequires: pkgconfig(cmocka) >= 0.4.1 +# Wayland and libguess. +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(libguess) +%if 0%{?suse_version} > 1310 +BuildRequires: pkgconfig(wayland-client) >= 1.6.0 +BuildRequires: pkgconfig(wayland-cursor) >= 1.6.0 +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 +%endif +%endif %description mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. -%package devel +%package devel Summary: A library to link together with mpv player Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Requires: %{lname} = %{version} -%description devel +%description devel mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. This package contains all the development files. -%package -n %{libname} +%package -n %{lname} Summary: A library to link together with mpv player Group: System/Libraries -%description -n %{libname} +%description -n %{lname} mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types. @@ -123,34 +143,44 @@ features. %prep %setup -q -# I hate UNKNOWN so lets put decent info there -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE1}")" -DATE="$(date -d "${modified}" "+%%b %%e %%Y")" -sed -i \ - -e "s:UNKNOWN:${DATE}:g" \ - common/version.c +# As we downloaded specific waf version we need to put and prepare it in place. +cp -f %{SOURCE1} waf +chmod a+x waf + +# I hate UNKNOWN so lets put decent info there. +MODIFIED="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE2}")" +DATE="$(date -d "$MODIFIED" "+%%b %%e %%Y")" +sed -i "s|UNKNOWN|$DATE|g;s|VERSION|\"%{version}\"|g" common/version.c %build -CCFLAGS="%{optflags}" \ -waf configure \ - --prefix="%{_prefix}" \ - --bindir="%{_bindir}" \ - --mandir="%{_mandir}" \ - --libdir="%{_libdir}" \ - --docdir="%{_docdir}/%{name}" \ - --confdir="%{_sysconfdir}/%{name}" \ - --enable-openal \ - --enable-cdda \ - --enable-libmpv-shared \ - --disable-sdl1 \ - --disable-sdl2 \ - --disable-build-date \ - --disable-debug +# SDL: disable as it is pointless to have on Linux, it is Windows/OS X fallback. +myopts="--disable-sdl1 --disable-sdl2" +# We don't want to rebuild all the time. +myopts+=" --disable-build-date" +# Debug just adds -g and we do that over optflags anyway. +myopts+=" --disable-debug" +export CCFLAGS="%{optflags}" +./waf configure \ + --prefix="%{_prefix}" \ + --bindir="%{_bindir}" \ + --mandir="%{_mandir}" \ + --libdir="%{_libdir}" \ + --docdir="%{_docdir}/%{name}" \ + --confdir="%{_sysconfdir}/%{name}" \ + --enable-openal \ + --enable-cdda \ + --enable-libmpv-shared \ + --enable-zsh-comp \ + --enable-manpage-build \ +%if 0%{?suse_version} > 1315 + --enable-pdf-build \ +%endif + ${myopts} -waf build --verbose %{?_smp_mflags} +./waf build --verbose %{?_smp_mflags} %install -waf --destdir=%{buildroot} install %{?_smp_mflags} +./waf --destdir=%{buildroot} install %post %desktop_database_post @@ -160,28 +190,34 @@ waf --destdir=%{buildroot} install %{?_smp_mflags} %desktop_database_postun %icon_theme_cache_postun -%post -n %{libname} -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig - -%files -n %{libname} -%defattr(-,root,root,-) -%{_libdir}/*.so.* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} -%{_libdir}/*.so -%{_libdir}/pkgconfig/%{name}.pc +%postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc LICENSE Copyright README.md etc/example.conf etc/input.conf -%dir %{_sysconfdir}/%{name} +%if 0%{?suse_version} > 1315 +%doc Copyright LICENSE README.md etc/example.conf etc/input.conf build/DOCS/man/mpv.pdf +%else +%doc Copyright LICENSE README.md etc/example.conf etc/input.conf +%endif +%dir %{_sysconfdir}/%{name}/ %config %{_sysconfdir}/%{name}/encoding-profiles.conf %{_bindir}/%{name} -%doc %{_mandir}/man1/%{name}.1* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png +#zsh completion +%{_datadir}/zsh/site-functions/_mpv +%{_mandir}/man?/%{name}.?%{?ext_man} + +%files -n %{lname} +%defattr(-,root,root) +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +%{_includedir}/%{name}/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc %changelog diff --git a/waf-1.8.9 b/waf-1.8.9 new file mode 100644 index 0000000..0782f3e --- /dev/null +++ b/waf-1.8.9 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:751b4a0338a94e557c554b32e19137f70b67f3b2d1e748281f543307ce796674 +size 97060