From 2558b9d7f54632836fdc638654a22a59159885b9 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 23 Jun 2016 20:28:05 +1000 Subject: [PATCH] New version 5.2.2 --- .abf.yml | 2 +- ...ext-tune.patch => xz-5.2.0-text-tune.patch | 68 +++++++------------ xz.spec | 10 +-- 3 files changed, 31 insertions(+), 49 deletions(-) rename xz-5.1.3alpha-text-tune.patch => xz-5.2.0-text-tune.patch (54%) diff --git a/.abf.yml b/.abf.yml index 10d738c..d56133d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - xz-5.1.3alpha.tar.xz: 52bbddfd0909590d7f47c7a7f82aa5fa5e6a2208 + xz-5.2.2.tar.xz: 72c567d3263345844191a7e618779b179d1f49e0 diff --git a/xz-5.1.3alpha-text-tune.patch b/xz-5.2.0-text-tune.patch similarity index 54% rename from xz-5.1.3alpha-text-tune.patch rename to xz-5.2.0-text-tune.patch index a861326..0324250 100644 --- a/xz-5.1.3alpha-text-tune.patch +++ b/xz-5.2.0-text-tune.patch @@ -1,5 +1,5 @@ ---- xz-5.1.3alpha/src/liblzma/api/lzma/container.h.text~ 2014-02-10 20:53:46.000000000 +0100 -+++ xz-5.1.3alpha/src/liblzma/api/lzma/container.h 2014-02-11 11:58:23.406404399 +0100 +--- xz-5.2.0/src/liblzma/api/lzma/container.h.text~ 2014-12-21 19:49:36.000000000 +0100 ++++ xz-5.2.0/src/liblzma/api/lzma/container.h 2014-12-22 11:17:52.108011177 +0100 @@ -43,7 +43,7 @@ /* * Preset flags @@ -9,21 +9,22 @@ */ /** -@@ -59,6 +59,12 @@ +@@ -59,6 +59,13 @@ */ #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) +/** + * \brief Text compression preset + * -+ * TODO ++ * This flag modifies the preset to optimize the encoding for text files. + */ +#define LZMA_PRESET_TEXT (UINT32_C(1) << 18) ++ - #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */ /** ---- xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c.text~ 2014-02-10 20:53:46.000000000 +0100 -+++ xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c 2014-02-11 11:58:23.406404399 +0100 + * \brief Multithreading options +--- xz-5.2.0/src/liblzma/lzma/lzma_encoder_presets.c.text~ 2014-12-21 19:49:36.000000000 +0100 ++++ xz-5.2.0/src/liblzma/lzma/lzma_encoder_presets.c 2014-12-22 11:16:25.754040526 +0100 @@ -18,7 +18,7 @@ lzma_lzma_preset(lzma_options_lzma *opti { const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK; @@ -52,17 +53,17 @@ + return false; } ---- xz-5.1.3alpha/src/xz/args.c.text~ 2014-02-10 20:53:46.000000000 +0100 -+++ xz-5.1.3alpha/src/xz/args.c 2014-02-11 12:12:51.916381380 +0100 -@@ -141,6 +141,7 @@ parse_real(args_info *args, int argc, ch - OPT_INFO_MEMORY, +--- xz-5.2.0/src/xz/args.c.text~ 2014-12-21 19:49:36.000000000 +0100 ++++ xz-5.2.0/src/xz/args.c 2014-12-22 11:16:25.754040526 +0100 +@@ -143,6 +143,7 @@ parse_real(args_info *args, int argc, ch OPT_ROBOT, OPT_FLUSH_TIMEOUT, + OPT_IGNORE_CHECK, + OPT_TEXT, }; static const char short_opts[] -@@ -182,6 +183,8 @@ parse_real(args_info *args, int argc, ch +@@ -185,6 +186,8 @@ parse_real(args_info *args, int argc, ch { "extreme", no_argument, NULL, 'e' }, { "fast", no_argument, NULL, '0' }, { "best", no_argument, NULL, '9' }, @@ -71,7 +72,7 @@ // Filters { "lzma1", optional_argument, NULL, OPT_LZMA1 }, -@@ -490,6 +493,10 @@ parse_real(args_info *args, int argc, ch +@@ -497,6 +500,10 @@ parse_real(args_info *args, int argc, ch optarg, 0, UINT64_MAX); break; @@ -82,35 +83,26 @@ default: message_try_help(); tuklib_exit(E_ERROR, E_ERROR, false); ---- xz-5.1.3alpha/src/xz/coder.c.text~ 2014-02-10 20:53:46.000000000 +0100 -+++ xz-5.1.3alpha/src/xz/coder.c 2014-02-11 11:58:23.406404399 +0100 -@@ -59,6 +59,8 @@ static lzma_mt mt_options = { - }; - #endif +--- xz-5.2.0/src/xz/coder.c.text~ 2014-12-21 19:49:36.000000000 +0100 ++++ xz-5.2.0/src/xz/coder.c 2014-12-22 11:16:25.754040526 +0100 +@@ -104,6 +104,15 @@ coder_set_extreme(void) -+/// TODO: Description.. -+static bool preset_text = false; extern void - coder_set_check(lzma_check new_check) -@@ -101,6 +103,15 @@ coder_set_extreme(void) - forget_filter_chain(); - return; - } -+ -+ -+extern void +coder_set_text(void) +{ + preset_number |= LZMA_PRESET_TEXT; + forget_filter_chain(); + return; +} - - - extern void ---- xz-5.1.3alpha/src/xz/coder.h.text~ 2014-02-10 20:53:46.000000000 +0100 -+++ xz-5.1.3alpha/src/xz/coder.h 2014-02-11 11:58:23.406404399 +0100 ++ ++ ++extern void + coder_add_filter(lzma_vli id, void *options) + { + if (filters_count == LZMA_FILTERS_MAX) +--- xz-5.2.0/src/xz/coder.h.text~ 2014-12-21 19:49:36.000000000 +0100 ++++ xz-5.2.0/src/xz/coder.h 2014-12-22 11:16:25.754040526 +0100 @@ -61,6 +61,9 @@ extern void coder_set_preset(uint32_t ne /// Enable extreme mode extern void coder_set_extreme(void); @@ -121,13 +113,3 @@ /// Add a filter to the custom filter chain extern void coder_add_filter(lzma_vli id, void *options); ---- xz-5.1.3alpha/tests/test_compress.sh.text~ 2014-02-11 13:03:45.431535071 +0100 -+++ xz-5.1.3alpha/tests/test_compress.sh 2014-02-11 15:33:40.012017357 +0100 -@@ -103,6 +103,7 @@ do - - # Don't test with empty arguments; it breaks some ancient - # proprietary /bin/sh versions due to $@ used in test_xz(). -+ test_xz -0 --text - test_xz -1 - test_xz -2 - test_xz -3 diff --git a/xz.spec b/xz.spec index 0d69f48..ec9ae4f 100644 --- a/xz.spec +++ b/xz.spec @@ -10,14 +10,14 @@ Summary: XZ utils Name: xz -Version: 5.1.3 -Release: 0.alpha.3.%{gitdate}.3 +Version: 5.2.2 +Release: 1 License: Public Domain Group: Archiving/Compression Url: http://tukaani.org/xz/ -Source0: http://tukaani.org/xz/%{name}-%{version}alpha.tar.xz +Source0: http://tukaani.org/xz/%{name}-%{version}.tar.xz Source1: xzme -Patch0: xz-5.1.3alpha-text-tune.patch +Patch0: xz-5.2.0-text-tune.patch Patch1: xz-5.1.3alpha-man-page-day.patch # needed by check suite BuildRequires: diffutils @@ -94,7 +94,7 @@ Devel libraries & headers for liblzma. #---------------------------------------------------------------------------- %prep -%setup -qn %{name}-%{version}alpha +%setup -q %patch0 -p1 -b .text~ %patch1 -p1 -b .day~