Release 1.5.0

Author: Oleh Kulykov

.github/workflows/cmake-mingw.yml

@@ -81,3 +81,4 @@ jobs:
       shell: bash
       working-directory: ${{ steps.strings.outputs.build-output-dir }}
       run: tar -cJvf ${{ steps.strings.outputs.build-artifacts-name }}.tar.xz ${{ steps.strings.outputs.build-artifacts-name }}
+

.github/workflows/cmake-multi-platform.yml

@@ -94,3 +94,4 @@ jobs:
       run: |
         pwd
         ls -lhR
+

.github/workflows/nodejs-multi-platform.yml

@@ -22,3 +22,4 @@ jobs:
         uses: actions/setup-node@v4
       - run: npm run install
       - run: npm run test
+

.github/workflows/swift-multi-platform.yml

@@ -25,3 +25,4 @@ jobs:
         run: swift build
       - name: Run tests
         run: swift test
+

CHANGELOG

@@ -1,6 +1,9 @@
 (Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma
 
-1.4.9: (current):
+1.5.0: (current):
+- Update of the underlying code.
+
+1.4.9:
 - Adopt Pod Specs to use resource bundles.
 
 1.4.8:

CMakeLists.txt

@@ -25,19 +25,23 @@
 
 cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 
-project(libplzma LANGUAGES C CXX)
+if (WIN32)
+  project(libplzma LANGUAGES C CXX)
+else()
+  project(libplzma LANGUAGES ASM C CXX)
+endif()
 
 set(CMAKE_CXX_STANDARD 11)
 
 set(PACKAGE "libplzma")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "4")
-set(CPACK_PACKAGE_VERSION_PATCH "9")
+set(CPACK_PACKAGE_VERSION_MINOR "5")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VENDOR "olehkulykov@gmail.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "1.4.9")
+set(SOVERSION "1.5.0")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 set(VERSION "${CPACK_PACKAGE_VERSION}")
 
@@ -632,6 +636,13 @@ if(NOT LIBPLZMA_OPT_NO_TAR)
   )
 endif()
 
+if (NOT WIN32)
+    list(APPEND LIBPLZMA_SOURCES
+      src/Asm/arm64/7zAsm.S
+      src/Asm/arm64/LzmaDecOpt.S
+    )
+endif()
+
 # ---- groups(headers and sources) ----
 # ---- grop: public headers and sources ----
 source_group("public"
@@ -681,6 +692,12 @@ source_group("src"
 )
 
 # ---- grop: Lzma C headers and sources ----
+source_group("Asm"
+  FILES
+  src/Asm/arm64/7zAsm.S
+  src/Asm/arm64/LzmaDecOpt.S
+)
+
 source_group("C"
   FILES
   src/C/7z.h

PLzmaSDK-ObjC.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'PLzmaSDK-ObjC'
-  s.version = '1.4.9'
+  s.version = '1.5.0'
   s.summary = '(Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma'
   s.homepage = 'https://github.com/OlehKulykov/PLzmaSDK'
   s.source = { :git => s.homepage + '.git', :tag => s.version }
@@ -14,9 +14,9 @@ Pod::Spec.new do |s|
     'PLzmaSDK_Privacy' => ['resources/PrivacyInfo.xcprivacy'],
   }
 
-  s.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp}', 'objc/*.{mm,h,inl}'
+  s.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp,S}', 'objc/*.{mm,h,inl}'
   s.public_header_files = 'objc/*.h'
-  s.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1174', '-DLIBPLZMA_NO_C_BINDINGS=1'
+  s.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1198', '-DLIBPLZMA_NO_C_BINDINGS=1'
   s.libraries = 'c++'
   s.requires_arc = true
 

PLzmaSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'PLzmaSDK'
-  s.version = '1.4.9'
+  s.version = '1.5.0'
   s.summary = '(Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma'
   s.homepage = 'https://github.com/OlehKulykov/PLzmaSDK'
   s.source = { :git => s.homepage + '.git', :tag => s.version }
@@ -16,9 +16,9 @@ Pod::Spec.new do |s|
   }
 
   s.subspec 'libplzma' do |libplzma|
-    libplzma.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp}'
+    libplzma.source_files = 'libplzma.h', 'libplzma.hpp', 'src/**/*.{c,cpp,h,hpp,S}'
     libplzma.public_header_files = 'libplzma.h'
-    libplzma.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1174'
+    libplzma.compiler_flags = '-fPIC -fno-rtti -DLIBPLZMA_VERSION_BUILD=1198'
     libplzma.libraries = 'c++'
   end
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.4
 
 import PackageDescription
 
