Merge pull request #2841 from groni/master

mpv-player version bump
This commit is contained in:
groni
2017-02-17 13:53:06 +01:00
committed by GitHub
7 changed files with 13749 additions and 5 deletions
+3 -3
View File
@@ -13,8 +13,8 @@ from pisi.actionsapi import pythonmodules
shelltools.export("JOBS", get.makeJOBS().replace("-j", ""))
def setup():
shelltools.system("./bootstrap.py")
shelltools.system("python waf configure --prefix=/usr --confdir=/etc/mpv --enable-zsh-comp --enable-libmpv-shared --enable-cdda")
shelltools.system("./bootstrap.py")
shelltools.system("python waf configure --prefix=/usr --confdir=/etc/mpv --enable-zsh-comp --enable-libmpv-shared --enable-cdda --disable-libsmbclient")
def build():
shelltools.system("python waf build -v")
@@ -22,4 +22,4 @@ def build():
def install():
shelltools.system("DESTDIR=%s python waf install" % get.installDIR())
pisitools.dodoc("Copyright", "RELEASE_NOTES", "README.md", "LICENSE")
pisitools.dodoc("Copyright", "RELEASE_NOTES", "README.md", "LICENSE")
@@ -0,0 +1,18 @@
Description: System-wide config directory is /etc/mpv
Origin: vendor
Bug-Debian: https://bugs.debian.org/732214
Forwarded: not-needed
Author: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-05-03
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -956,7 +956,7 @@ FILES
For Windows-specifics, see `FILES ON WINDOWS`_ section.
-``/usr/local/etc/mpv/mpv.conf``
+``/etc/mpv/mpv.conf``
mpv system-wide settings (depends on ``--prefix`` passed to configure - mpv
in default configuration will use ``/usr/local/etc/mpv/`` as config
directory, while most Linux distributions will set it to ``/etc/mpv/``).
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,21 @@
Description: Fix waf support for PIE
Origin: vendor
Debian-Bug: https://bugs.debian.org/799738
Forwarded: not-needed
Author: Simon Ruderich <simon@ruderich.org>
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-09-24
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -140,6 +140,10 @@
def exec_command(self,cmd,**kw):
subprocess=Utils.subprocess
kw['shell']=isinstance(cmd,str)
+ # FIXME: hacky solution to fix PIC-PIE-conflict
+ if '-shared' in cmd:
+ Logs.debug('runner: old %r'%(cmd,))
+ cmd = [x for x in cmd if x != '-fPIE' and x != '-pie']
Logs.debug('runner: %r'%(cmd,))
Logs.debug('runner_env: kw=%s'%kw)
if self.logger:
@@ -0,0 +1,10 @@
Description: Add keywords to desktop file
Author: Mateusz Łukasik <mati75@linuxmint.pl>
--- a/etc/mpv.desktop
+++ b/etc/mpv.desktop
@@ -29,3 +29,4 @@ Terminal=false
Categories=AudioVideo;Audio;Video;Player;TV;
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;video/mp2t;audio/flac;audio/mp4;
X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+Keywords=mpv;media;player;video;audio;tv;
@@ -0,0 +1,29 @@
Description: Surpress ffmpeg version mismatch error
Requiring an exact ffmpeg version isn't helpful in a distribution where all ABI
issues should already be handled by package dependencies. Rebuilding every time
ffmpeg is updated is also completely unmaintainable.
Author: James Cowgill <jcowgill@debian.org>
Bug-Debian: https://bugs.debian.org/831537
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/player/main.c
+++ b/player/main.c
@@ -429,18 +429,6 @@ int mp_initialize(struct MPContext *mpct
handle_deprecated_options(mpctx);
- if (!print_libav_versions(mp_null_log, 0)) {
- // Using mismatched libraries can be legitimate, but even then it's
- // a bad idea. We don't acknowledge its usefulness and stability.
- print_libav_versions(mpctx->log, MSGL_FATAL);
- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
- "This is most likely a broken build and could\nresult in "
- "misbehavior and crashes.\n\nmpv does not support this "
- "configuration and will not run - rebuild mpv instead.\n");
- return -1;
- }
-
if (!mpctx->playlist->first && !opts->player_idle_mode)
return -3;
+17 -2
View File
@@ -12,9 +12,10 @@
<IsA>app:gui</IsA>
<Summary>mpv is based on mplayer2</Summary>
<Description>mpv has Wayland support, Improved OpenGL output, Support for libavfilter (for video->video and audio->audio). This allows using most of FFmpeg's filters, which improve greatly on the old MPlayer filters in features, performance, and correctness.is a movie player that can run on many platforms. Improved OpenGL output. More correct color reproduction (color matrix generation), including support for BT.2020 (Ultra HD) and linear XYZ (Digital Cinema) inputs.</Description>
<Archive sha1sum="99df32c3fdeece2e01ff6bc112586b13f10cffb9" type="targz">https://github.com/mpv-player/mpv/archive/v0.23.0.tar.gz</Archive>
<Archive sha1sum="ade12ce6a626fdba5cbdb41444805f1ed3dfcb36" type="targz">https://github.com/mpv-player/mpv/archive/v0.24.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>pkgconfig</Dependency>
<Dependency>perl</Dependency>
@@ -54,6 +55,13 @@
<Dependency>libvdpau-devel</Dependency>
<Dependency>libavc1394-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">03_waf.patch</Patch>
<Patch level="1">02_fix-config-path.patch</Patch>
<Patch level="1">04_waf-pie.patch</Patch>
<Patch level="1">05_add-keywords.patch</Patch>
<Patch level="1">06_ffmpeg-abi.patch</Patch>
</Patches>
</Source>
<Package>
@@ -113,7 +121,14 @@
<Dependency release="current">mpv-player</Dependency>
</RuntimeDependencies>
</Package>
<History>
<History>
<Update release="6">
<Date>2017-02-16</Date>
<Version>0.24.0</Version>
<Comment>Release bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2017-01-11</Date>
<Version>0.23.0</Version>