[ffmpeg] Update to 6.0 (microsoft#30135)

* [amd-amf] Update to 1.4.29 * [ffnvcodec] Update to 11.1.5.2 * [mfx-dispatch] Fix pkgconfig * [ffmpeg] Update to 6.0 * update versions * [amd-amd] Fix merge * Update ffmpeg.json * ffmpeg: Remove libpng dependency. Ffmpeg doesnt have a libpng dependency. All thats needed for png support is zlib which has its own option already * Update ffmpeg.json * [ignition-common3] patch for ffmpeg3 * [freerdp] Update to 2.11.1 * Revert "Merge pull request #1 from autoantwort/ffmpeg" This reverts commit b52416c, reversing changes made to 8fdd44e. * Update ffmpeg.json * Update ffmpeg.json --------- Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
JackBoosY · Sep 26, 2023 · 1b4d69f · 1b4d69f
1 parent 70fd7df
commit 1b4d69f
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 58 deletions.
diff --git a/ports/ffmpeg/0001-create-lib-libraries.patch b/ports/ffmpeg/0001-create-lib-libraries.patch
@@ -2,7 +2,7 @@ diff --git a/configure b/configure
 index 34c2adb..1c8008a 100755
 --- a/configure
 +++ b/configure
-@@ -5352,15 +5352,17 @@ case $target_os in
+@@ -5631,15 +5631,17 @@ case $target_os in
          ;;
      win32|win64)
          disable symver
@@ -16,10 +16,10 @@ index 34c2adb..1c8008a 100755
 -        fi
 +#            disable static
 +#        fi
+         ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"
 +        LIBPREF=""
 +        LIBSUF=".lib"
          SLIBPREF=""
          SLIBSUF=".dll"
-         SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
diff --git a/ports/ffmpeg/0005-fix-nasm.patch b/ports/ffmpeg/0005-fix-nasm.patch
@@ -1,21 +1,7 @@
 diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
 --- a/libavcodec/x86/Makefile
 +++ b/libavcodec/x86/Makefile
-@@ -138,8 +138,11 @@ X86ASM-OBJS-$(CONFIG_QPELDSP)          += x86/qpeldsp.o                 \
- X86ASM-OBJS-$(CONFIG_RV34DSP)          += x86/rv34dsp.o
- X86ASM-OBJS-$(CONFIG_VC1DSP)           += x86/vc1dsp_loopfilter.o       \
-                                           x86/vc1dsp_mc.o
--X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o           \
--                                          x86/simple_idct.o
-+ifdef ARCH_X86_64
-+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o
-+else
-+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct.o
-+endif
- X86ASM-OBJS-$(CONFIG_VIDEODSP)         += x86/videodsp.o
- X86ASM-OBJS-$(CONFIG_VP3DSP)           += x86/vp3dsp.o
- X86ASM-OBJS-$(CONFIG_VP8DSP)           += x86/vp8dsp.o                  \
-@@ -157,6 +160,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
+@@ -158,6 +158,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
  X86ASM-OBJS-$(CONFIG_APNG_DECODER)     += x86/pngdsp.o
  X86ASM-OBJS-$(CONFIG_CAVS_DECODER)     += x86/cavsidct.o
 +ifdef ARCH_X86_64
@@ -24,7 +10,7 @@ diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
  X86ASM-OBJS-$(CONFIG_CFHD_DECODER)     += x86/cfhddsp.o
  X86ASM-OBJS-$(CONFIG_DCA_DECODER)      += x86/dcadsp.o x86/synth_filter.o
  X86ASM-OBJS-$(CONFIG_DIRAC_DECODER)    += x86/diracdsp.o                \
-@@ -175,15 +180,21 @@                                           x86/hevc_sao_10bit.o
+@@ -175,15 +177,21 @@                                           x86/hevc_sao_10bit.o
  X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
  X86ASM-OBJS-$(CONFIG_LSCR_DECODER)     += x86/pngdsp.o
 +ifdef ARCH_X86_64

