oasis

commit: bbe8d3b803ff68dc5eb1bdc846b2e3cc072cde0f
parent dc7887f6b8c35a599e203052a0bcda0ea6a2e1d9
Author: hovercats <hovercatswithlasereyes@protonmail.com>
Date:   Fri,  5 Jan 2024 01:31:31 +0100

xz: 5.4.6

Diffstat:
A
pkg/xz/README.md
10
++++++++++
M
pkg/xz/config.h
98
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
M
pkg/xz/gen.lua
11
+++++++++--
M
pkg/xz/ver
2
+-
A
probe/HAVE__MM_CLMULEPI64_SI128
7
+++++++
A
probe/HAVE___BUILTIN_BSWAP16
4
++++
M
probe/gen.lua
2
++

7 files changed, 108 insertions(+), 26 deletions(-)
diff --git a/pkg/xz/README.md b/pkg/xz/README.md
@@ -0,0 +1,10 @@
+# xz
+
+## config.h
+Generated with
+```
+./configure \
+	--disable-nls \
+	--disable-lzip-decoder \
+	--disable-microlzma
+```
diff --git a/pkg/xz/config.h b/pkg/xz/config.h
@@ -1,26 +1,26 @@
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 #define ASSUME_RAM 128
 /* #undef ENABLE_NLS */
-#define HAVE_BSWAP_16 1
-#define HAVE_BSWAP_32 1
-#define HAVE_BSWAP_64 1
-#define HAVE_BYTESWAP_H 1
+/* #undef HAVE_BSWAP_16 */
+/* #undef HAVE_BSWAP_32 */
+/* #undef HAVE_BSWAP_64 */
+/* #undef HAVE_BYTESWAP_H */
 /* #undef HAVE_CAPSICUM */
 /* #undef HAVE_CC_SHA256_CTX */
 /* #undef HAVE_CC_SHA256_INIT */
-/* #undef HAVE_CFLOCALECOPYCURRENT */
 /* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 #define HAVE_CHECK_CRC32 1
 #define HAVE_CHECK_CRC64 1
 #define HAVE_CHECK_SHA256 1
 #define HAVE_CLOCK_GETTIME 1
+#define HAVE_CLOCK_MONOTONIC 1
 /* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+#define HAVE_CPUID_H 1
 /* #undef HAVE_DCGETTEXT */
-#define HAVE_DECL_CLOCK_MONOTONIC 1
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
 #define HAVE_DECODERS 1
 #define HAVE_DECODER_ARM 1
+#define HAVE_DECODER_ARM64 1
 #define HAVE_DECODER_ARMTHUMB 1
 #define HAVE_DECODER_DELTA 1
 #define HAVE_DECODER_IA64 1
@@ -32,6 +32,7 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_ENCODERS 1
 #define HAVE_ENCODER_ARM 1
+#define HAVE_ENCODER_ARM64 1
 #define HAVE_ENCODER_ARMTHUMB 1
 #define HAVE_ENCODER_DELTA 1
 #define HAVE_ENCODER_IA64 1
@@ -41,6 +42,7 @@
 #define HAVE_ENCODER_SPARC 1
 #define HAVE_ENCODER_X86 1
 #define HAVE_FCNTL_H 1
+#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1
 #define HAVE_FUTIMENS 1
 /* #undef HAVE_FUTIMES */
 /* #undef HAVE_FUTIMESAT */
@@ -51,15 +53,18 @@
 /* probe HAVE_IMMINTRIN_H */
 #define HAVE_INTTYPES_H 1
 #define HAVE_LIMITS_H 1
+/* #undef HAVE_LZIP_DECODER */
 #define HAVE_MBRTOWC 1
-#define HAVE_MEMORY_H 1
 #define HAVE_MF_BT2 1
 #define HAVE_MF_BT3 1
 #define HAVE_MF_BT4 1
 #define HAVE_MF_HC3 1
 #define HAVE_MF_HC4 1
+/* #undef HAVE_MINIX_CONFIG_H */
 #define HAVE_OPTRESET 1
