From bfe3c96c8bbafafc92d8595a88d2f212ecd1f31e Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Sat, 26 Sep 2020 23:00:16 -0700
Subject: [PATCH 1/3] [vcpkg baseline] Update libvmdk

---
 ports/libvmdk/CONTROL        | 2 +-
 ports/libvmdk/portfile.cmake | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/libvmdk/CONTROL b/ports/libvmdk/CONTROL
index 8eeff87d062922..21a1e9c5e69838 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/portfile.cmake b/ports/libvmdk/portfile.cmake
index 7fc06f802384b7..843384068475e0 100644
--- a/ports/libvmdk/portfile.cmake
+++ b/ports/libvmdk/portfile.cmake
@@ -1,19 +1,19 @@
 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
+#    PATCHES no_fs_and_fadvise_on_macos.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

From 6347a61f73dbb57eb7042600b6643f0fb811d84e Mon Sep 17 00:00:00 2001
From: NancyLi1013 <lirui09@beyondsoft.com>
Date: Sat, 26 Sep 2020 23:05:31 -0700
Subject: [PATCH 2/3] Remove unused patch

---
 .../libvmdk/no_fs_and_fadvise_on_macos.patch  | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 ports/libvmdk/no_fs_and_fadvise_on_macos.patch

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 3e95869fe78a97..00000000000000
--- 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 )

From 41fd9dc51e796c23b4638e788f309dc5b86ae945 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Sun, 27 Sep 2020 14:08:36 +0800
Subject: [PATCH 3/3] Update ports/libvmdk/portfile.cmake

---
 ports/libvmdk/portfile.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake
index 843384068475e0..505d5e68c4f947 100644
--- a/ports/libvmdk/portfile.cmake
+++ b/ports/libvmdk/portfile.cmake
@@ -13,7 +13,6 @@ 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}")