diff --git a/ports/ffmpeg/0011-Fix-x265-detection.patch b/ports/ffmpeg/0011-Fix-x265-detection.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
-@@ -6671,7 +6671,10 @@
+@@ -6730,7 +6730,10 @@
                               [ "$toolchain" != "msvc" ] ||
                               require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&
                               check_cpp_condition libx262 x264.h "X264_MPEG2"
@@ -10,6 +10,6 @@ diff --git a/configure b/configure
 +                                { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" ||
 +                                require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } &&
 +                                    warn "using libx265 without pkg-config"; } } &&
-                              require_cpp_condition libx265 x265.h "X265_BUILD >= 70"
+                              require_cpp_condition libx265 x265.h "X265_BUILD >= 89"
  enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
  enabled libxavs2          && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -1,10 +1,9 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ffmpeg/ffmpeg
     REF n${VERSION}
-    SHA512 1b90c38b13149f2de7618ad419adc277afd5e65bbf52b849a7245aec0f92f73189c8547599dba8408b8828a767c1120f132727b57cd6231cd8b81de2471a4b8b
+    SHA512 da1b836c8f51cf69f95db750d5da5191a71d534fa7b0f019d6d6454f8dd6db5598789576b4fe5ad983dcd0197b9a7e8f9d43f10707b6d40ac31425da23da35b2
     HEAD_REF master
     PATCHES
         0001-create-lib-libraries.patch
@@ -354,10 +353,6 @@ else()
     set(OPTIONS "${OPTIONS} --disable-lzma")
 endif()
 
-if("libpng" IN_LIST FEATURES)
-    set(OPTIONS "${OPTIONS} --enable-decoder=png --enable-encoder=png")
-endif()
-
 if("mp3lame" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-libmp3lame")
 else()

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ffmpeg",
-  "version": "5.1.2",
-  "port-version": 10,
+  "version": "6.0",
   "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."
@@ -42,7 +41,6 @@
             "bzip2",
             "freetype",
             "iconv",
-            "libpng",
             "lzma",
             "mp3lame",
             "openjpeg",
@@ -444,19 +442,6 @@
         "libilbc"
       ]
     },
