From cb4c366fb66a364120ad2c395be523f892579ad3 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Fri, 26 Nov 2021 01:15:47 -0800
Subject: [PATCH] [x264] check exists before rename (#21501)

* [x264] Use conditional for renaming debug lib

* update version database
---
 ports/x264/portfile.cmake | 5 ++++-
 ports/x264/vcpkg.json     | 1 +
 versions/baseline.json    | 2 +-
 versions/x-/x264.json     | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index bf725508be..159f802ce7 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -71,7 +71,10 @@ endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib)
+
+    if (NOT VCPKG_BUILD_TYPE)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib)
+    endif()
 elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     # force U_STATIC_IMPLEMENTATION macro
     file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS)
diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json
index a36254294e..82e50e3c67 100644
--- a/ports/x264/vcpkg.json
+++ b/ports/x264/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "x264",
   "version-string": "164-5db6aa6cab1b146",
+  "port-version": 1,
   "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
   "homepage": "https://github.com/mirror/x264",
   "supports": "!arm",
diff --git a/versions/baseline.json b/versions/baseline.json
index f818b5b0e2..7e34cccda2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7242,7 +7242,7 @@
     },
     "x264": {
       "baseline": "164-5db6aa6cab1b146",
-      "port-version": 0
+      "port-version": 1
     },
     "x265": {
       "baseline": "3.4",
diff --git a/versions/x-/x264.json b/versions/x-/x264.json
index 20454b471e..381e5fa4ad 100644
--- a/versions/x-/x264.json
+++ b/versions/x-/x264.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8d6c7ba5815a0683a2915df5f95de5d06e938781",
+      "version-string": "164-5db6aa6cab1b146",
+      "port-version": 1
+    },
     {
       "git-tree": "2280334f1235046e20f80586b7d83893f52b23b7",
       "version-string": "164-5db6aa6cab1b146",