+/* #undef HAVE_PLEDGE */
 #define HAVE_POSIX_FADVISE 1
+#define HAVE_PROGRAM_INVOCATION_NAME 1
 #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
 #define HAVE_PTHREAD_PRIO_INHERIT 1
 /* #undef HAVE_SHA256INIT */
@@ -71,6 +76,7 @@
 /* #undef HAVE_SMALL */
 #define HAVE_STDBOOL_H 1
 #define HAVE_STDINT_H 1
+#define HAVE_STDIO_H 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRINGS_H 1
 #define HAVE_STRING_H 1
@@ -79,6 +85,7 @@
 /* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */
 #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
 /* #undef HAVE_STRUCT_STAT_ST_UATIME */
+/* #undef HAVE_SYMBOL_VERSIONS_LINUX */
 /* #undef HAVE_SYS_BYTEORDER_H */
 /* #undef HAVE_SYS_CAPSICUM_H */
 /* #undef HAVE_SYS_ENDIAN_H */
@@ -88,27 +95,33 @@
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_UINTPTR_T 1
 #define HAVE_UNISTD_H 1
+#ifdef HAVE__MM_CLMULEPI64_SI128 /* probe */
+# define HAVE_USABLE_CLMUL 1
+#endif
 /* #undef HAVE_UTIME */
 /* #undef HAVE_UTIMES */
 #define HAVE_VISIBILITY 1
+#define HAVE_WCHAR_H 1
 #define HAVE_WCWIDTH 1
 #define HAVE__BOOL 1
 /* #undef HAVE__FUTIME */
 /* probe HAVE__MM_MOVEMASK_EPI8 */
 /* probe HAVE___BUILTIN_ASSUME_ALIGNED */
-/* #undef HAVE___BUILTIN_BSWAPXX */
+#ifdef HAVE___BUILTIN_BSWAP16 /* probe */
+# define HAVE___BUILTIN_BSWAPXX 1
+#endif
 #define LT_OBJDIR ".libs/"
 #define MYTHREAD_POSIX 1
 /* #undef MYTHREAD_VISTA */
 /* #undef MYTHREAD_WIN95 */
 #define NDEBUG 1
 #define PACKAGE "xz"
-#define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
+#define PACKAGE_BUGREPORT "xz@tukaani.org"
 #define PACKAGE_NAME "XZ Utils"
-#define PACKAGE_STRING "XZ Utils 5.2.5"
+#define PACKAGE_STRING "XZ Utils 5.4.6"
 #define PACKAGE_TARNAME "xz"
-#define PACKAGE_URL "https://tukaani.org/xz/"
-#define PACKAGE_VERSION "5.2.5"
+#define PACKAGE_URL "https://xz.tukaani.org/xz-utils/"
+#define PACKAGE_VERSION "5.4.6"
 /* #undef PTHREAD_CREATE_JOINABLE */
 /* probe SIZEOF_SIZE_T */
 #define STDC_HEADERS 1
@@ -117,7 +130,7 @@
 #define TUKLIB_CPUCORES_SCHED_GETAFFINITY 1
 /* #undef TUKLIB_CPUCORES_SYSCONF */
 /* #undef TUKLIB_CPUCORES_SYSCTL */
-/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */
+#define TUKLIB_FAST_UNALIGNED_ACCESS 1
 /* #undef TUKLIB_PHYSMEM_AIX */
 /* #undef TUKLIB_PHYSMEM_GETINVENT_R */
 /* #undef TUKLIB_PHYSMEM_GETSYSINFO */
@@ -129,19 +142,64 @@
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
 #endif
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1
 #endif
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # define _POSIX_PTHREAD_SEMANTICS 1
 #endif
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
 #ifndef _TANDEM_SOURCE
 # define _TANDEM_SOURCE 1
 #endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
 #endif
