jengelh/lzma-sdk
SHA256
1
0
Fork 0
forked from pool/lzma-sdk
Code Pull Requests Activity

Accepting request 494629 from home:alois:branches:multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/494629
OBS-URL: https://build.opensuse.org/package/show/Archiving/lzma-sdk?expand=0&rev=2
This commit is contained in:
Martin Pluskal 2017-05-11 13:52:33 +00:00 committed by Git OBS Bridge
parent 587b0a97f0
commit dea12fa92e
2 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lzma-sdk-16.04-sharedlib.patch
View File

@ -396,13 +396,16 @@ Index: lzma1604/CPP/7zip/Bundles/LzmaCon/makefile.gcc
ifdef SystemDrive
IS_MINGW = 1
@@ -72,10 +73,10 @@ OBJS = \
@@ -70,12 +71,12 @@ OBJS = \
LzmaEnc.o \
Lzma86Dec.o \
Lzma86Enc.o \
+ LzmaLib.o \
-all: $(PROG)
+all: $(LIBRARYMAJOR)
-all: $(PROG)
-
-$(PROG): $(OBJS)
- $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB2)
+$(LIBRARYMAJOR): $(OBJS)
@ -410,10 +413,68 @@ Index: lzma1604/CPP/7zip/Bundles/LzmaCon/makefile.gcc
LzmaAlone.o: LzmaAlone.cpp
$(CXX) $(CFLAGS) LzmaAlone.cpp
@@ -192,4 +193,5 @@ Lzma86Enc.o: ../../../../C/Lzma86Enc.c
@@ -191,5 +192,9 @@ Lzma86Dec.o: ../../../../C/Lzma86Dec.c
Lzma86Enc.o: ../../../../C/Lzma86Enc.c
$(CXX_C) $(CFLAGS) ../../../../C/Lzma86Enc.c
+LzmaLib.o: ../../../../C/LzmaLib.c
+ $(CXX_C) $(CFLAGS) ../../../../C/LzmaLib.c
+
clean:
- -$(RM) $(PROG) $(OBJS)
+ -$(RM) $(LIBRARYMAJOR) $(OBJS)
+
Index: lzma1604/C/7zCrc.h
===================================================================
--- lzma1604.orig/C/7zCrc.h
+++ lzma1604/C/7zCrc.h
@@ -19,6 +19,11 @@ void MY_FAST_CALL CrcGenerateTable(void)
UInt32 MY_FAST_CALL CrcUpdate(UInt32 crc, const void *data, size_t size);
UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size);
+UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const UInt32 *table);
+#ifndef MY_CPU_BE
+ UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void *data, size_t size, const UInt32 *table);
+ UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
+#endif
EXTERN_C_END
Index: lzma1604/C/7zCrcOpt.c
===================================================================
--- lzma1604.orig/C/7zCrcOpt.c
+++ lzma1604/C/7zCrcOpt.c
@@ -7,6 +7,8 @@
#ifndef MY_CPU_BE
+EXTERN_C_BEGIN
+
#define CRC_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void *data, size_t size, const UInt32 *table)
@@ -54,6 +56,8 @@ UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v
return v;
}
+EXTERN_C_END
+
#endif
Index: lzma1604/C/7zCrc.c
===================================================================
--- lzma1604.orig/C/7zCrc.c
+++ lzma1604/C/7zCrc.c
@@ -19,11 +19,6 @@
UInt32 MY_FAST_CALL CrcUpdateT1_BeT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
#endif
-#ifndef MY_CPU_BE
- UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void *data, size_t size, const UInt32 *table);
- UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void *data, size_t size, const UInt32 *table);
-#endif
-
typedef UInt32 (MY_FAST_CALL *CRC_FUNC)(UInt32 v, const void *data, size_t size, const UInt32 *table);
CRC_FUNC g_CrcUpdateT4;

7
lzma-sdk.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 11 06:30:24 UTC 2017 - aloisio@gmx.com
- Refreshed lzma-sdk-16.04-sharedlib.patch to add source to
the library to have extra functions and exported extra
symbols
-------------------------------------------------------------------
Fri Mar 17 09:25:07 UTC 2017 - aloisio@gmx.com