From 427f956bd584f2ebb51c1b50779be172af469305 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Mon, 29 Aug 2022 20:22:42 +0200
Subject: [PATCH] [opencv4,dv-processing] no absolute paths (#26586)

---
 ports/dv-processing/portfile.cmake | 7 ++-----
 ports/dv-processing/vcpkg.json     | 1 +
 ports/opencv4/portfile.cmake       | 1 -
 ports/opencv4/vcpkg.json           | 2 +-
 versions/baseline.json             | 4 ++--
 versions/d-/dv-processing.json     | 5 +++++
 versions/o-/opencv4.json           | 5 +++++
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake
index 1d6fe94418..20ab20e4f0 100644
--- a/ports/dv-processing/portfile.cmake
+++ b/ports/dv-processing/portfile.cmake
@@ -36,9 +36,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-proc
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if (VCPKG_TARGET_IS_WINDOWS)
-        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
-else()
-        vcpkg_fixup_pkgconfig()
-endif()
+vcpkg_fixup_pkgconfig(SKIP_CHECK)
+
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json
index e7c86827a9..b95c1ac9ff 100644
--- a/ports/dv-processing/vcpkg.json
+++ b/ports/dv-processing/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dv-processing",
   "version": "1.5.1",
+  "port-version": 1,
   "description": "Generic algorithms for event cameras.",
   "homepage": "https://gitlab.com/inivation/dv/dv-processing",
   "license": "Apache-2.0",
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index 67c440c4b2..5694c5c53e 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -382,7 +382,6 @@ vcpkg_cmake_configure(
         -DOPENCV_DLLVERSION=4
         -DOPENCV_DEBUG_POSTFIX=d
         -DOPENCV_GENERATE_SETUPVARS=OFF
-        -DOPENCV_GENERATE_PKGCONFIG=ON
         # Do not build docs/examples
         -DBUILD_DOCS=OFF
         -DBUILD_EXAMPLES=OFF
diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
index c77f11d7ea..43ecb005c3 100644
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.6.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 79ece66925..fc27838004 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2014,7 +2014,7 @@
     },
     "dv-processing": {
       "baseline": "1.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "dx": {
       "baseline": "1.0.1",
@@ -5250,7 +5250,7 @@
     },
     "opencv4": {
       "baseline": "4.6.0",
-      "port-version": 2
+      "port-version": 3
     },
     "opendnp3": {
       "baseline": "3.1.1",
diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json
index 48beff248b..ba576787ab 100644
--- a/versions/d-/dv-processing.json
+++ b/versions/d-/dv-processing.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d2e7b2c11eaa6b13ce5b08447411a885adc2036",
+      "version": "1.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "5fb27b7a8c1ee9bd01035958e7b3b3a487a89dd8",
       "version": "1.5.1",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index 59035e59c2..eee5dcb2d9 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18c563d48f8245b3d1e0879ecdc6c37097a89b3c",
+      "version": "4.6.0",
+      "port-version": 3
+    },
     {
       "git-tree": "57554ec83d4e4667344f005a1f61be8164cbf58a",
       "version": "4.6.0",