[SCM] mpv/master: Refresh patches

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Wed Apr 26 20:40:52 UTC 2017


The following commit has been merged in the master branch:
commit 17a013c491a72f1dd8db1ea4cf79ff7f5495f9fb
Author: James Cowgill <jcowgill at debian.org>
Date:   Sun Apr 23 22:13:35 2017 +0100

    Refresh patches

diff --git a/debian/patches/02_fix-config-path.patch b/debian/patches/02_fix-config-path.patch
index 05f0d38..af4e2bb 100644
--- a/debian/patches/02_fix-config-path.patch
+++ b/debian/patches/02_fix-config-path.patch
@@ -7,7 +7,7 @@ Last-Update: 2015-05-03
 
 --- a/DOCS/man/mpv.rst
 +++ b/DOCS/man/mpv.rst
-@@ -956,7 +956,7 @@ FILES
+@@ -985,7 +985,7 @@ FILES
  
  For Windows-specifics, see `FILES ON WINDOWS`_ section.
  
diff --git a/debian/patches/04_waf-pie.patch b/debian/patches/04_waf-pie.patch
index 1ba569b..5669eb1 100644
--- a/debian/patches/04_waf-pie.patch
+++ b/debian/patches/04_waf-pie.patch
@@ -8,7 +8,7 @@ Last-Update: 2015-09-24
 
 --- a/waflib/Context.py
 +++ b/waflib/Context.py
-@@ -140,6 +140,10 @@
+@@ -140,6 +140,10 @@ class Context(ctx):
  	def exec_command(self,cmd,**kw):
  		subprocess=Utils.subprocess
  		kw['shell']=isinstance(cmd,str)
diff --git a/debian/patches/05_add-keywords.patch b/debian/patches/05_add-keywords.patch
index b8045c9..19f1627 100644
--- a/debian/patches/05_add-keywords.patch
+++ b/debian/patches/05_add-keywords.patch
@@ -3,7 +3,7 @@ Author: Mateusz Łukasik <mati75 at linuxmint.pl>
 
 --- a/etc/mpv.desktop
 +++ b/etc/mpv.desktop
-@@ -29,3 +29,4 @@ Terminal=false
+@@ -32,3 +32,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
diff --git a/debian/patches/06_ffmpeg-abi.patch b/debian/patches/06_ffmpeg-abi.patch
index d5651f8..df62d7a 100644
--- a/debian/patches/06_ffmpeg-abi.patch
+++ b/debian/patches/06_ffmpeg-abi.patch
@@ -8,7 +8,7 @@ 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
+@@ -438,18 +438,6 @@ int mp_initialize(struct MPContext *mpct
  
      handle_deprecated_options(mpctx);
  

-- 
mpv packaging



More information about the pkg-multimedia-commits mailing list