Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libwandio] update to 4.2.6-1 (#47262)

Browse Source
This commit is contained in:
toge
2025-09-13 08:20:06 +09:00
committed by GitHub
parent 7be4abc92a
commit aa67af0f76
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ports/libwandio/configure.lib.patch
View File

@@ -1,13 +1,12 @@
diff --git a/configure.ac b/configure.ac
index 4579fbb3d..f6be008c8 100644
--- a/configure.ac
index 428e66a..21e39db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,10 +112,11 @@ AC_HEADER_STDC
@@ -110,10 +110,10 @@ AC_CHECK_SIZEOF([long int])
AC_CHECK_HEADERS(stddef.h inttypes.h sys/prctl.h)
# Checks for various "optional" libraries
-AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
+# AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
+AC_SEARCH_LIBS(pthread_create, [pthreadGC pthreadVC pthread], have_pthread=1, have_pthread=0)
if test "$have_pthread" = 1; then
@@ -16,13 +15,12 @@ index 4579fbb3d..f6be008c8 100644
AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
fi
@@ -128,12 +129,13 @@ AC_ARG_WITH([bzip2],
@@ -126,12 +126,12 @@ AC_ARG_WITH([bzip2],
AS_IF([test "x$with_bzip2" != "xno"],
[
- AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
+ AC_SEARCH_LIBS(BZ2_bzDecompressInit, [bz2 bz2d bzip2 bzip2d], have_bzip=yes, have_bzip=no)
+ # AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
], [have_bzip=no])
AS_IF([test "x$have_bzip" = "xyes"], [
@@ -33,13 +31,12 @@ index 4579fbb3d..f6be008c8 100644
fi
with_bzip2=yes
AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
@@ -149,12 +151,13 @@ AC_ARG_WITH([zlib],
@@ -147,12 +147,12 @@ AC_ARG_WITH([zlib],
AS_IF([test "x$with_zlib" != "xno"],
[
- AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
+ AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no)
+ # AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
], [have_zlib=no])
AS_IF([test "x$have_zlib" = "xyes"], [
@@ -50,13 +47,12 @@ index 4579fbb3d..f6be008c8 100644
fi
AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
with_zlib=yes],
@@ -193,12 +196,13 @@ AC_ARG_WITH([lzma],
@@ -191,12 +191,12 @@ AC_ARG_WITH([lzma],
AS_IF([test "x$with_lzma" != "xno"],
[
- AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
+ # AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
+ AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no)
+ AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no)
], [have_lzma=no])
AS_IF([test "x$have_lzma" = "xyes"], [
@@ -67,14 +63,13 @@ index 4579fbb3d..f6be008c8 100644
fi
AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
with_lzma=yes],
@@ -259,25 +264,28 @@ AC_ARG_WITH([lz4],
@@ -257,25 +257,25 @@ AC_ARG_WITH([lz4],
AS_IF([test "x$with_lz4" != "xno"],
[
- AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
+ AC_SEARCH_LIBS(LZ4F_createDecompressionContext, [lz4 lz4d], have_lz4f=yes, have_lz4f=no)
+ # AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
], [have_zstd=no])
], [have_lz4f=no])
AS_IF([test "x$have_lz4f" = "xyes"], [
- if test "$ac_cv_lib_lz4_code" != "none required"; then
@@ -84,8 +79,7 @@ index 4579fbb3d..f6be008c8 100644
fi
AC_DEFINE(HAVE_LIBLZ4F, 1, "Compiled with lz4 frame support")
- AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
+ AC_SEARCH_LIBS(LZ4F_getVersion, [lz4 lz4d], have_lz4_173=yes, have_lz4_173=no)
+ # AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
+ AC_SEARCH_LIBS(LZ4F_getVersion, [lz4 lz4d], have_lz4_173=yes, have_lz4_173=no)
if test "x$have_lz4_173" = "xyes"; then
AC_DEFINE(HAVE_LIBLZ4_MOVABLE, 1, "If defined then liblz4 does NOT have the ERROR_srcPtr_wrong bug")
fi
@@ -94,7 +88,6 @@ index 4579fbb3d..f6be008c8 100644
AC_DEFINE(HAVE_LIBLZ4F, 0, "Compiled with lz4 frame support")
- AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
+ AC_SEARCH_LIBS(LZ4_decompress_safe_continue, [lz4 lz4d], have_lz4s=yes, have_lz4s=no)
+ # AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
AS_IF([test "x$have_lz4s" = "xyes"], [
- if test "$ac_cv_lib_lz4_code" != "none required"; then
- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4"

11
ports/libwandio/portfile.cmake
View File

@@ -9,18 +9,25 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wanduow/wandio
REF 012b646e7ba7ab191a5a2206488adfac493fcdc6
SHA512 e94a82038902c34933c4256f8bd4d7ef3f2cf32fea46f8e31a25df34cc90d3a275ff56d3bc9892aca0c85e6d875e696f96a836cc1444fe165db8364331e6e77d
REF ${VERSION}
SHA512 931bdfe91c8923de52217873d5a12568bcac97b2ab7e4e50f48cd9999d7b3887175885c3f56250b0cd822584bbf4a9262b017ab57ed599ddd288abda1fad9885
HEAD_REF master
PATCHES configure.lib.patch # This is how configure.ac files with dependencies get fixed.
configure.patch
${PATCHES}
)
if (VCPKG_TARGET_IS_ANDROID)
list(APPEND OPTIONS ac_cv_func_malloc_0_nonnull=yes)
list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes)
endif()
vcpkg_configure_make(
AUTOCONFIG
SOURCE_PATH ${SOURCE_PATH}
COPY_SOURCE
OPTIONS
${OPTIONS}
)
vcpkg_install_make()

3
ports/libwandio/vcpkg.json
View File

@@ -1,7 +1,6 @@
{
"name": "libwandio",
"version": "4.2.1",
"port-version": 6,
"version": "4.2.6-1",
"description": "C library for simple and efficient file IO.",
"homepage": "https://github.com/wanduow/wandio",
"license": "LGPL-3.0-only",

4
versions/baseline.json
View File

@@ -5625,8 +5625,8 @@
"port-version": 0
},
"libwandio": {
"baseline": "4.2.1",
"port-version": 6
"baseline": "4.2.6-1",
"port-version": 0
},
"libwebm": {
"baseline": "1.0.0.32",

5
versions/l-/libwandio.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a2a9b1923fe13226b58b94be1aad92b971991ef",
"version": "4.2.6-1",
"port-version": 0
},
{
"git-tree": "eb4e485cc1313349e0fbb65d4997d5968245877a",
"version": "4.2.1",