aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/libvmdk/CONTROL2
-rw-r--r--ports/libvmdk/no_fs_and_fadvise_on_macos.patch25
-rw-r--r--ports/libvmdk/portfile.cmake5
3 files changed, 3 insertions, 29 deletions
diff --git a/ports/libvmdk/CONTROL b/ports/libvmdk/CONTROL
index 8eeff87d0..21a1e9c5e 100644
--- a/ports/libvmdk/CONTROL
+++ b/ports/libvmdk/CONTROL
@@ -1,5 +1,5 @@
Source: libvmdk
-Version: 2019-12-21
+Version: 20200926
Homepage: https://github.com/libyal/libvmdk
Description: Library and tools to access the VMware Virtual Disk (VMDK) format
Build-Depends: gettext,zlib
diff --git a/ports/libvmdk/no_fs_and_fadvise_on_macos.patch b/ports/libvmdk/no_fs_and_fadvise_on_macos.patch
deleted file mode 100644
index 3e95869fe..000000000
--- a/ports/libvmdk/no_fs_and_fadvise_on_macos.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c
-index 13eab02..690cc04 100644
---- a/libcfile/libcfile_file.c
-+++ b/libcfile/libcfile_file.c
-@@ -56,7 +56,7 @@
- #elif defined( HAVE_CYGWIN_FS_H )
- #include <cygwin/fs.h>
-
--#elif defined( HAVE_LINUX_FS_H )
-+#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H )
- /* Required for Linux platforms that use a sizeof( u64 )
- * in linux/fs.h but have no typedef of it
- */
-@@ -4603,6 +4603,11 @@ ssize_t libcfile_file_io_control_read_with_error_code(
- #error Missing file IO control with data function
- #endif
-
-+// Force disable on Darwin, it can be erroneously defined
-+#if defined ( __APPLE__ )
-+#undef HAVE_POSIX_FADVISE
-+#endif
-+
- /* On some versions of Linux the FADVISE definions seem to be missing from fcntl.h
- */
- #if defined( HAVE_POSIX_FADVISE ) && !defined( WINAPI )
diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake
index 7fc06f802..505d5e68c 100644
--- a/ports/libvmdk/portfile.cmake
+++ b/ports/libvmdk/portfile.cmake
@@ -1,19 +1,18 @@
vcpkg_fail_port_install(ON_TARGET "uwp")
-set(LIB_VERSION 20191221)
+set(LIB_VERSION 20200926)
set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/libyal/libvmdk/releases/download/${LIB_VERSION}/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
- SHA512 fd14760034ada2b01599f6c812b1a94592067bc224495aaae736d81d08629b1904935f43516513ba726d2d04589aa816c17b72a6f9ae035ee0030dba93dce865
+ SHA512 e70c42580dc58ad0a6459fe461504a8ef128f8d5df9d500f84f316e627232606f22eb4906fc1debc3e75e71daa6a07951af80822695de13d5e466adda4cfd5e0
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${LIB_VERSION}
- PATCHES no_fs_and_fadvise_on_macos.patch
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")