projects / openwrt-10.03 / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 34c6a7a)
upgrade lzma sdk to 4.32
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 23 Mar 2006 14:20:38 +0000 (14:20 +0000)
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 23 Mar 2006 14:20:38 +0000 (14:20 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3459 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/lzma/Makefile patch | blob | history
target/lzma/lzma-zlib.patch [moved from target/lzma/lzma-406-zlib-stream.patch with 75% similarity] patch | blob | history

diff --git a/target/lzma/Makefile b/target/lzma/Makefile
index 6e846c31c9dad61653542638ff8bd943b56c1dd0..0225844d308609f380562600180d4cfd4943f066 100644 (file)
--- a/target/lzma/Makefile
+++ b/target/lzma/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 LZMA_DIR=$(BUILD_DIR)/lzma
-LZMA_SOURCE=lzma406.zip
-LZMA_SITE=http://www.7-zip.org/dl
-LZMA_MD5=a09378411cba5f786b5c49c9c58496df
+LZMA_SOURCE=lzma432.tar.bz2
+LZMA_SITE=@SF/sevenzip
+LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7
 
-LZMA_LIB_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Lib
-LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
+LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
 
 TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
 
@@ -21,14 +21,14 @@ $(DL_DIR)/$(LZMA_SOURCE):
 
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) 
        @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
-       unzip -q $^ -d $(LZMA_DIR)
-       patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE)
+       tar xjf $^ -C $(LZMA_DIR)
+       patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE)
        touch $(LZMA_DIR)/.unpacked
        
 $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
 $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
        $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
-       $(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
+       $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
        touch $@
 
 lzma: $(TARGETS)
diff --git a/target/lzma/lzma-406-zlib-stream.patch b/target/lzma/lzma-zlib.patch
similarity index 75%
rename from target/lzma/lzma-406-zlib-stream.patch
rename to target/lzma/lzma-zlib.patch
index 5af976372cf9318dc6f100888582269e9c4e2259..4d0c5480719e2b2d2415542aa053c69a19017680 100644 (file)
--- a/target/lzma/lzma-406-zlib-stream.patch
+++ b/target/lzma/lzma-zlib.patch
@@ -1,42 +1,6 @@
-diff -BurN lzma406/SRC/7zip/Compress/LZMA/LZMADecoder.cpp lzma/SRC/7zip/Compress/LZMA/LZMADecoder.cpp
---- lzma406/SRC/7zip/Compress/LZMA/LZMADecoder.cpp     2004-08-25 01:40:48.000000000 +0400
-+++ lzma/SRC/7zip/Compress/LZMA/LZMADecoder.cpp        2005-01-20 14:47:45.789801629 +0300
-@@ -288,12 +288,17 @@
-   Byte remainder = (Byte)(properties[0] / 9);\r
-   int lp = remainder % 5;\r
-   int pb = remainder / 5;\r
--  if (pb > NLength::kNumPosStatesBitsMax)\r
--    return E_INVALIDARG;\r
--  _posStateMask = (1 << pb) - 1;\r
-   UInt32 dictionarySize = 0;\r
-   for (int i = 0; i < 4; i++)\r
-     dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8);\r
-+  return SetDecoderPropertiesRaw(lc, lp, pb, dictionarySize);\r
-+}\r
-+\r
-+STDMETHODIMP CDecoder::SetDecoderPropertiesRaw(int lc, int lp, int pb, UInt32 dictionarySize)\r
-+{\r
-+  if (pb > NLength::kNumPosStatesBitsMax)\r
-+    return E_INVALIDARG;\r
-+  _posStateMask = (1 << pb) - 1;\r
-   _dictionarySizeCheck = MyMax(dictionarySize, UInt32(1));\r
-   UInt32 blockSize = MyMax(_dictionarySizeCheck, UInt32(1 << 12));\r
-   if (!_outWindowStream.Create(blockSize))\r
-diff -BurN lzma406/SRC/7zip/Compress/LZMA/LZMADecoder.h lzma/SRC/7zip/Compress/LZMA/LZMADecoder.h
---- lzma406/SRC/7zip/Compress/LZMA/LZMADecoder.h       2004-08-25 01:40:08.000000000 +0400
-+++ lzma/SRC/7zip/Compress/LZMA/LZMADecoder.h  2005-01-20 13:06:59.081297916 +0300
-@@ -234,6 +234,8 @@
-   STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);\r
-   STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize);\r
- \r
-+  STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize);\r
-+\r
-   virtual ~CDecoder() {}\r
- };\r
- \r
-diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/makefile lzma/SRC/7zip/Compress/LZMA_Lib/makefile
---- lzma406/SRC/7zip/Compress/LZMA_Lib/makefile        1970-01-01 03:00:00.000000000 +0300
-+++ lzma/SRC/7zip/Compress/LZMA_Lib/makefile   2005-01-19 13:49:20.000000000 +0300
+diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/makefile lzma432-owrt/C/7zip/Compress/LZMA_Lib/makefile
+--- lzma432/C/7zip/Compress/LZMA_Lib/makefile  1970-01-01 01:00:00.000000000 +0100
++++ lzma432-owrt/C/7zip/Compress/LZMA_Lib/makefile     2006-03-22 14:23:38.000000000 +0100
 @@ -0,0 +1,88 @@
 +PROG = liblzma.a\r
 +CXX = g++ -O3 -Wall\r
@@ -126,14 +90,15 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/makefile lzma/SRC/7zip/Compress/LZ
 +clean:\r
 +      -$(RM) $(PROG) $(OBJS)\r
 +\r
-diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp
---- lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp        1970-01-01 03:00:00.000000000 +0300
-+++ lzma/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp   2005-01-20 15:01:18.439221129 +0300
-@@ -0,0 +1,273 @@
+diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress/LZMA_Lib/ZLib.cpp
+--- lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp  1970-01-01 01:00:00.000000000 +0100
++++ lzma432-owrt/C/7zip/Compress/LZMA_Lib/ZLib.cpp     2006-03-22 14:23:38.000000000 +0100
+@@ -0,0 +1,283 @@
 +/*\r
 + * lzma zlib simplified wrapper\r
 + *\r
 + * Copyright (c) 2005 Oleg I. Vdovikin <oleg@cs.msu.su>\r
++ * Modified for LZMA 4.27 SDK Craig.Peacock@beyondlogic.org\r
 + *\r
 + * This library is free software; you can redistribute \r
 + * it and/or modify it under the terms of the GNU Lesser \r
@@ -319,9 +284,9 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
-+      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);\r
++      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest+4, (*destLen)-4);\r
 +      CMyComPtr<ISequentialOutStream> outStream = outStreamSpec;\r
-+      \r
++              \r
 +      NCompress::NLZMA::CEncoder *encoderSpec = \r
 +              new NCompress::NLZMA::CEncoder;\r
 +      CMyComPtr<ICompressCoder> encoder = encoderSpec;\r
@@ -342,12 +307,12 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +      PROPVARIANT properties[kNumProps];\r
 +      for (int p = 0; p < 6; p++)\r
 +              properties[p].vt = VT_UI4;\r
-+      properties[0].ulVal = UInt32(1 << (level + 14));\r
++      properties[0].ulVal = UInt32(1 << 15);\r
 +      properties[1].ulVal = UInt32(ZLIB_PB);\r
 +      properties[2].ulVal = UInt32(ZLIB_LC); // for normal files\r
 +      properties[3].ulVal = UInt32(ZLIB_LP); // for normal files\r
-+      properties[4].ulVal = UInt32(2);\r
-+      properties[5].ulVal = UInt32(128);\r
++      properties[4].ulVal = UInt32(0);\r
++      properties[5].ulVal = UInt32(0x28);\r
 +      \r
 +      properties[6].vt = VT_BSTR;\r
 +      properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4";\r
@@ -358,6 +323,9 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +      if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK)\r
 +              return Z_MEM_ERROR; // should not happen\r
 +      \r
++      if (encoderSpec->WriteCoderProperties(outStream) != S_OK)\r
++              return Z_MEM_ERROR;\r
++              \r
 +      HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0);\r
 +      if (result == E_OUTOFMEMORY)\r
 +      {\r
@@ -372,13 +340,16 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +      outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize);\r
 +      *destLen = fileSize;\r
 +      \r
++      /* Copy size of uncompressed string into first four bytes */\r
++      memcpy(dest, &sourceLen, 4);\r
++              \r
 +      return Z_OK;\r
 +}\r
 +\r
 +ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,\r
 +                                   const Bytef *source, uLong sourceLen))\r
 +{\r
-+      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);\r
++      CInMemoryStream *inStreamSpec = new CInMemoryStream(source+9, sourceLen-9);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
 +      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);\r
@@ -388,8 +359,11 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +              new NCompress::NLZMA::CDecoder;\r
 +      CMyComPtr<ICompressCoder> decoder = decoderSpec;\r
 +      \r
-+      if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, \r
-+              ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR;\r
++      //if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, \r
++      //      ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR;\r
++      \r
++      if (decoderSpec->SetDecoderProperties2(source+4, 5) != S_OK) \r
++              return Z_DATA_ERROR;\r
 +      \r
 +      UInt64 fileSize = *destLen;\r
 +      \r
@@ -403,3 +377,39 @@ diff -BurN lzma406/SRC/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/SRC/7zip/Compress/LZ
 +      \r
 +      return Z_OK;\r
 +}\r
+diff -Nur lzma432/C/Common/CommandLineParser.h lzma432-owrt/C/Common/CommandLineParser.h
+--- lzma432/C/Common/CommandLineParser.h       2005-03-07 17:03:46.000000000 +0100
++++ lzma432-owrt/C/Common/CommandLineParser.h  2006-03-22 14:23:38.000000000 +0100
+@@ -3,7 +3,7 @@
+ #ifndef __COMMON_COMMANDLINEPARSER_H\r
+ #define __COMMON_COMMANDLINEPARSER_H\r
+ \r
+-#include "Common/String.h"\r
++#include "String.h"\r
+ \r
+ namespace NCommandLineParser {\r
+ \r
+diff -Nur lzma432/C/Common/StringConvert.h lzma432-owrt/C/Common/StringConvert.h
+--- lzma432/C/Common/StringConvert.h   2005-09-16 10:19:44.000000000 +0200
++++ lzma432-owrt/C/Common/StringConvert.h      2006-03-22 14:23:38.000000000 +0100
+@@ -4,7 +4,7 @@
+ #define __COMMON_STRINGCONVERT_H\r
+ \r
+ #include "MyWindows.h"\r
+-#include "Common/String.h"\r
++#include "String.h"\r
+ #include "Types.h"\r
+ \r
+ UString MultiByteToUnicodeString(const AString &srcString, UINT codePage = CP_ACP);\r
+diff -Nur lzma432/C/Common/String.cpp lzma432-owrt/C/Common/String.cpp
+--- lzma432/C/Common/String.cpp        2005-09-28 11:44:06.000000000 +0200
++++ lzma432-owrt/C/Common/String.cpp   2006-03-22 14:23:38.000000000 +0100
+@@ -8,7 +8,7 @@
+ #include <ctype.h>\r
+ #endif\r
+ \r
+-#include "Common/String.h"\r
++#include "String.h"\r
+ \r
+ \r
+ #ifdef _WIN32\r
Unnamed repository; edit this file 'description' to name the repository.