Sync ffmpeg with changes from upstream

Author: TheCycoONE

ports/ffmpeg/0044-fix-vulkan-debug-callback-abi.patch

@@ -0,0 +1,13 @@
+diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
+index 6317ab7d0e..f1f70e9b96 100644
+--- a/libavutil/hwcontext_vulkan.c
++++ b/libavutil/hwcontext_vulkan.c
+@@ -453,7 +453,7 @@ static const VulkanOptExtension optional_device_exts[] = {
+     { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME,                 FF_VK_EXT_VIDEO_DECODE_AV1       },
+ };
+ 
+-static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
++static VKAPI_ATTR VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
+                                            VkDebugUtilsMessageTypeFlagsEXT messageType,
+                                            const VkDebugUtilsMessengerCallbackDataEXT *data,
+                                            void *priv)

ports/ffmpeg/build.sh.in

@@ -85,6 +85,15 @@ else
     OPTIONS_x86_64="${OPTIONS_x86}"
 fi
 
+case "@VCPKG_CMAKE_SYSTEM_NAME@" in
+    FreeBSD|OpenBSD)
+        MAKE_BINARY="gmake"
+        ;;
+    *)
+        MAKE_BINARY="make"
+        ;;
+esac
+
 build_ffmpeg() {
     # extract build architecture
     BUILD_ARCH=$1
@@ -102,11 +111,11 @@ build_ffmpeg() {
 
     echo "=== BUILDING ==="
 
-    make -j${JOBS} V=1
+    $MAKE_BINARY -j${JOBS} V=1
 
     echo "=== INSTALLING ==="
 
-    make install
+    $MAKE_BINARY install
 }
 
 cd "$PATH_TO_BUILD_DIR"
@@ -115,7 +124,7 @@ if [ $OSX_ARCH_COUNT -gt 0 ]; then
     for ARCH in $OSX_ARCHS; do
         echo "=== CLEANING FOR $ARCH ==="
 
-        make clean && make distclean
+        $MAKE_BINARY clean && $MAKE_BINARY distclean
 
         build_ffmpeg $ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
 

ports/ffmpeg/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_from_github(
         0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium
         0041-add-const-for-opengl-definition.patch
         0043-fix-miss-head.patch
+        0044-fix-vulkan-debug-callback-abi.patch
 )
 
 if(SOURCE_PATH MATCHES " ")
@@ -526,6 +527,12 @@ else()
     set(WITH_VPX OFF)
 endif()
 
+if("vulkan" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-vulkan")
+else()
+    set(OPTIONS "${OPTIONS} --disable-vulkan")
+endif()
+
 if("webp" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-libwebp")
     set(WITH_WEBP ON)
@@ -580,6 +587,14 @@ else()
     set(WITH_MFX OFF)
 endif()
 
+if ("vaapi" IN_LIST FEATURES)
+    set(OPTIONS "${OPTIONS} --enable-vaapi")
+    set(WITH_VAAPI ON)
+else()
+    set(OPTIONS "${OPTIONS} --disable-vaapi")
+    set(WITH_VAAPI OFF)
+endif()
+
 # Disable codecs and devices unused by CorsixTH
 set (OPTIONS "${OPTIONS} --disable-encoders")
 set (OPTIONS "${OPTIONS} --disable-decoders --enable-decoder=smacker --enable-decoder=smackaud")

ports/ffmpeg/vcpkg-cmake-wrapper.cmake

@@ -289,6 +289,16 @@ if(@WITH_OPENCL@)
   endif()
 endif()
 
+if(@WITH_VAAPI@)
+  find_package(PkgConfig )
+  pkg_check_modules(libva IMPORTED_TARGET libva)
+  pkg_check_modules(libva-drm IMPORTED_TARGET libva-drm)
+  list(APPEND FFMPEG_LIBRARIES PkgConfig::libva PkgConfig::libva-drm)
+  if(vcpkg_no_avcodec_target AND TARGET FFmpeg::avcodec)
+    target_link_libraries(FFmpeg::avcodec INTERFACE PkgConfig::libva PkgConfig::libva-drm)
+  endif()
+endif()
+
 endif(NOT z_vcpkg_using_vcpkg_find_ffmpeg)
 unset(z_vcpkg_using_vcpkg_find_ffmpeg)
 

ports/ffmpeg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "7.1.1",
-  "port-version": 2,
+  "port-version": 3,
   "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."
@@ -62,6 +62,7 @@
             "theora",
             "vorbis",
             "vpx",
+            "vulkan",
             "webp",
             "xml2",
             "zlib"
@@ -647,6 +648,17 @@
         "libtheora"
       ]
     },
+    "vaapi": {
+      "description": "VAAPI video decoding/encoding acceleration",
+      "supports": "linux",
+      "dependencies": [
+        {
+          "name": "libva",
+          "default-features": false,
+          "platform": "linux"
+        }
+      ]
+    },
     "version3": {
       "description": "Upgrade (L)GPL to version 3"
     },
@@ -669,6 +681,12 @@
         "libvpx"
       ]
     },
+    "vulkan": {
+      "description": "H.264, HEVC and AV1 de/encoding via Vulkan",
+      "dependencies": [
+        "vulkan-headers"
+      ]
+    },
     "webp": {
       "description": "WebP encoding via libwebp",
       "dependencies": [