[libvpx] Fix libvpx compilation (install process) (#17287)

* Fix libvpx compilation (install process)

* [libvpx] Remove library and pdb suffixes.

* [ffmpeg] Remove fix for libvpx

* update version record

* Update ports/ffmpeg/CONTROL

* Update versions/f-/ffmpeg.json

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

5 files changed, 27 insertions, 21 deletions

diff --git a/ports/libvpx/0004-remove-library-suffixes.patch b/ports/libvpx/0004-remove-library-suffixes.patch
new file mode 100644
index 000000000..fd7b7ad50
--- /dev/null
+++ b/ports/libvpx/0004-remove-library-suffixes.patch
@@ -0,0 +1,13 @@
+diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh

+index bb1c31d..9a0827e 100644

+--- a/build/make/gen_msvs_vcxproj.sh

++++ b/build/make/gen_msvs_vcxproj.sh

+@@ -377,7 +377,7 @@ generate_vcxproj() {

+               else

+                 config_suffix=""

+               fi

+-              tag_content TargetName "${name}${lib_sfx}${config_suffix}"

++              tag_content TargetName "${name}"

+             fi

+             close_tag PropertyGroup

+         done

diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL
deleted file mode 100644
index 67f157a3f..000000000
--- a/ports/libvpx/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libvpx

-Version: 1.9.0

-Port-Version: 7

-Homepage: https://github.com/webmproject/libvpx

-Description: The reference software implementation for the video coding formats VP8 and VP9.

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index 325f4956e..e888d7fc4 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         0001-vcxproj-nasm.patch
         0002-Fix-nasm-debug-format-flag.patch
         0003-add-uwp-and-v142-support.patch
+        0004-remove-library-suffixes.patch
 )
 
 vcpkg_find_acquire_program(PERL)
@@ -99,23 +100,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
 
     # note: pdb file names are hardcoded in the lib file, cannot rename
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpxmd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        else()
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpxmt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        endif()
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpxmdd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        else()
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpxmtd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-        endif()
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
     endif()
 
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
diff --git a/ports/libvpx/unofficial-libvpx-config.cmake.in b/ports/libvpx/unofficial-libvpx-config.cmake.in
index e475927b6..c335d91a3 100644
--- a/ports/libvpx/unofficial-libvpx-config.cmake.in
+++ b/ports/libvpx/unofficial-libvpx-config.cmake.in
@@ -15,7 +15,7 @@ if(NOT TARGET unofficial::libvpx::libvpx)
   list(APPEND _IMPORT_CHECK_FILES "${_IMPORT_PREFIX}/include/vpx/vpx_codec.h")

 

   # Add release configuration properties.

-  find_library(_LIBFILE_RELEASE NAMES vpx vpx@LIBVPX_CRT_SUFFIX@ PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH)

+  find_library(_LIBFILE_RELEASE NAMES vpx PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH)

   set_property(TARGET unofficial::libvpx::libvpx

     APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

   set_target_properties(unofficial::libvpx::libvpx PROPERTIES

@@ -25,7 +25,7 @@ if(NOT TARGET unofficial::libvpx::libvpx)
 

   # Add debug configuration properties.

   if(@LIBVPX_CONFIG_DEBUG@)

-    find_library(_LIBFILE_DEBUG NAMES vpx vpx@LIBVPX_CRT_SUFFIX@d PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH)

+    find_library(_LIBFILE_DEBUG NAMES vpx PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH)

     set_property(TARGET unofficial::libvpx::libvpx

       APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

     set_target_properties(unofficial::libvpx::libvpx PROPERTIES

diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json
new file mode 100644
index 000000000..ce3de0341
--- /dev/null
+++ b/ports/libvpx/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "libvpx",
+  "version-semver": "1.9.0",
+  "port-version": 8,
+  "description": "The reference software implementation for the video coding formats VP8 and VP9.",
+  "homepage": "https://github.com/webmproject/libvpx"
+}