From 4129b80fa06b0d7a12a379e959dcdae6e7b77905 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rog=C3=A9rio=20Brito?= Date: Fri, 14 Sep 2018 17:20:42 -0300 Subject: [PATCH] debian/patch: Refresh all patches to avoid FTBFS. --- debian/patches/disable-autoupdate-mechanism.patch | 8 ++------ debian/patches/fix_libav_compat_outdated.patch | 6 ++---- debian/patches/skip_support_file_installation.patch | 4 +--- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/debian/patches/disable-autoupdate-mechanism.patch b/debian/patches/disable-autoupdate-mechanism.patch index 8a4d04b..c64ad73 100644 --- a/debian/patches/disable-autoupdate-mechanism.patch +++ b/debian/patches/disable-autoupdate-mechanism.patch @@ -15,11 +15,9 @@ Last-Update: 2018-03-16 youtube_dl/options.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) -diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py -index 9bb9524..7bf379b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py -@@ -438,7 +438,12 @@ def _real_main(argv=None): +@@ -439,7 +439,12 @@ with YoutubeDL(ydl_opts) as ydl: # Update version if opts.update_self: @@ -33,11 +31,9 @@ index 9bb9524..7bf379b 100644 # Remove cache dir if opts.rm_cachedir: -diff --git a/youtube_dl/options.py b/youtube_dl/options.py -index 7d1bbc0..cafca0c 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py -@@ -140,7 +140,7 @@ def parseOpts(overrideArguments=None): +@@ -140,7 +140,7 @@ general.add_option( '-U', '--update', action='store_true', dest='update_self', diff --git a/debian/patches/fix_libav_compat_outdated.patch b/debian/patches/fix_libav_compat_outdated.patch index 0c36990..e8a3c52 100644 --- a/debian/patches/fix_libav_compat_outdated.patch +++ b/debian/patches/fix_libav_compat_outdated.patch @@ -14,11 +14,9 @@ Last-Update: 2016-06-27 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 3ea1afc..c62256e 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py -@@ -110,11 +110,16 @@ class FFmpegPostProcessor(PostProcessor): +@@ -110,11 +110,16 @@ self._paths = dict( (p, os.path.join(location, p)) for p in programs) self._versions = dict( @@ -36,4 +34,4 @@ index 3ea1afc..c62256e 100644 + for p in programs) self._paths = dict((p, p) for p in programs) - if prefer_ffmpeg: + if prefer_ffmpeg is False: diff --git a/debian/patches/skip_support_file_installation.patch b/debian/patches/skip_support_file_installation.patch index c56cb09..1fc00a1 100644 --- a/debian/patches/skip_support_file_installation.patch +++ b/debian/patches/skip_support_file_installation.patch @@ -12,11 +12,9 @@ Last-Update: 2016-06-27 setup.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -diff --git a/setup.py b/setup.py -index 7dbb580..80599be 100644 --- a/setup.py +++ b/setup.py -@@ -58,12 +58,7 @@ py2exe_params = { +@@ -58,12 +58,7 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe': params = py2exe_params else: -- 2.41.1