From 050961bf43e5dcb13cd4d56c073c6c3e0e93797a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Mon, 7 Dec 2020 20:54:59 +0100 Subject: [PATCH] libs: add xz-embedded lzma decoding library Using a mirror, because CI had problems cloning from the original source: gnutls_handshake() failed: Handshake failed --- .gitmodules | 3 +++ QGCExternalLibs.pri | 18 ++++++++++++++++++ libs/xz-embedded | 1 + 3 files changed, 22 insertions(+) create mode 160000 libs/xz-embedded diff --git a/.gitmodules b/.gitmodules index 79def16..c41ef18 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "libs/qmlglsink/gst-plugins-good"] path = libs/qmlglsink/gst-plugins-good url = https://github.com/mavlink/gst-plugins-good.git +[submodule "libs/xz-embedded"] + path = libs/xz-embedded + url = https://github.com/Auterion/xz-embedded.git diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 2fb878d..0dff29c 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -119,6 +119,24 @@ WindowsBuild { } # +# [REQUIRED] LZMA decompression library +HEADERS+= \ + libs/xz-embedded/linux/include/linux/xz.h \ + libs/xz-embedded/linux/lib/xz/xz_lzma2.h \ + libs/xz-embedded/linux/lib/xz/xz_private.h \ + libs/xz-embedded/linux/lib/xz/xz_stream.h \ + libs/xz-embedded/userspace/xz_config.h +SOURCES += \ + libs/xz-embedded/linux/lib/xz/xz_crc32.c \ + libs/xz-embedded/linux/lib/xz/xz_crc64.c \ + libs/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \ + libs/xz-embedded/linux/lib/xz/xz_dec_stream.c +INCLUDEPATH += \ + libs/xz-embedded/userspace \ + libs/xz-embedded/linux/include/linux +DEFINES += XZ_DEC_ANY_CHECK XZ_USE_CRC64 + +# # [REQUIRED] SDL dependency. Provides joystick/gamepad support. # The SDL is packaged with QGC for the Mac and Windows. Linux support requires installing the SDL # library (development libraries and static binaries). diff --git a/libs/xz-embedded b/libs/xz-embedded new file mode 160000 index 0000000..090e6a0 --- /dev/null +++ b/libs/xz-embedded @@ -0,0 +1 @@ +Subproject commit 090e6a054d6283b144d20f5783852b95eade90ee