SHA256
1
0
forked from pool/mpv

Accepting request 308899 from multimedia:apps

- Try to fix build for both Factory and packman
  * We neeed to sync this up

- Version bump to 0.9.2:
  * Various opengl fixes
  * Fulscreen behaviour fixes for some WMs
  * Various other small fixes

- Sync buildrequires with packman spec-file

- Sync with packman spec-file

- Update to 0.9.1

OBS-URL: https://build.opensuse.org/request/show/308899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpv?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2015-05-29 08:39:54 +00:00 committed by Git OBS Bridge
commit 97b7cb2e98
6 changed files with 153 additions and 80 deletions

2
.gitattributes vendored
View File

@ -21,3 +21,5 @@
*.xz filter=lfs diff=lfs merge=lfs -text *.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
waf-1.8.10 filter=lfs diff=lfs merge=lfs -text

3
mpv-0.9.2.tar.gz Normal file
View File

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

View File

@ -1,7 +1,31 @@
-------------------------------------------------------------------
Wed May 27 10:53:28 UTC 2015 - tchvatal@suse.com
- Try to fix build for both Factory and packman
* We neeed to sync this up
-------------------------------------------------------------------
Wed May 27 09:23:41 UTC 2015 - tchvatal@suse.com
- Version bump to 0.9.2:
* Various opengl fixes
* Fulscreen behaviour fixes for some WMs
* Various other small fixes
-------------------------------------------------------------------
Tue May 19 12:48:13 UTC 2015 - olaf@aepfle.de
- Sync buildrequires with packman spec-file
-------------------------------------------------------------------
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 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. * mpv's IRC channel moved from #mpv-player to #mpv on chat.freenode.net.
* Documentation updates. * 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. * 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 +58,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. * 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). * 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. * 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 Thu Apr 23 11:27:19 UTC 2015 - mpluskal@suse.com

195
mpv.spec
View File

