mirror of
https://abf.rosa.ru/djam/xz.git
synced 2025-02-23 18:42:57 +00:00
New version 5.2.2
This commit is contained in:
parent
cbf9472630
commit
2558b9d7f5
3 changed files with 31 additions and 49 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
||||||
sources:
|
sources:
|
||||||
xz-5.1.3alpha.tar.xz: 52bbddfd0909590d7f47c7a7f82aa5fa5e6a2208
|
xz-5.2.2.tar.xz: 72c567d3263345844191a7e618779b179d1f49e0
|
||||||
|
|
|
@ -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.2.0/src/liblzma/api/lzma/container.h.text~ 2014-12-21 19:49:36.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 2014-12-22 11:17:52.108011177 +0100
|
||||||
@@ -43,7 +43,7 @@
|
@@ -43,7 +43,7 @@
|
||||||
/*
|
/*
|
||||||
* Preset flags
|
* Preset flags
|
||||||
|
@ -9,21 +9,22 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -59,6 +59,12 @@
|
@@ -59,6 +59,13 @@
|
||||||
*/
|
*/
|
||||||
#define LZMA_PRESET_EXTREME (UINT32_C(1) << 31)
|
#define LZMA_PRESET_EXTREME (UINT32_C(1) << 31)
|
||||||
|
|
||||||
+/**
|
+/**
|
||||||
+ * \brief Text compression preset
|
+ * \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)
|
+#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
|
* \brief Multithreading options
|
||||||
+++ xz-5.1.3alpha/src/liblzma/lzma/lzma_encoder_presets.c 2014-02-11 11:58:23.406404399 +0100
|
--- 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
|
@@ -18,7 +18,7 @@ lzma_lzma_preset(lzma_options_lzma *opti
|
||||||
{
|
{
|
||||||
const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK;
|
const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK;
|
||||||
|
@ -52,17 +53,17 @@
|
||||||
+
|
+
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
--- xz-5.1.3alpha/src/xz/args.c.text~ 2014-02-10 20:53:46.000000000 +0100
|
--- xz-5.2.0/src/xz/args.c.text~ 2014-12-21 19:49:36.000000000 +0100
|
||||||
+++ xz-5.1.3alpha/src/xz/args.c 2014-02-11 12:12:51.916381380 +0100
|
+++ xz-5.2.0/src/xz/args.c 2014-12-22 11:16:25.754040526 +0100
|
||||||
@@ -141,6 +141,7 @@ parse_real(args_info *args, int argc, ch
|
@@ -143,6 +143,7 @@ parse_real(args_info *args, int argc, ch
|
||||||
OPT_INFO_MEMORY,
|
|
||||||
OPT_ROBOT,
|
OPT_ROBOT,
|
||||||
OPT_FLUSH_TIMEOUT,
|
OPT_FLUSH_TIMEOUT,
|
||||||
|
OPT_IGNORE_CHECK,
|
||||||
+ OPT_TEXT,
|
+ OPT_TEXT,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char short_opts[]
|
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' },
|
{ "extreme", no_argument, NULL, 'e' },
|
||||||
{ "fast", no_argument, NULL, '0' },
|
{ "fast", no_argument, NULL, '0' },
|
||||||
{ "best", no_argument, NULL, '9' },
|
{ "best", no_argument, NULL, '9' },
|
||||||
|
@ -71,7 +72,7 @@
|
||||||
|
|
||||||
// Filters
|
// Filters
|
||||||
{ "lzma1", optional_argument, NULL, OPT_LZMA1 },
|
{ "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);
|
optarg, 0, UINT64_MAX);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -82,35 +83,26 @@
|
||||||
default:
|
default:
|
||||||
message_try_help();
|
message_try_help();
|
||||||
tuklib_exit(E_ERROR, E_ERROR, false);
|
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.2.0/src/xz/coder.c.text~ 2014-12-21 19:49:36.000000000 +0100
|
||||||
+++ xz-5.1.3alpha/src/xz/coder.c 2014-02-11 11:58:23.406404399 +0100
|
+++ xz-5.2.0/src/xz/coder.c 2014-12-22 11:16:25.754040526 +0100
|
||||||
@@ -59,6 +59,8 @@ static lzma_mt mt_options = {
|
@@ -104,6 +104,15 @@ coder_set_extreme(void)
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/// TODO: Description..
|
|
||||||
+static bool preset_text = false;
|
|
||||||
|
|
||||||
extern void
|
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)
|
+coder_set_text(void)
|
||||||
+{
|
+{
|
||||||
+ preset_number |= LZMA_PRESET_TEXT;
|
+ preset_number |= LZMA_PRESET_TEXT;
|
||||||
+ forget_filter_chain();
|
+ forget_filter_chain();
|
||||||
+ return;
|
+ return;
|
||||||
+}
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
extern void
|
+extern void
|
||||||
--- xz-5.1.3alpha/src/xz/coder.h.text~ 2014-02-10 20:53:46.000000000 +0100
|
coder_add_filter(lzma_vli id, void *options)
|
||||||
+++ xz-5.1.3alpha/src/xz/coder.h 2014-02-11 11:58:23.406404399 +0100
|
{
|
||||||
|
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
|
@@ -61,6 +61,9 @@ extern void coder_set_preset(uint32_t ne
|
||||||
/// Enable extreme mode
|
/// Enable extreme mode
|
||||||
extern void coder_set_extreme(void);
|
extern void coder_set_extreme(void);
|
||||||
|
@ -121,13 +113,3 @@
|
||||||
/// Add a filter to the custom filter chain
|
/// Add a filter to the custom filter chain
|
||||||
extern void coder_add_filter(lzma_vli id, void *options);
|
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
|
|
10
xz.spec
10
xz.spec
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
Summary: XZ utils
|
Summary: XZ utils
|
||||||
Name: xz
|
Name: xz
|
||||||
Version: 5.1.3
|
Version: 5.2.2
|
||||||
Release: 0.alpha.3.%{gitdate}.3
|
Release: 1
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: Archiving/Compression
|
Group: Archiving/Compression
|
||||||
Url: http://tukaani.org/xz/
|
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
|
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
|
Patch1: xz-5.1.3alpha-man-page-day.patch
|
||||||
# needed by check suite
|
# needed by check suite
|
||||||
BuildRequires: diffutils
|
BuildRequires: diffutils
|
||||||
|
@ -94,7 +94,7 @@ Devel libraries & headers for liblzma.
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}alpha
|
%setup -q
|
||||||
%patch0 -p1 -b .text~
|
%patch0 -p1 -b .text~
|
||||||
%patch1 -p1 -b .day~
|
%patch1 -p1 -b .day~
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue