update to lzma-4.32.7

This commit is contained in:
Stephan Raue 2009-07-20 02:10:58 +02:00
parent 9de2f04da9
commit 36068ef268
6 changed files with 11 additions and 78 deletions

View File

@ -5,6 +5,11 @@
$SCRIPTS/install ccache
setup_toolchain host
CC=$LOCAL_CC
LZDIR=$PKG_BUILD/CPP/7zip/Compress/LZMA_Alone
make -C $LZDIR -f makefile.gcc CXX="$CXX $CFLAGS" CXX_C="$CC $CFLAGS"
cd $PKG_BUILD
./configure --host=$HOST_NAME \
--build=$HOST_NAME \
--prefix=$ROOT/$TOOLCHAIN
make

View File

@ -3,4 +3,4 @@
. config/options
mkdir -p $ROOT/$TOOLCHAIN/bin
cp -rf $PKG_BUILD/CPP/7zip/Compress/LZMA_Alone/lzma $ROOT/$TOOLCHAIN/bin
cp -rf $PKG_BUILD/src/$1/$1 $ROOT/$TOOLCHAIN/bin

View File

@ -1,71 +0,0 @@
--- lzma-4.57/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp.orig 2008-03-12 19:18:07.000000000 +0100
+++ lzma-4.57/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp 2008-03-12 19:20:06.000000000 +0100
@@ -26,7 +26,6 @@
#include "../LZMA/LZMAEncoder.h"
#include "LzmaBenchCon.h"
-#include "LzmaRam.h"
#ifdef COMPRESS_MF_MT
#include "../../../Windows/System.h"
@@ -36,7 +35,6 @@
extern "C"
{
-#include "LzmaRamDecode.h"
}
using namespace NCommandLineParser;
@@ -74,7 +72,6 @@
kEOS,
kStdIn,
kStdOut,
- kFilter86
};
}
@@ -94,7 +91,6 @@
{ L"EOS", NSwitchType::kSimple, false },
{ L"SI", NSwitchType::kSimple, false },
{ L"SO", NSwitchType::kSimple, false },
- { L"F86", NSwitchType::kPostChar, false, 0, 0, L"+" }
};
static const int kNumSwitches = sizeof(kSwitchForms) / sizeof(kSwitchForms[0]);
@@ -299,6 +295,7 @@
}
}
+#if 0
if (parser[NKey::kFilter86].ThereIs)
{
// -f86 switch is for x86 filtered mode: BCJ + LZMA.
@@ -366,6 +363,7 @@
MyFree(inBuffer);
return 0;
}
+#endif
UInt64 fileSize;
--- lzma-4.57/CPP/7zip/Compress/LZMA_Alone/makefile.gcc.orig 2008-03-12 19:17:56.000000000 +0100
+++ lzma-4.57/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2008-03-12 19:18:25.000000000 +0100
@@ -22,7 +22,6 @@
LzmaAlone.o \
LzmaBench.o \
LzmaBenchCon.o \
- LzmaRam.o \
LZMADecoder.o \
LZMAEncoder.o \
LZOutWindow.o \
@@ -41,10 +40,8 @@
MyVector.o \
7zCrc.o \
Alloc.o \
- BranchX86.o \
MatchFinder.o \
LzmaDecode.o \
- LzmaRamDecode.o \
all: $(PROG)

View File

@ -1 +1 @@
http://sources.openelec.tv/svn/lzma-4.57.tar.bz2
http://tukaani.org/lzma/lzma-4.32.7.tar.gz

View File

@ -1 +0,0 @@
http://sources.openelec.tv/svn/lzma-4.63.tar.bz2

View File

@ -57,7 +57,7 @@ case "$2" in
$SCRIPTS/install gst-plugins-bad
$SCRIPTS/install gst-plugins-ugly
# $SCRIPTS/install gst-ffmpeg
$SCRIPTS/install gnome-dvb-daemon
# $SCRIPTS/install gnome-dvb-daemon
# if [ "$BOOTCHART" = yes ]; then
# $SCRIPTS/install acct
@ -85,7 +85,7 @@ case "$2" in
#[ "$EXTRAFIRMWARES" = yes ] && $SCRIPTS/install extra-firmwares-nonfree $1
mkdir -p $INSTALL/usr/config
tar cf - -C $INSTALL etc | lzma e $INSTALL/usr/config/etc.tar.lzma -si -a2
tar cf - -C $INSTALL etc | lzma -9 -v > $INSTALL/usr/config/etc.tar.lzma
rm -rf $INSTALL/etc
ln -sf /var/etc $INSTALL/etc