diff options
| author | evpobr <evpobr@gmail.com> | 2020-09-21 08:09:28 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 20:09:28 -0700 |
| commit | 577b44362d9b92919b74ac85cb4391e5098fa61a (patch) | |
| tree | 9718f4890bdc3b20565690807b9373e4f2f48784 | |
| parent | 23933f367153af8f0490a763a8139d19f793aaa9 (diff) | |
| download | vcpkg-577b44362d9b92919b74ac85cb4391e5098fa61a.tar.gz vcpkg-577b44362d9b92919b74ac85cb4391e5098fa61a.zip | |
[libsndfile] Update to 1.0.30 (#13616)
* Update to latest release
* Remove patch merged to upstream
* Add vcpkg_fixup_pkgconfig() call
* Do not use deprecated option `ENABLE_STATIC_RUNTIME`
| -rw-r--r-- | ports/libsndfile/0001-Improve-UWP-support.patch | 37 | ||||
| -rw-r--r-- | ports/libsndfile/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/libsndfile/vcpkg.json | 3 |
3 files changed, 4 insertions, 45 deletions
diff --git a/ports/libsndfile/0001-Improve-UWP-support.patch b/ports/libsndfile/0001-Improve-UWP-support.patch deleted file mode 100644 index 9821aa30f..000000000 --- a/ports/libsndfile/0001-Improve-UWP-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/file_io.c b/src/file_io.c -index e5762ce8..90ef23d5 100644 ---- a/src/file_io.c -+++ b/src/file_io.c -@@ -777,6 +777,21 @@ psf_open_handle (PSF_FILE * pfile) - return NULL ; - } ; - -+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) -+ if (!pfile->use_wchar) -+ return NULL ; -+ -+ CREATEFILE2_EXTENDED_PARAMETERS cfParams = { 0 } ; -+ cfParams.dwSize = sizeof (CREATEFILE2_EXTENDED_PARAMETERS) ; -+ cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL ; -+ -+ handle = CreateFile2 (pfile->path.wc, dwDesiredAccess, dwShareMode, dwCreationDistribution, &cfParams) ; -+ -+ if (handle == INVALID_HANDLE_VALUE) -+ return NULL ; -+ -+ return handle ; -+#else - if (pfile->use_wchar) - handle = CreateFileW ( - pfile->path.wc, /* pointer to name of the file */ -@@ -802,6 +817,7 @@ psf_open_handle (PSF_FILE * pfile) - return NULL ; - - return handle ; -+#endif - } /* psf_open_handle */ - - /* USE_WINDOWS_API */ static void --- -2.27.0.windows.1 - diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 78eb4bc75..ad7650e7f 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -1,14 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO erikd/libsndfile - REF v1.0.29 - SHA512 ff19e8cea629af9dea51c79f3446f7a63520525c8578c56b8b4b7a6f0ce07d2458ca488f0be9daeaf9ea3a1124b1fa7cac9a3b313b1ae1f43c76de852a10eed5 + REF v1.0.30 + SHA512 2714dfbe923450a1f6f6d2a53ae0e88163170a5e0ce436bee27c1c41fc9b5526d6bc38e58918132248a9044f5b05fa29cd483c06c75ed67e6d83c961e30aaac9 HEAD_REF master - PATCHES 0001-Improve-UWP-support.patch ) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_find_acquire_program(PYTHON3) endif() @@ -26,7 +23,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DENABLE_BOW_DOCS=OFF -DBUILD_PROGRAMS=OFF - -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DPYTHON_EXECUTABLE=${PYTHON3} ${FEATURE_OPTIONS} @@ -41,6 +37,7 @@ else() endif() vcpkg_fixup_cmake_targets(CONFIG_PATH ${CONFIG_PATH} TARGET_PATH share/SndFile) +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index e40936088..b26c9f7ee 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsndfile", - "version-string": "1.0.29", - "port-version": 11, + "version-string": "1.0.30", "description": "Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1", |