projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
don't compile libipkg in busybox if ipkg is disabled
[openwrt.git] / openwrt / target / lzma / lzma-zlib.patch
diff --git a/openwrt/target/lzma/lzma-zlib.patch b/openwrt/target/lzma/lzma-zlib.patch
index 4d0c548..3672a0e 100644 (file)
--- a/openwrt/target/lzma/lzma-zlib.patch
+++ b/openwrt/target/lzma/lzma-zlib.patch
@@ -1,104 +1,142 @@
-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
-+AR = ar
-+RM = rm -f\r
-+CFLAGS = -c\r
-+\r
-+OBJS = \\r
-+  ZLib.o \\r
-+  LZMADecoder.o \\r
-+  LZMAEncoder.o \\r
-+  LZInWindow.o \\r
-+  LZOutWindow.o \\r
-+  RangeCoderBit.o \\r
-+  InBuffer.o \\r
-+  OutBuffer.o \\r
-+  FileStreams.o \\r
-+  Alloc.o \\r
-+  C_FileIO.o \\r
-+  CommandLineParser.o \\r
-+  CRC.o \\r
-+  String.o \\r
-+  StringConvert.o \\r
-+  StringToInt.o \\r
-+  Vector.o \\r
-+\r
-+\r
-+all: $(PROG)\r
-+\r
-+$(PROG): $(OBJS)\r
-+      $(AR) r $(PROG) $(OBJS)\r
-+\r
-+ZLib.o: ZLib.cpp\r
-+      $(CXX) $(CFLAGS) ZLib.cpp\r
-+\r
-+LZMADecoder.o: ../LZMA/LZMADecoder.cpp\r
-+      $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp\r
-+\r
-+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp\r
-+      $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp\r
-+\r
-+LZInWindow.o: ../LZ/LZInWindow.cpp\r
-+      $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp\r
-+\r
-+LZOutWindow.o: ../LZ/LZOutWindow.cpp\r
-+      $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp\r
-+\r
-+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp\r
-+      $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp\r
-+\r
-+InBuffer.o: ../../Common/InBuffer.cpp\r
-+      $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp\r
-+\r
-+OutBuffer.o: ../../Common/OutBuffer.cpp\r
-+      $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp\r
-+\r
-+FileStreams.o: ../../Common/FileStreams.cpp\r
-+      $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp\r
-+\r
-+Alloc.o: ../../../Common/Alloc.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp\r
-+\r
-+C_FileIO.o: ../../../Common/C_FileIO.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp\r
-+\r
-+CommandLineParser.o: ../../../Common/CommandLineParser.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp\r
-+\r
-+CRC.o: ../../../Common/CRC.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/CRC.cpp\r
-+\r
-+MyWindows.o: ../../../Common/MyWindows.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp\r
-+\r
-+String.o: ../../../Common/String.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/String.cpp\r
-+\r
-+StringConvert.o: ../../../Common/StringConvert.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp\r
-+\r
-+StringToInt.o: ../../../Common/StringToInt.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp\r
-+\r
-+Vector.o: ../../../Common/Vector.cpp\r
-+      $(CXX) $(CFLAGS) ../../../Common/Vector.cpp\r
-+\r
-+clean:\r
-+      -$(RM) $(PROG) $(OBJS)\r
+diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp
+--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp  2005-09-22 10:55:34.000000000 +0200
++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp  2006-03-25 11:04:53.000000000 +0100
+@@ -274,12 +274,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
 +\r
