aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lzma
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-02-21 14:46:03 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-02-21 14:46:03 +0000
commit9344a58871154a7ba78e49530aa585f5c1512433 (patch)
tree3a6accbcab928d5202ead91a7471c69ac2e7f6b8 /tools/lzma
parentdbf25a33d712bd432d9d0d2953d77238027eea02 (diff)
downloadupstream-9344a58871154a7ba78e49530aa585f5c1512433.tar.gz
upstream-9344a58871154a7ba78e49530aa585f5c1512433.tar.bz2
upstream-9344a58871154a7ba78e49530aa585f5c1512433.zip
tools: refresh patches for tools
lua, mtd-utils, ipkg-utils, squashfs, lzma, and autoconf are touched git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14589 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/lzma')
-rw-r--r--tools/lzma/patches/100-lzma_zlib.patch24
-rw-r--r--tools/lzma/patches/110-ranlib.patch8
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 3672a0efbd..b86bcdd3fe 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)