New version (24.07)

3 files changed, 29 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b4cce1acf12..7285f825ea8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = 7-zip-full
 	pkgdesc = File archiver with a high compression ratio (full package to replace p7zip)
-	pkgver = 24.06
+	pkgver = 24.07
 	pkgrel = 1
 	url = https://7-zip.org/
 	arch = x86_64
@@ -11,17 +11,18 @@ pkgbase = 7-zip-full
 	license = BSD-3-Clause
 	license = LicenseRef-UnRAR
 	makedepends = uasm
+	depends = glibc
 	provides = 7-zip
 	provides = p7zip
 	provides = 7z.so
 	conflicts = p7zip
-	noextract = 7z2406-linux-x64.tar.xz
-	source = https://github.com/ip7z/7zip/archive/24.06/7zip-24.06.tar.gz
-	source = https://github.com/ip7z/7zip/releases/download/24.06/7z2406-linux-x64.tar.xz
+	noextract = 7z2407-linux-x64.tar.xz
+	source = https://github.com/ip7z/7zip/archive/24.07/7zip-24.07.tar.gz
+	source = https://github.com/ip7z/7zip/releases/download/24.07/7z2407-linux-x64.tar.xz
 	source = 01-make.patch
 	source = 02-lib-load-path.patch
-	sha256sums = 0e0d3e2b1baaba81d8b6f5d26e55152fdea4a2453d79ef2d96f3a31405f0ad46
-	sha256sums = 807bd858433b13215abc915cbb9ccdc806fc7b421418a4088a194e1729a6a6b2
+	sha256sums = 3c81290ecb0da2bc1dcf72301c009fbb7a2b3424497bbc9fdf38700d34d9b8c7
+	sha256sums = 4a47877a7f6eba7fe6c900f7379bb2061b9620b588cf3189d99ae2a8aaa8f503
 	sha256sums = f54dfe73ad045f200d5512dfd4387ef626068662a5af6e17d81052996544af54
 	sha256sums = 338b732445d3cfa416e40384bd9f0596506aa4b464b3f86aa971af4cfa6084c7
 
diff --git a/03-avx512-fix.patch b/03-avx512-fix.patch
deleted file mode 100644
index fe1071f7d2f9..000000000000
--- a/03-avx512-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/C/Blake2s.c
-+++ b/C/Blake2s.c
-@@ -1164,7 +1164,9 @@
- #if 1 && defined(Z7_BLAKE2S_USE_AVX512_ALWAYS)
-   #define MM256_ROR_EPI32  _mm256_ror_epi32
-   #define Z7_MM256_ROR_EPI32_IS_SUPPORTED
-+#ifdef Z7_BLAKE2S_USE_AVX2_WAY2
-   #define LOAD_ROTATE_CONSTS_256
-+#endif
- #else
- #ifdef Z7_BLAKE2S_USE_AVX2_WAY_SLOW
- #ifdef Z7_BLAKE2S_USE_AVX2_WAY2
-@@ -2548,7 +2550,7 @@
-   Z7_BLAKE2SP_FUNC_INIT func_Final = NULL;
- 
- #if defined(MY_CPU_X86_OR_AMD64)
--    #if defined(Z7_BLAKE2S_USE_AVX512_ALWAYS)
-+    #if 0 && defined(Z7_BLAKE2S_USE_AVX512_ALWAYS)
-       if (CPU_IsSupported_AVX512F_AVX512VL())
-     #endif
-     #if defined(Z7_BLAKE2S_USE_SSE41)
diff --git a/PKGBUILD b/PKGBUILD
index 67e710d49b23..7167fb692fff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 _name=7-zip
 pkgname=${_name}-full
-pkgver=24.06
+pkgver=24.07
 pkgrel=1
 pkgdesc='File archiver with a high compression ratio (full package to replace p7zip)'
 url='https://7-zip.org/'
@@ -8,6 +8,8 @@ license=('LGPL-2.1-or-later' 'BSD-3-Clause' 'LicenseRef-UnRAR')
 arch=('x86_64' 'i686' 'aarch64' 'armv7h')
 provides=("${_name}" 'p7zip' '7z.so')
 conflicts=('p7zip')
+
+depends=('glibc')
 makedepends=('uasm')
 
 _repo='7zip'
@@ -23,8 +25,8 @@ source=(
 )
 
 sha256sums=(
-    '0e0d3e2b1baaba81d8b6f5d26e55152fdea4a2453d79ef2d96f3a31405f0ad46'
-    '807bd858433b13215abc915cbb9ccdc806fc7b421418a4088a194e1729a6a6b2'
+    '3c81290ecb0da2bc1dcf72301c009fbb7a2b3424497bbc9fdf38700d34d9b8c7'
+    '4a47877a7f6eba7fe6c900f7379bb2061b9620b588cf3189d99ae2a8aaa8f503'
     'f54dfe73ad045f200d5512dfd4387ef626068662a5af6e17d81052996544af54'
     '338b732445d3cfa416e40384bd9f0596506aa4b464b3f86aa971af4cfa6084c7'
 )
@@ -45,13 +47,24 @@ _make() {
 }
 
 _build() {
-    local -A platforms=(['x86_64']='x64' ['i686']='x86' ['aarch64']='arm64' ['armv7h']='arm')
-
     set -a
-    PLATFORM="${platforms["${CARCH}"]}"
-    [ "${CARCH}" = 'x86_64' ] && IS_X64=1
-    [ "${CARCH}" = 'i686' ] && IS_X86=1
-    [ "${CARCH}" = 'aarch64' ] && IS_ARM64=1
+    case "${CARCH}" in
+        'x86_64')
+            PLATFORM='x64'
+            IS_X64=1
+            ;;
+        'i686')
+            PLATFORM='x86'
+            IS_X86=1
+            ;;
+        'aarch64')
+            PLATFORM='arm64'
+            IS_ARM64=1
+            ;;
+        'armv7h')
+            PLATFORM='arm'
+            ;;
+    esac
     USE_ASM=1
     CFLAGS_WARN='-Wno-error'
     CFLAGS_USER="${CFLAGS}"