diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 98fc5c9d6c..a0c1f4153d 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -340,6 +340,12 @@ else() set(OPTIONS "${OPTIONS} --disable-libopenjpeg") endif() +if("openmpt" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libopenmpt") +else() + set(OPTIONS "${OPTIONS} --disable-libopenmpt") +endif() + if("openssl" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-openssl") else() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index be6ae3092a..529258fda8 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.3", - "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." @@ -489,6 +489,12 @@ "openjpeg" ] }, + "openmpt": { + "description": "Decoding tracked files via libopenmpt", + "dependencies": [ + "libopenmpt" + ] + }, "openssl": { "description": "Needed for https support if gnutls, libtls or mbedtls is not used", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e282edda20..1b8d18db89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2326,7 +2326,7 @@ }, "ffmpeg": { "baseline": "4.4.3", - "port-version": 2 + "port-version": 3 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 134592d5b3..16e98a29ef 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19a5928f7d1d0fd72837a29a54413b9fa53eb7da", + "version": "4.4.3", + "port-version": 3 + }, { "git-tree": "0a71b1f5734a3ead9f3941a4fae62aeeede10681", "version": "4.4.3",