@@ -13,11 +13,11 @@ let package = Package(
         .target(name: "libplzma",
                 path: "src",
                 cSettings: [
-                    .define("LIBPLZMA_VERSION_BUILD", to: "1174"),
+                    .define("LIBPLZMA_VERSION_BUILD", to: "1198"),
                     .unsafeFlags(["-fPIC"])
                 ],
                 cxxSettings: [
-                    .define("LIBPLZMA_VERSION_BUILD", to: "1174"),
+                    .define("LIBPLZMA_VERSION_BUILD", to: "1198"),
                     .unsafeFlags(["-fPIC", "-fno-rtti"])
                 ]),
         .target(name: "PLzmaSDK",

README.md

@@ -10,7 +10,7 @@
 
 
 **P**LzmaSDK is (**P**ortable, **P**atched, **P**ackage, cross-**P**-latform) Lzma SDK.
-Based on original [LZMA SDK] version 24.08 and patched for unix platforms.
+Based on original [LZMA SDK] version 24.09 and patched for unix platforms.
 Available for all Apple's platforms(iOS, macOS, tvOS, watchOS), Android, Windows, Linux and any unix'es.
 
 
@@ -55,7 +55,7 @@ All optional features are enabled by default, but they might be disabled during
 -----------
 #### Swift Package Manager
 ```swift
-.package(url: "https://github.com/OlehKulykov/PLzmaSDK.git", .exact("1.4.9"))
+.package(url: "https://github.com/OlehKulykov/PLzmaSDK.git", .exact("1.5.0"))
 ```
 
 #### CocoaPods Podfile (Swift)
@@ -64,7 +64,7 @@ use_frameworks!
 platform :ios, '11.0'
 
 target '<REPLACE_WITH_YOUR_TARGET>' do
-    pod 'PLzmaSDK', '1.4.9'
+    pod 'PLzmaSDK', '1.5.0'
 end
 ```
 
@@ -74,7 +74,7 @@ use_frameworks!
 platform :ios, '9.0'
 
 target '<REPLACE_WITH_YOUR_TARGET>' do
-    pod 'PLzmaSDK-ObjC', '1.4.9'
+    pod 'PLzmaSDK-ObjC', '1.5.0'
 end
 ```
 
@@ -86,7 +86,7 @@ end
     "npm": ">=6.0.0"
   },
   "dependencies": {
-    "plzmasdk": "1.4.9"
+    "plzmasdk": "1.5.0"
   }
 }
 ```

android/jni/Android.mk

@@ -2,6 +2,8 @@ LOCAL_PATH:= $(call my-dir)
 
 
 ALL_SOURCES := \
+	../../src/Asm/arm64/7zAsm.S \
+	../../src/Asm/arm64/LzmaDecOpt.S \
     ../../src/C/7zCrc.c \
     ../../src/C/7zCrcOpt.c \
     ../../src/C/7zStream.c \
@@ -157,7 +159,7 @@ ALL_INCLUDES := $(LOCAL_PATH)/../../../
 ALL_CFLAGS := \
     -DLIBPLZMA_BUILD=1 \
     -DLIBPLZMA_SHARED=1 \
-    -DLIBPLZMA_VERSION_BUILD=1174 \
+    -DLIBPLZMA_VERSION_BUILD=1198 \
     -w
 
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.4.9.{build}
+version: 1.5.0.{build}
 
 
 os: Visual Studio 2019

binding.gyp

@@ -3,14 +3,16 @@
     {
       'target_name': 'plzmasdk',
       'defines': [
-        'LIBPLZMA_VERSION_BUILD=1174',
+        'LIBPLZMA_VERSION_BUILD=1198',
         'LIBPLZMA_SHARED=1',
         'LIBPLZMA_NO_C_BINDINGS=1',
         'LIBPLZMA_HAVE_STD=1',
         'LIBPLZMA_NO_CPP_RTTI=1'
       ],
       'sources': [
         'node/module.cpp',
+        'src/Asm/arm64/7zAsm.S',
+        'src/Asm/arm64/LzmaDecOpt.S',
         'src/C/7zCrc.c',
         'src/C/7zCrcOpt.c',
         'src/C/7zStream.c',

build.gradle

@@ -19,10 +19,10 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 1
-        versionName "1.4.9"
+        versionName "1.5.0"
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DLIBCLZMA_OPT_ANDROID:BOOL=ON", "-DLIBCLZMA_OPT_STATIC:BOOL=OFF", "-DLIBCLZMA_OPT_TESTS:BOOL=OFF", "-DLIBCLZMA_OPT_BUILD_NUMBER=1174"
+                arguments "-DANDROID_STL=c++_static", "-DANDROID_TOOLCHAIN=clang", "-DLIBCLZMA_OPT_ANDROID:BOOL=ON", "-DLIBCLZMA_OPT_STATIC:BOOL=OFF", "-DLIBCLZMA_OPT_TESTS:BOOL=OFF", "-DLIBCLZMA_OPT_BUILD_NUMBER=1198"
                 cppFlags "-fexceptions"
             }
         }

cmake_tests/CMakeLists.txt

@@ -120,4 +120,3 @@ foreach(LIBPLZMA_TEST ${LIBPLZMA_TESTS})
   # install(TARGETS ${LIBPLZMA_TEST} DESTINATION bin)
   # install(TARGETS "${LIBPLZMA_TEST}_static" DESTINATION bin)
 endforeach()
-

libplzma.h

@@ -44,13 +44,13 @@
 /// and all optional C bindings to the internal C++ part(Core) of the library.
 /// Everything what you need to use this library in C | Objective-C | Swift env. is here.
 
-/// @brief Manualy defined version of the library, i.e. 1.4.9
+/// @brief Manualy defined version of the library, i.e. 1.5.0
 /// The optinal \a LIBPLZMA_VERSION_BUILD might be befined by the CI or CMake or manualy.
 /// Conforms 'Semantic Versioning 2.0.0'.
 /// @link https://semver.org
 #define LIBPLZMA_VERSION_MAJOR 1
-#define LIBPLZMA_VERSION_MINOR 4
-#define LIBPLZMA_VERSION_PATCH 9
+#define LIBPLZMA_VERSION_MINOR 5
+#define LIBPLZMA_VERSION_PATCH 0
 
 // Check Windows
 #if defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(WIN64) || defined(WIN32_LEAN_AND_MEAN)

node_tests/tests.js

@@ -1,4 +1,4 @@
-
+
 'use strict';
 
 const plzma = require('./../');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plzmasdk",
-  "version": "1.4.9",
+  "version": "1.5.0",
   "description": "(Portable, Patched, Package, cross-P-latform) Lzma SDK, libplzma",
   "author": "Oleh Kulykov <olehkulykov@gmail.com>",
   "license": "SEE LICENSE IN LICENSE",