[SCM] mpv/master: Refresh patches

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Wed Jul 19 14:24:30 UTC 2017


The following commit has been merged in the master branch:
commit b756e17d802dd897a6ff3a729466884d33978adf
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Jul 19 10:56:43 2017 +0100

    Refresh patches

diff --git a/debian/patches/02_fix-config-path.patch b/debian/patches/02_fix-config-path.patch
index af4e2bb..b87df9f 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
-@@ -985,7 +985,7 @@ FILES
+@@ -1014,7 +1014,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 5669eb1..3c49e59 100644
--- a/debian/patches/04_waf-pie.patch
+++ b/debian/patches/04_waf-pie.patch
@@ -4,7 +4,7 @@ Debian-Bug: https://bugs.debian.org/799738
 Forwarded: not-needed
 Author: Simon Ruderich <simon at ruderich.org>
 Reviewed-by: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2015-09-24
+Last-Update: 2017-06-19
 
 --- a/waflib/Context.py
 +++ b/waflib/Context.py
@@ -16,6 +16,6 @@ Last-Update: 2015-09-24
 +		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)
+ 		Logs.debug('runner: %r',cmd)
+ 		Logs.debug('runner_env: kw=%s',kw)
  		if self.logger:
diff --git a/debian/patches/06_ffmpeg-abi.patch b/debian/patches/06_ffmpeg-abi.patch
index df62d7a..45bab17 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
-@@ -438,18 +438,6 @@ int mp_initialize(struct MPContext *mpct
+@@ -447,18 +447,6 @@ int mp_initialize(struct MPContext *mpct
  
      handle_deprecated_options(mpctx);
  

-- 
mpv packaging



More information about the pkg-multimedia-commits mailing list