[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>

11 files changed, 40 insertions, 78 deletions

diff --git a/ports/ffmpeg/0005-fix-libvpx-linking.patch b/ports/ffmpeg/0005-fix-libvpx-linking.patch
deleted file mode 100644
index dac5e5928..000000000
--- a/ports/ffmpeg/0005-fix-libvpx-linking.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/configure b/configure
-index fba948a..50eea9b 100755
---- a/configure
-+++ b/configure
-@@ -5207,6 +5207,8 @@ case "$arch" in
-     ;;
- esac
- 
-+libvpx_name=vpx
-+
- # OS specific
- case $target_os in
-     aix)
-@@ -5379,6 +5381,15 @@ case $target_os in
-         enabled x86_64 && objformat="win64" || objformat="win32"
-         ranlib=:
-         enable dos_paths
-+        if [ -z "${extra_cflags##*-MDd*}" ]; then
-+            libvpx_name=vpxmdd
-+        elif [ -z "${extra_cflags##*-MD*}" ]; then
-+            libvpx_name=vpxmd
-+        elif [ -z "${extra_cflags##*-MTd*}" ]; then
-+            libvpx_name=vpxmtd
-+        elif [ -z "${extra_cflags##*-MT*}" ]; then
-+            libvpx_name=vpxmt
-+        fi
-         ;;
-     cygwin*)
-         target_os=cygwin
-@@ -6290,19 +6301,19 @@ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h
- enabled libvpx            && {
-     enabled libvpx_vp8_decoder && {
-         check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
--            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp8_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
-+            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp8_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs $pthreads_extralibs"
-     }
-     enabled libvpx_vp8_encoder && {
-         check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx ||
--            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp8_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
-+            check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp8_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs $pthreads_extralibs"
-     }
-     enabled libvpx_vp9_decoder && {
-         check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx ||
--            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
-+            check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs $pthreads_extralibs"
-     }
-     enabled libvpx_vp9_encoder && {
-         check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx ||
--            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
-+            check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs $pthreads_extralibs"
-     }
-     if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
-         die "libvpx enabled but no supported decoders found"
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index dc4c2d215..56b08c5ec 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
 Source: ffmpeg
 Version: 4.3.2
-Port-Version: 4
+Port-Version: 5
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index ca1ac781d..a45d26239 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
         0001-create-lib-libraries.patch
         0003-fix-windowsinclude.patch
         0004-fix-debug-build.patch
-        0005-fix-libvpx-linking.patch
         0006-fix-StaticFeatures.patch
         0007-fix-lib-naming.patch
         0008-Fix-wavpack-detection.patch
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"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 5c0d70a43..cb552f4f3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1950,7 +1950,7 @@
     },
     "ffmpeg": {
       "baseline": "4.3.2",
-      "port-version": 4
+      "port-version": 5
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
@@ -3602,7 +3602,7 @@
     },
     "libvpx": {
       "baseline": "1.9.0",
-      "port-version": 7
+      "port-version": 8
     },
     "libwandio": {
       "baseline": "4.2.1",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index cd822f12f..303dff2b2 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "68f6d071ba23bf8ad28a12a507c8089a47a76d73",
+      "version-string": "4.3.2",
+      "port-version": 5
+    },
+    {
       "git-tree": "993a1a305ccef12934ba4b72648ba205498841f7",
       "version-string": "4.3.2",
       "port-version": 4
diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json
index facc4c153..0d90bed5f 100644
--- a/versions/l-/libvpx.json
+++ b/versions/l-/libvpx.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b3c25e1e8a48e31e14fb824fd7b8b618266093b9",
+      "version-semver": "1.9.0",
+      "port-version": 8
+    },
+    {
       "git-tree": "09c64743d3dc62d2fa0ef55ef52b7bdad45cea0c",
       "version-string": "1.9.0",
       "port-version": 7