RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: xar Date: 16-Dec-2008 08:45:31
Branch: HEAD Handle: 2008121607453100
Modified files:
xar/lib lzmaxar.c
Log:
support lzma 4.999.6alpha as well
Summary:
Revision Changes Path
1.10 +8 -4 xar/lib/lzmaxar.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: xar/lib/lzmaxar.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 lzmaxar.c
--- xar/lib/lzmaxar.c 19 Oct 2008 22:13:53 -0000 1.9
+++ xar/lib/lzmaxar.c 16 Dec 2008 07:45:31 -0000 1.10
@@ -66,7 +66,7 @@
lzma_stream lzma;
#if LZMA_VERSION < 49990050U
lzma_options_stream options;
-#else
+#elif LZMA_VERSION < 49990060U
lzma_check check;
lzma_filter filters[2];
#endif
@@ -264,7 +264,7 @@
LZMA_CONTEXT(context)->options.filters[0].options =
(lzma_options_lzma *)(lzma_preset_lzma + level - 1);
/* Terminate the filter options array. */
LZMA_CONTEXT(context)->options.filters[1].id = UINT64_MAX;
-#else
+#elif LZMA_VERSION < 49990060U
LZMA_CONTEXT(context)->check = LZMA_CHECK_CRC64;
LZMA_CONTEXT(context)->filters[0].id = LZMA_FILTER_LZMA;
LZMA_CONTEXT(context)->filters[0].options = (lzma_options_lzma
*)(lzma_preset_lzma + level - 1);
@@ -286,10 +286,14 @@
LZMA_CONTEXT(context)->allocator.opaque =
LZMA_CONTEXT(context)->limit;
LZMA_CONTEXT(context)->lzma.allocator =
&LZMA_CONTEXT(context)->allocator;
#if LZMA_VERSION < 49990050U
- r = lzma_stream_encoder_single(&LZMA_CONTEXT(context)->lzma,
&(LZMA_CONTEXT(context)->options));
-#else
+ r = lzma_stream_encoder_single(&LZMA_CONTEXT(context)->lzma,
+
&(LZMA_CONTEXT(context)->options));
+#elif LZMA_VERSION < 49990060U
r = lzma_stream_encoder(&LZMA_CONTEXT(context)->lzma,
LZMA_CONTEXT(context)->filters,
LZMA_CONTEXT(context)->check);
+#else
+ r = lzma_easy_encoder(&LZMA_CONTEXT(context)->lzma,
+ (lzma_easy_level) level);
#endif
if( (r != LZMA_OK) ) {
xar_err_new(x);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