-#define VERSION "5.2.5"
+#define VERSION "5.4.6"
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
@@ -151,14 +209,8 @@
 /* #  undef WORDS_BIGENDIAN */
 # endif
 #endif
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
 /* #undef _FILE_OFFSET_BITS */
 /* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
 /* #undef _UINT32_T */
 /* #undef _UINT64_T */
 /* #undef _UINT8_T */
diff --git a/pkg/xz/gen.lua b/pkg/xz/gen.lua
@@ -13,11 +13,13 @@ cflags{
 }
 
 build('cat', '$outdir/config.h', {
-	'$dir/config.h',
 	'$builddir/probe/HAVE_IMMINTRIN_H',
+	'$builddir/probe/HAVE__MM_CLMULEPI64_SI128',
 	'$builddir/probe/HAVE__MM_MOVEMASK_EPI8',
 	'$builddir/probe/HAVE___BUILTIN_ASSUME_ALIGNED',
+	'$builddir/probe/HAVE___BUILTIN_BSWAP16',
 	'$builddir/probe/SIZEOF_SIZE_T',
+	'$dir/config.h',
 })
 pkg.deps = {'$outdir/config.h'}
 
@@ -43,9 +45,11 @@ lib('liblzma.a', [[src/(
 			hardware_physmem.c
 			index.c
 			stream_flags_common.c
+			string_conversion.c
 			vli_size.c
 
 			hardware_cputhreads.c
+			outqueue.c
 
 			alone_encoder.c
 			block_buffer_encoder.c
@@ -63,7 +67,6 @@ lib('liblzma.a', [[src/(
 			stream_flags_encoder.c
 			vli_encoder.c
 
-			outqueue.c
 			stream_encoder_mt.c
 
 			alone_decoder.c
@@ -72,6 +75,7 @@ lib('liblzma.a', [[src/(
 			block_decoder.c
 			block_header_decoder.c
 			easy_decoder_memusage.c
+			file_info.c
 			filter_buffer_decoder.c
 			filter_decoder.c
 			filter_flags_decoder.c
@@ -81,6 +85,8 @@ lib('liblzma.a', [[src/(
 			stream_decoder.c
 			stream_flags_decoder.c
 			vli_decoder.c
+
+			stream_decoder_mt.c
 		)
 		delta/(
 			delta_common.c
@@ -112,6 +118,7 @@ lib('liblzma.a', [[src/(
 			ia64.c
 			arm.c
 			armthumb.c
+			arm64.c
 			sparc.c
 		)
 	)
diff --git a/pkg/xz/ver b/pkg/xz/ver
@@ -1 +1 @@
-5.2.5 r0
+5.4.6 r0
diff --git a/probe/HAVE__MM_CLMULEPI64_SI128 b/probe/HAVE__MM_CLMULEPI64_SI128
@@ -0,0 +1,7 @@
+#include <immintrin.h>
+static __m128i x, y;
+__attribute__((__target__("pclmul")))
+int main(void) {
+	_mm_clmulepi64_si128(x, y, 0);
+	return 0;
+}
diff --git a/probe/HAVE___BUILTIN_BSWAP16 b/probe/HAVE___BUILTIN_BSWAP16
@@ -0,0 +1,4 @@
+unsigned x = 0xff;
+int main(void) {
+	return __builtin_bswap16(x) & 0xff;
+}
diff --git a/probe/gen.lua b/probe/gen.lua
@@ -6,10 +6,12 @@ probe('HAVE_EMMINTRIN_H')
 probe('HAVE_IMMINTRIN_H')
 probe('HAVE_INLINE_ASM')
 probe('HAVE_MMINTRIN_H')
+probe('HAVE__MM_CLMULEPI64_SI128')
 probe('HAVE__MM_MOVEMASK_EPI8')
 probe('HAVE__THREAD_LOCAL')
 probe('HAVE___BUILTIN_ASSUME_ALIGNED')
 probe('HAVE___BUILTIN_CHOOSE_EXPR')
+probe('HAVE___BUILTIN_BSWAP16')
 probe('HAVE___BUILTIN_CLZ')
 probe('HAVE___BUILTIN_CTZL')
 probe('HAVE___BUILTIN_POPCOUNT')