From 657ce1b15c2e6dca0ed1ea1b67ffa123843eca5b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 4 Jan 2020 17:15:09 +0100 Subject: stream_libarchive: enable rar5 support We whitelist formats (and not all of them). RAR v5 is a separated format entry for inexplicable reasons. (It's a separate implementation, but who really wants to support only either of the rar formats?) I'm not sure if it was libarchive 3.3.3. Their git history is absolutely chaotic. These people do not know how to use git. I couldn't be bothered to dig deeper. --- stream/stream_libarchive.c | 1 + wscript | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c index 76b47e1633..7ae5a8be38 100644 --- a/stream/stream_libarchive.c +++ b/stream/stream_libarchive.c @@ -277,6 +277,7 @@ struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src, archive_read_support_format_7zip(mpa->arch); archive_read_support_format_iso9660(mpa->arch); archive_read_support_format_rar(mpa->arch); + archive_read_support_format_rar5(mpa->arch); archive_read_support_format_zip(mpa->arch); archive_read_support_filter_bzip2(mpa->arch); archive_read_support_filter_gzip(mpa->arch); diff --git a/wscript b/wscript index 1da8054f95..b1a1ed9a8f 100644 --- a/wscript +++ b/wscript @@ -414,7 +414,7 @@ iconv support use --disable-iconv.", }, { 'name': '--libarchive', 'desc': 'libarchive wrapper for reading zip files and more', - 'func': check_pkg_config('libarchive >= 3.0.0'), + 'func': check_pkg_config('libarchive >= 3.3.3'), }, { 'name': '--dvbin', 'desc': 'DVB input module', -- cgit v1.2.3