From 51fd3a879b6963834adb4f2eb477ef2a60dad9c2 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Wed, 22 Dec 2021 05:05:32 +0100
Subject: [PATCH] [libzen,libmediainfo] update and no absolute paths (#21171)

---
 ports/libmediainfo/portfile.cmake | 9 +++++----
 ports/libmediainfo/vcpkg.json     | 2 +-
 ports/libzen/portfile.cmake       | 3 +--
 ports/libzen/vcpkg.json           | 1 +
 versions/baseline.json            | 4 ++--
 versions/l-/libmediainfo.json     | 5 +++++
 versions/l-/libzen.json           | 5 +++++
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake
index 987fcdc988..40229288c1 100644
--- a/ports/libmediainfo/portfile.cmake
+++ b/ports/libmediainfo/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MediaArea/MediaInfoLib
-    REF d5fb067e1539aa7a74c491e8262c81214f9c8bcb #v21.03
-    SHA512 6d49c8187dca264b4d9fb1f93a82cb65435e81a2540cfb84f885d53737560f7e8e60c8209e7d184cb191f298495db90ffb3185481e3ed44bf5a1f5131f671d89
+    REF v21.03
+    SHA512 1317b27dc3ac1ad224ef9b7ca7c08a8f55983ac6984b5e8daf6309fa33094fbad8a0a5fbe0cff086b7a5c9233b3e24e26995b037d16adf83f63877f2c753f811
     HEAD_REF master
     PATCHES vcpkg_support_in_cmakelists.patch
 )
@@ -24,7 +24,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib")
     file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib")
 endif()
 vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib)
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json
index 89db9dce1a..f6832d2656 100644
--- a/ports/libmediainfo/vcpkg.json
+++ b/ports/libmediainfo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmediainfo",
   "version-string": "21.03",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Get most relevant technical and tag data from video and audio files",
   "homepage": "https://github.com/MediaArea/MediaInfoLib",
   "dependencies": [
diff --git a/ports/libzen/portfile.cmake b/ports/libzen/portfile.cmake
index 5c536a691b..7f49cb7221 100644
--- a/ports/libzen/portfile.cmake
+++ b/ports/libzen/portfile.cmake
@@ -16,9 +16,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME zenlib CONFIG_PATH share/zenlib)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 
 file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libzen/vcpkg.json b/ports/libzen/vcpkg.json
index df2615c1e2..6b53cd483f 100644
--- a/ports/libzen/vcpkg.json
+++ b/ports/libzen/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libzen",
   "version": "0.4.39",
+  "port-version": 1,
   "description": "ZenLib is a C++ utility library for easiest cross-platform development",
   "dependencies": [
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 28547ee8b1..4c7a7d21b2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3654,7 +3654,7 @@
     },
     "libmediainfo": {
       "baseline": "21.03",
-      "port-version": 1
+      "port-version": 2
     },
     "libmesh": {
       "baseline": "1.5.0",
@@ -4110,7 +4110,7 @@
     },
     "libzen": {
       "baseline": "0.4.39",
-      "port-version": 0
+      "port-version": 1
     },
     "libzip": {
       "baseline": "1.8.0",
diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json
index 7b907d79c9..d4f1014c74 100644
--- a/versions/l-/libmediainfo.json
+++ b/versions/l-/libmediainfo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a6b640103a75b965e6527d10819d276c2193775d",
+      "version-string": "21.03",
+      "port-version": 2
+    },
     {
       "git-tree": "2cdc779b496da59aabfb9e1cc459d68c54cdb4d8",
       "version-string": "21.03",
diff --git a/versions/l-/libzen.json b/versions/l-/libzen.json
index 34fd341bfb..80dbf20936 100644
--- a/versions/l-/libzen.json
+++ b/versions/l-/libzen.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "37c7d9f6e950b43bc62ed633bc8fc1964bb2ada3",
+      "version": "0.4.39",
+      "port-version": 1
+    },
     {
       "git-tree": "613111ba5e30b7f36fab5f147a4ae10180d8bebf",
       "version": "0.4.39",