diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 14:46:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 14:46:03 +0000 |
| commit | 3849a57cd7cb47e30a506222779916eebdbb28fb (patch) | |
| tree | 8120e3eb5627aa21521327954bcbecbf96551c21 /tools/lzma | |
| parent | d0484c4cf651fc0f08bbd1a902417687a3d7f0ff (diff) | |
| download | upstream-3849a57cd7cb47e30a506222779916eebdbb28fb.tar.gz upstream-3849a57cd7cb47e30a506222779916eebdbb28fb.tar.bz2 upstream-3849a57cd7cb47e30a506222779916eebdbb28fb.zip | |
tools: refresh patches for tools lua, mtd-utils, ipkg-utils, squashfs, lzma, and autoconf are touched
SVN-Revision: 14589
Diffstat (limited to 'tools/lzma')
| -rw-r--r-- | tools/lzma/patches/100-lzma_zlib.patch | 24 | ||||
| -rw-r--r-- | tools/lzma/patches/110-ranlib.patch | 8 |
2 files changed, 13 insertions, 19 deletions
diff --git a/tools/lzma/patches/100-lzma_zlib.patch b/tools/lzma/patches/100-lzma_zlib.patch index 7121053444..7436cfe515 100644 --- a/tools/lzma/patches/100-lzma_zlib.patch +++ b/tools/lzma/patches/100-lzma_zlib.patch @@ -1,7 +1,6 @@ -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 @@ +--- a/C/7zip/Compress/LZMA/LZMADecoder.cpp ++++ b/C/7zip/Compress/LZMA/LZMADecoder.cpp +@@ -274,12 +274,17 @@ STDMETHODIMP CDecoder::SetDecoderPropert Byte remainder = (Byte)(properties[0] / 9); int lp = remainder % 5; int pb = remainder / 5; @@ -22,10 +21,9 @@ diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress if (!_outWindowStream.Create(dictionarySize)) return E_OUTOFMEMORY; if (!_literalDecoder.Create(lp, lc)) -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 @@ +--- a/C/7zip/Compress/LZMA/LZMADecoder.h ++++ b/C/7zip/Compress/LZMA/LZMADecoder.h +@@ -228,6 +228,7 @@ public: ICompressProgressInfo *progress); STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); @@ -33,9 +31,8 @@ diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/L STDMETHOD(GetInStreamProcessedSize)(UInt64 *value); -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 +--- /dev/null ++++ b/C/7zip/Compress/LZMA_Lib/makefile @@ -0,0 +1,92 @@ +PROG = liblzma.a +CXX = g++ -O3 -Wall @@ -129,9 +126,8 @@ diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZ +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 +--- /dev/null ++++ b/C/7zip/Compress/LZMA_Lib/ZLib.cpp @@ -0,0 +1,273 @@ +/* + * lzma zlib simplified wrapper diff --git a/tools/lzma/patches/110-ranlib.patch b/tools/lzma/patches/110-ranlib.patch index 22bf5031f3..813b4137f1 100644 --- a/tools/lzma/patches/110-ranlib.patch +++ b/tools/lzma/patches/110-ranlib.patch @@ -1,8 +1,6 @@ -Index: lzma/C/7zip/Compress/LZMA_Lib/makefile -=================================================================== ---- lzma.orig/C/7zip/Compress/LZMA_Lib/makefile 2007-12-02 23:37:08.000000000 +0100 -+++ lzma/C/7zip/Compress/LZMA_Lib/makefile 2007-12-02 23:38:40.000000000 +0100 -@@ -29,6 +29,7 @@ +--- a/C/7zip/Compress/LZMA_Lib/makefile ++++ b/C/7zip/Compress/LZMA_Lib/makefile +@@ -29,6 +29,7 @@ all: $(PROG) $(PROG): $(OBJS) $(AR) r $(PROG) $(OBJS) |