@ -2,6 +2,7 @@
# spec file for package mpv # spec file for package mpv
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 Packman Team <packman@links2linux.de>
# Copyright (c) 2012 Jiri Slaby <jslaby@suse.de> # Copyright (c) 2012 Jiri Slaby <jslaby@suse.de>
# Copyright (c) 2011-2012 Pascal Bleser <pascal.bleser@opensuse.org> # Copyright (c) 2011-2012 Pascal Bleser <pascal.bleser@opensuse.org>
# #
@ -18,73 +19,61 @@
# #
%define libname libmpv1 %define _waf_ver 1.8.10
%define lname libmpv1
Name: mpv Name: mpv
Version: 0.9.1 Version: 0.9.2
Release: 0 Release: 0
Summary: Advanced General Purpose Video Player Summary: Advanced general-purpose multimedia player
License: GPL-2.0+ License: GPL-2.0+ and BSD-3-Clause
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
# waf is licensed with BSD-3-Clause
Url: http://mpv.io/ Url: http://mpv.io/
Source0: https://github.com/mpv-player/mpv/archive/v%{version}.tar.gz Source: http://github.com/mpv-player/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: %{name}.changes # 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: hicolor-icon-theme
BuildRequires: ladspa-devel BuildRequires: ladspa-devel
BuildRequires: libavcodec-libav-devel
BuildRequires: libavdevice-libav-devel
BuildRequires: libavfilter-libav-devel
BuildRequires: libavformat-libav-devel
BuildRequires: libavutil-libav-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libmng-devel BuildRequires: libmng-devel
BuildRequires: libswscale-libav-devel
BuildRequires: libv4l-devel
BuildRequires: linux-kernel-headers BuildRequires: linux-kernel-headers
BuildRequires: lirc-devel BuildRequires: lirc-devel
BuildRequires: lua-devel
BuildRequires: luajit-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: perl
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pulseaudio-devel
BuildRequires: python-docutils BuildRequires: python-docutils
BuildRequires: python-rst2pdf
BuildRequires: python3 BuildRequires: python3
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: waf
BuildRequires: yasm BuildRequires: yasm
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(caca) BuildRequires: pkgconfig(caca)
BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(dvdnav) >= 4.2.0
BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(dvdread) >= 4.1.0
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(enca)
BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lcms2) >= 2.6
BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libass) >= 0.12.1
BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libbluray) >= 0.3.0
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_cdda) BuildRequires: pkgconfig(libcdio_cdda)
BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libcdio_paranoia)
BuildRequires: pkgconfig(libguess)
BuildRequires: pkgconfig(libiso9660) BuildRequires: pkgconfig(libiso9660)
BuildRequires: pkgconfig(libpulse) >= 1.0
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libudf) BuildRequires: pkgconfig(libudf)
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libva-x11) BuildRequires: pkgconfig(libva-x11)
BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(openal) >= 1.13
BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(vdpau) 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(xext)
BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xv)
@ -93,27 +82,65 @@ BuildRequires: pkgconfig(zlib)
# Used via LUA scripts # Used via LUA scripts
Recommends: youtube-dl Recommends: youtube-dl
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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.
%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 %description
mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety 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. of video file formats, audio and video codecs, and subtitle types.
%package devel %package devel
Summary: A library to link together with mpv player Summary: A library to link together with mpv player
Group: Development/Libraries/C and C++ 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 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. of video file formats, audio and video codecs, and subtitle types.
This package contains all the development files. This package contains all the development files.
%package -n %{libname} %package -n %{lname}
Summary: A library to link together with mpv player Summary: A library to link together with mpv player
Group: System/Libraries Group: System/Libraries
%description -n %{libname} %description -n %{lname}
mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety 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. of video file formats, audio and video codecs, and subtitle types.
@ -123,34 +150,44 @@ features.
%prep %prep
%setup -q %setup -q
# I hate UNKNOWN so lets put decent info there # As we downloaded specific waf version we need to put and prepare it in place.
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE1}")" cp -f %{SOURCE1} waf
DATE="$(date -d "${modified}" "+%%b %%e %%Y")" chmod a+x waf
sed -i \
-e "s:UNKNOWN:${DATE}:g" \ # I hate UNKNOWN so lets put decent info there.
common/version.c 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 %build
CCFLAGS="%{optflags}" \ # SDL: disable as it is pointless to have on Linux, it is Windows/OS X fallback.
waf configure \ myopts="--disable-sdl1 --disable-sdl2"
--prefix="%{_prefix}" \ # We don't want to rebuild all the time.
--bindir="%{_bindir}" \ myopts+=" --disable-build-date"
--mandir="%{_mandir}" \ # Debug just adds -g and we do that over optflags anyway.
--libdir="%{_libdir}" \ myopts+=" --disable-debug"
--docdir="%{_docdir}/%{name}" \ export CCFLAGS="%{optflags}"
--confdir="%{_sysconfdir}/%{name}" \ ./waf configure \
--enable-openal \ --prefix="%{_prefix}" \
--enable-cdda \ --bindir="%{_bindir}" \
--enable-libmpv-shared \ --mandir="%{_mandir}" \
--disable-sdl1 \ --libdir="%{_libdir}" \
--disable-sdl2 \ --docdir="%{_docdir}/%{name}" \
--disable-build-date \ --confdir="%{_sysconfdir}/%{name}" \
--disable-debug --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 %install
waf --destdir=%{buildroot} install %{?_smp_mflags} ./waf --destdir=%{buildroot} install
%post %post
%desktop_database_post %desktop_database_post
@ -160,28 +197,34 @@ waf --destdir=%{buildroot} install %{?_smp_mflags}
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_postun %icon_theme_cache_postun
%post -n %{libname} -p /sbin/ldconfig %post -n %{lname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig
%files -n %{libname}
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE Copyright README.md etc/example.conf etc/input.conf %if 0%{?suse_version} > 1315
%dir %{_sysconfdir}/%{name} %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 %config %{_sysconfdir}/%{name}/encoding-profiles.conf
%{_bindir}/%{name} %{_bindir}/%{name}
%doc %{_mandir}/man1/%{name}.1*
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_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 %changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e
size 2698031

3
waf-1.8.10 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73e4d1932a309d4bb67bbab160e7c551e97a46046d36a552da1331acdff007a3
size 97360