-    "libpng": {
-      "description": "PNG de/encoding via libpng",
-      "dependencies": [
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "zlib"
-          ]
-        },
-        "libpng"
-      ]
-    },
     "lzma": {
       "description": "lzma support",
       "dependencies": [

diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FFmpeg/nv-codec-headers
-    REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0
-    SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483
+    REF n${VERSION}
+    SHA512 c08b7b3d08ef6e95819268067e09c588e5064d4c2320554f868579e96dc841e1eab217c03ef44e246aabdfa8b5e8e267cd5f0726f9c959f45fb27cb79af7c454
     HEAD_REF master
 )
 

diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ffnvcodec",
-  "version": "11.1.5.0",
-  "port-version": 1,
+  "version": "11.1.5.2",
   "description": "FFmpeg version of Nvidia Codec SDK headers.",
   "homepage": "https://github.com/FFmpeg/nv-codec-headers",
   "supports": "linux | (!osx & !uwp & !(arm64 & windows))"

diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeRDP/FreeRDP
     REF "${VERSION}"
-    SHA512 388c00d2f883b41d4ec127bcb871607429c136bfb99daf87f491e9f1e7d456e1fac403db9f9dec7611e729dfd2f913fa414ed3d0020d92c284c8f3ba1eeb80cb
+    SHA512 a6c5b395424e730096b992fc2786369a78113819eddb5117bf45e5174286f36a22701c69fdd96b3d03c1aa3c2087bc97e2bfa2a5548236080fdbebcb01ffc4c7
     HEAD_REF master
     PATCHES
         DontInstallSystemRuntimeLibs.patch

diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "freerdp",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",

diff --git a/ports/mfx-dispatch/fix-pkgconf.patch b/ports/mfx-dispatch/fix-pkgconf.patch
@@ -24,9 +24,16 @@ diff --git a/libmfx.pc.cmake b/libmfx.pc.cmake
 index fabb541..5d248fe 100644
 --- a/libmfx.pc.cmake
 +++ b/libmfx.pc.cmake
-@@ -11,4 +11,4 @@ Requires.private:
+@@ -6,9 +6,9 @@ Requires.private:
+ Name: libmfx
+ Description: Intel Media SDK Dispatched static library
+-Version: 2013
++Version: 1.35
+ Requires:
+ Requires.private:
  Conflicts:
- Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib
+-Libs: -L${libdir} -lsupc++ ${libdir}/libmfx.lib
++Libs: -L${libdir} ${libdir}/libmfx.lib
  Libs.private:
 -Cflags: -I${includedir} -I@INTELMEDIASDK_PATH@
 +Cflags: -I${includedir}
diff --git a/ports/mfx-dispatch/fix-unresolved-symbol.patch b/ports/mfx-dispatch/fix-unresolved-symbol.patch
@@ -54,11 +54,12 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 diff --git a/src/mfx_driver_store_loader.cpp b/src/mfx_driver_store_loader.cpp
 --- a/src/mfx_driver_store_loader.cpp	(revision 388559e9e8234eb0989e1598a9beea4035a04132)
 +++ b/src/mfx_driver_store_loader.cpp	(revision 5ebef171699530ca01594a5cef10a68811f4d105)
-@@ -24,6 +24,8 @@
+@@ -24,6 +24,9 @@
  #include "mfx_dispatcher_log.h"
  #include "mfx_load_dll.h"
 
 +#pragma comment(lib, "Ole32.lib")
++#pragma comment(lib, "Advapi32.lib")
 +
  namespace MFX
  {

diff --git a/ports/mfx-dispatch/vcpkg.json b/ports/mfx-dispatch/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mfx-dispatch",
   "version": "1.35.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open source Intel media sdk dispatcher",
   "homepage": "https://github.com/lu-zero/mfx_dispatch",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2525,12 +2525,12 @@
       "port-version": 7
     },
     "ffmpeg": {
-      "baseline": "5.1.2",
-      "port-version": 10
+      "baseline": "6.0",
+      "port-version": 0
     },
     "ffnvcodec": {
-      "baseline": "11.1.5.0",
-      "port-version": 1
+      "baseline": "11.1.5.2",
+      "port-version": 0
     },
     "fftw3": {
       "baseline": "3.3.10",
@@ -2689,7 +2689,7 @@
       "port-version": 7
     },
     "freerdp": {
-      "baseline": "2.10.0",
+      "baseline": "2.11.1",
       "port-version": 0
     },
     "freetds": {
@@ -5378,7 +5378,7 @@
     },
     "mfx-dispatch": {
       "baseline": "1.35.1",
-      "port-version": 1
+      "port-version": 2
     },
     "mgnlibs": {
       "baseline": "2019-09-29",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "515f4b8df7a66e74ef6bcde4eae3841d3a96038f",
+      "version": "6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "713c943d5cce36c51128eea921489e0770c28857",
       "version": "5.1.2",

diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "129a409f9a9a143a3964c7d6cdb5fef51c777cc4",
+      "version": "11.1.5.2",
+      "port-version": 0
+    },
     {
       "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816",
       "version": "11.1.5.0",

diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "43135a7f0ecf1e2fa292ea7f1fbe69dc0d2ec09d",
+      "version": "2.11.1",
+      "port-version": 0
+    },
     {
       "git-tree": "576db0702d3a36fbca154e4ee18030d28d0e05d0",
       "version": "2.10.0",

diff --git a/versions/m-/mfx-dispatch.json b/versions/m-/mfx-dispatch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "07eb6cc5ee276c7e965868d1cb6de113d41e0e41",
+      "version": "1.35.1",
+      "port-version": 2
+    },
     {
       "git-tree": "5d0fd959ef687e9180ea230b8eea4d2f944423a4",
       "version": "1.35.1",