diff options
| author | Carlos Maddela <e7appew@gmail.com> | 2016-03-02 05:05:21 +1100 |
|---|---|---|
| committer | Carlos Maddela <e7appew@gmail.com> | 2016-10-09 09:08:04 +1100 |
| commit | 50ed6c46cb3d442f6ba1b64fd41b37dd5f54f2b8 (patch) | |
| tree | 33a6b2dbb3e298d6359e1927abd8853da8d430f4 | |
| parent | 0ae75ad42cc6f25af12b54201dcbadfc116f923f (diff) | |
| download | youtube-dl-50ed6c46cb3d442f6ba1b64fd41b37dd5f54f2b8.zip youtube-dl-50ed6c46cb3d442f6ba1b64fd41b37dd5f54f2b8.tar.gz youtube-dl-50ed6c46cb3d442f6ba1b64fd41b37dd5f54f2b8.tar.bz2 | |
Stop libav compatibility links from being considered as genuine.
Don't register version numbers for compatibility links, so that
youtube-dl stops complaining about avconv being outdated.
Closes: #798936
| -rw-r--r-- | debian/patches/fix_libav_compat_outdated.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/fix_libav_compat_outdated.patch b/debian/patches/fix_libav_compat_outdated.patch new file mode 100644 index 0000000..f86a0b0 --- /dev/null +++ b/debian/patches/fix_libav_compat_outdated.patch @@ -0,0 +1,41 @@ +From: Carlos Maddela <e7appew@gmail.com> +Date: Wed, 2 Mar 2016 04:20:06 +1100 +Subject: Stop libav compatibility links from being considered as genuine. + +Description: Stop libav compatibility links from being considered as genuine. + Don't register version numbers for compatibility links, so that + youtube-dl stops complaining about avconv being outdated. +Author: Carlos Maddela <e7appew@gmail.com> +Origin: vendor +Bug: https://github.com/rg3/youtube-dl/pull/8720 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798936 +Last-Update: 2016-06-27 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + youtube_dl/postprocessor/ffmpeg.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py +index fa99b0c..29beb48 100644 +--- a/youtube_dl/postprocessor/ffmpeg.py ++++ b/youtube_dl/postprocessor/ffmpeg.py +@@ -98,11 +98,16 @@ class FFmpegPostProcessor(PostProcessor): + self._paths = dict( + (p, os.path.join(location, p)) for p in programs) + self._versions = dict( +- (p, get_exe_version(self._paths[p], args=['-version'])) ++ (p, get_exe_version(self._paths[p], args=['-version'], ++ version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p, ++ unrecognized=False)) + for p in programs) + if self._versions is None: + self._versions = dict( +- (p, get_exe_version(p, args=['-version'])) for p in programs) ++ (p, get_exe_version(p, args=['-version'], ++ version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p, ++ unrecognized=False)) ++ for p in programs) + self._paths = dict((p, p) for p in programs) + + if prefer_ffmpeg: diff --git a/debian/patches/series b/debian/patches/series index 4813c5b..21895fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ skip_support_file_installation.patch +fix_libav_compat_outdated.patch |