-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 @@
++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
+   if (!_outWindowStream.Create(dictionarySize))\r
+     return E_OUTOFMEMORY;\r
+   if (!_literalDecoder.Create(lp, lc))\r
+diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h
+--- lzma/C/7zip/Compress/LZMA/LZMADecoder.h    2005-09-19 08:10:06.000000000 +0200
++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h    2006-03-25 11:04:53.000000000 +0100
+@@ -228,6 +228,7 @@
+       ICompressProgressInfo *progress);\r
+ \r
+   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);\r
++  STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize);\r
+ \r
+   STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);\r
+ \r
+diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile
+--- lzma/C/7zip/Compress/LZMA_Lib/makefile     1970-01-01 01:00:00.000000000 +0100
++++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile     2006-03-25 11:29:46.000000000 +0100
+@@ -0,0 +1,92 @@
++PROG = liblzma.a
++CXX = g++ -O3 -Wall
++AR = ar
++RM = rm -f
++CFLAGS = -c  -I ../../../
++
++OBJS = \
++  ZLib.o \
++  LZMADecoder.o \
++  LZMAEncoder.o \
++  LZInWindow.o \
++  LZOutWindow.o \
++  RangeCoderBit.o \
++  InBuffer.o \
++  OutBuffer.o \
++  FileStreams.o \
++  Alloc.o \
++  C_FileIO.o \
++  CommandLineParser.o \
++  CRC.o \
++  StreamUtils.o \
++  String.o \
++  StringConvert.o \
++  StringToInt.o \
++  Vector.o \
++
++
++all: $(PROG)
++
++$(PROG): $(OBJS)
++      $(AR) r $(PROG) $(OBJS)
++
++ZLib.o: ZLib.cpp
++      $(CXX) $(CFLAGS) ZLib.cpp
++
++LZMADecoder.o: ../LZMA/LZMADecoder.cpp
++      $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
++
++LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
++      $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
++
++LZInWindow.o: ../LZ/LZInWindow.cpp
++      $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
++
++LZOutWindow.o: ../LZ/LZOutWindow.cpp
++      $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
++
++RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
++      $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
++
++InBuffer.o: ../../Common/InBuffer.cpp
++      $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
++
++OutBuffer.o: ../../Common/OutBuffer.cpp
++      $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
++
++StreamUtils.o: ../../Common/StreamUtils.cpp
++      $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
++
++FileStreams.o: ../../Common/FileStreams.cpp
++      $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
++
++Alloc.o: ../../../Common/Alloc.cpp
++      $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
++
++C_FileIO.o: ../../../Common/C_FileIO.cpp
++      $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
++
++CommandLineParser.o: ../../../Common/CommandLineParser.cpp
++      $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
++
++CRC.o: ../../../Common/CRC.cpp
++      $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
++
++MyWindows.o: ../../../Common/MyWindows.cpp
++      $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
++
++String.o: ../../../Common/String.cpp
++      $(CXX) $(CFLAGS) ../../../Common/String.cpp
++
++StringConvert.o: ../../../Common/StringConvert.cpp
++      $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
++
++StringToInt.o: ../../../Common/StringToInt.cpp
++      $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
++
++Vector.o: ../../../Common/Vector.cpp
++      $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
++
++clean:
++      -$(RM) $(PROG) $(OBJS)
++
+diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp
+--- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp     1970-01-01 01:00:00.000000000 +0100
++++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp     2006-03-25 11:04:53.000000000 +0100
+@@ -0,0 +1,273 @@
 +/*\r
 + * lzma zlib simplified wrapper\r
 + *\r
 +/*\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
++ * Copyright (c) 2005-2006 Oleg I. Vdovikin <oleg@cs.msu.su>\r
 + *\r
 + * This library is free software; you can redistribute \r
 + * it and/or modify it under the terms of the GNU Lesser \r
 + *\r
 + * This library is free software; you can redistribute \r
 + * it and/or modify it under the terms of the GNU Lesser \r
@@ -284,9 +322,9 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
 +      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
-+      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest+4, (*destLen)-4);\r
++      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);\r
 +      CMyComPtr<ISequentialOutStream> outStream = outStreamSpec;\r
 +      CMyComPtr<ISequentialOutStream> outStream = outStreamSpec;\r
-+              \r
++      \r
 +      NCompress::NLZMA::CEncoder *encoderSpec = \r
 +              new NCompress::NLZMA::CEncoder;\r
 +      CMyComPtr<ICompressCoder> encoder = encoderSpec;\r
 +      NCompress::NLZMA::CEncoder *encoderSpec = \r
 +              new NCompress::NLZMA::CEncoder;\r
 +      CMyComPtr<ICompressCoder> encoder = encoderSpec;\r
@@ -307,12 +345,12 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +      PROPVARIANT properties[kNumProps];\r
 +      for (int p = 0; p < 6; p++)\r
 +              properties[p].vt = VT_UI4;\r
 +      PROPVARIANT properties[kNumProps];\r
 +      for (int p = 0; p < 6; p++)\r
 +              properties[p].vt = VT_UI4;\r
-+      properties[0].ulVal = UInt32(1 << 15);\r
++      properties[0].ulVal = UInt32(1 << (level + 14));\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[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(0);\r
-+      properties[5].ulVal = UInt32(0x28);\r
++      properties[4].ulVal = UInt32(2);\r
++      properties[5].ulVal = UInt32(128);\r
 +      \r
 +      properties[6].vt = VT_BSTR;\r
 +      properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4";\r
 +      \r
 +      properties[6].vt = VT_BSTR;\r
 +      properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4";\r
@@ -323,9 +361,6 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +      if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK)\r
 +              return Z_MEM_ERROR; // should not happen\r
 +      \r
 +      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
 +      HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0);\r
 +      if (result == E_OUTOFMEMORY)\r
 +      {\r
@@ -340,16 +375,13 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +      outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize);\r
 +      *destLen = fileSize;\r
 +      \r
 +      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
 +      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+9, sourceLen-9);\r
++      CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
 +      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);\r
 +      CMyComPtr<ISequentialInStream> inStream = inStreamSpec;\r
 +      \r
 +      COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen);\r
@@ -359,11 +391,8 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +              new NCompress::NLZMA::CDecoder;\r
 +      CMyComPtr<ICompressCoder> decoder = decoderSpec;\r
 +      \r
 +              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
-+      \r
-+      if (decoderSpec->SetDecoderProperties2(source+4, 5) != S_OK) \r
-+              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
 +      UInt64 fileSize = *destLen;\r
 +      \r
 +      \r
 +      UInt64 fileSize = *destLen;\r
 +      \r
@@ -377,39 +406,3 @@ diff -Nur lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma432-owrt/C/7zip/Compress
 +      \r
 +      return Z_OK;\r
 +}\r
 +      \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
Personal OpenWRT clone
This page took 0.036828 seconds and 4 git commands to generate.