ffmpeg: add version 8.0 (#28630)

* ffmpeg: Add version 8.0

* Add whisper option

* Add libjxl

* Fix for whisper to be found

* Fix libjxl check

* Test without JXL

* Apply suggested changes, remove JXL from this MR

* Add missing checksum

* Apply suggestion from @jcar87

* Version range for opus to fix compatibility with libsndfile binaries for Linux

---------

Co-authored-by: Luis Caro Campos <[email protected]>

Author: irieger

recipes/ffmpeg/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "8.0":
+    url: "https://ffmpeg.org/releases/ffmpeg-8.0.tar.xz"
+    sha256: "b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e"
   "7.1.1":
     url: "https://ffmpeg.org//releases/ffmpeg-7.1.1.tar.bz2"
     sha256: "0c8da2f11579a01e014fc007cbacf5bb4da1d06afd0b43c7f8097ec7c0f143ba"

recipes/ffmpeg/all/conanfile.py

@@ -68,6 +68,7 @@ class FFMpegConan(ConanFile):
         "with_vaapi": [True, False],
         "with_vdpau": [True, False],
         "with_vulkan": [True, False],
+        "with_whisper": [True, False],
         "with_xcb": [True, False],
         "with_soxr": [True, False],
         "with_appkit": [True, False],
@@ -157,6 +158,7 @@ class FFMpegConan(ConanFile):
         "with_vaapi": True,
         "with_vdpau": True,
         "with_vulkan": False,
+        "with_whisper": False,
         "with_xcb": True,
         "with_soxr": False,
         "with_appkit": True,
@@ -250,6 +252,7 @@ def _dependencies(self):
             "with_libdav1d": ["avcodec"],
             "with_mediacodec": ["with_jni"],
             "with_xlib": ["avdevice"],
+            "with_whisper": ["avfilter"],
         }
 
     @property
@@ -269,6 +272,12 @@ def config_options(self):
             del self.options.fPIC
             if is_msvc(self) and self.settings.arch == "armv8":
                 self.options.with_libsvtav1 = False
+
+        if Version(self.version) >= "8.0":
+            del self.options.postproc
+        else:
+            del self.options.with_whisper
+
         if self.settings.os not in ["Linux", "FreeBSD"]:
             del self.options.with_vaapi
             del self.options.with_vdpau
@@ -331,7 +340,7 @@ def requirements(self):
         if self.options.with_vorbis:
             self.requires("vorbis/1.3.7")
         if self.options.with_opus:
-            self.requires("opus/1.4")
+            self.requires("opus/[>=1.4 <2]")
         if self.options.with_zeromq:
             self.requires("zeromq/4.3.5")
         if self.options.with_sdl:
@@ -372,6 +381,8 @@ def requirements(self):
             self.requires("dav1d/[>=1.4 <2]")
         if self.options.get_safe("with_libdrm"):
             self.requires("libdrm/2.4.119")
+        if self.options.get_safe("with_whisper"):
+            self.requires("whisper-cpp/1.7.6")
 
     def validate(self):
         if self.options.with_ssl == "securetransport" and not is_apple_os(self):
@@ -449,11 +460,17 @@ def _patch_sources(self):
             replace_in_file(self, os.path.join(self.source_folder, "libavcodec", "libx264.c"),
                                   "#define X264_API_IMPORTS 1", "")
         if self.options.with_ssl == "openssl":
-            # https://trac.ffmpeg.org/ticket/5675
-            openssl_libs = load(self, os.path.join(self.build_folder, "openssl_libs.list"))
-            replace_in_file(self, os.path.join(self.source_folder, "configure"),
-                                  "check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||",
-                                  f"check_lib openssl openssl/ssl.h OPENSSL_init_ssl {openssl_libs} || ")
+                # https://trac.ffmpeg.org/ticket/5675
+            if Version(self.version) >= "8.0":
+                openssl_libs = load(self, os.path.join(self.build_folder, "openssl_libs.list"))
+                replace_in_file(self, os.path.join(self.source_folder, "configure"),
+                                    "check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||",
+                                    f"check_lib openssl openssl/ssl.h OPENSSL_init_ssl {openssl_libs} || ")
+            else:
+                openssl_libs = load(self, os.path.join(self.build_folder, "openssl_libs.list"))
+                replace_in_file(self, os.path.join(self.source_folder, "configure"),
+                                    "check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||",
+                                    f"check_lib openssl openssl/ssl.h OPENSSL_init_ssl {openssl_libs} || ")
 
         replace_in_file(self, os.path.join(self.source_folder, "configure"), "echo libx264.lib", "echo x264.lib")
 
@@ -519,7 +536,6 @@ def opt_append_disable_if_set(args, what, v):
             opt_enable_disable("avformat", self.options.avformat),
             opt_enable_disable("swresample", self.options.swresample),
             opt_enable_disable("swscale", self.options.swscale),
-            opt_enable_disable("postproc", self.options.postproc),
             opt_enable_disable("avfilter", self.options.avfilter),
 
             # Dependencies
@@ -570,10 +586,14 @@ def opt_append_disable_if_set(args, what, v):
             "--disable-cuvid",  # FIXME: CUVID support
             # Licenses
             opt_enable_disable("nonfree", self.options.get_safe("with_libfdk_aac") or (self.options.with_ssl and (
-                self.options.with_libx264 or self.options.with_libx265 or self.options.postproc))),
-            opt_enable_disable("gpl", self.options.with_libx264 or self.options.with_libx265 or self.options.postproc)
+                self.options.with_libx264 or self.options.with_libx265 or self.options.get_safe("postproc")))),
+            opt_enable_disable("gpl", self.options.with_libx264 or self.options.with_libx265 or self.options.get_safe("postproc"))
         ]
 
+        # Version specific options
+        if Version(self.version) < "8.0":
+            args.append(opt_enable_disable("postproc", self.options.get_safe("postproc")))
+
         # Individual Component Options
         opt_append_disable_if_set(args, "everything", self.options.disable_everything)
         opt_append_disable_if_set(args, "encoders", self.options.disable_all_encoders)
@@ -634,6 +654,9 @@ def opt_append_disable_if_set(args, what, v):
         args.extend(self._split_and_format_options_string(
             "disable-filter", self.options.disable_filters))
 
+        if "with_whisper" in self.options:
+            args.append(opt_enable_disable("whisper", self.options.with_whisper))
+
         if self._version_supports_libsvtav1:
             args.append(opt_enable_disable("libsvtav1", self.options.get_safe("with_libsvtav1")))
         if self._version_supports_harfbuzz:
@@ -690,9 +713,6 @@ def opt_append_disable_if_set(args, what, v):
             if not check_min_vs(self, "190", raise_invalid=False):
                 # Visual Studio 2013 (and earlier) doesn't support "inline" keyword for C (only for C++)
                 tc.extra_defines.append("inline=__inline")
-        if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) >= "15":
-            # Workaround for link error "ld: building exports trie: duplicate symbol '_av_ac3_parse_header'"
-            tc.extra_ldflags.append("-Wl,-ld_classic")
         if cross_building(self):
             args.append(f"--target-os={self._target_os}")
             if is_apple_os(self) and self.options.with_audiotoolbox:
@@ -727,7 +747,6 @@ def opt_append_disable_if_set(args, what, v):
 
             env = Environment()
             env.append("CPPFLAGS", [f"-I{unix_path(self, p)}" for p in includedirs] + [f"-D{d}" for d in defines])
-            env.append("_LINK_", [lib if lib.endswith(".lib") else f"{lib}.lib" for lib in libs])
             env.append("LDFLAGS", [f"-LIBPATH:{unix_path(self, p)}" for p in libdirs] + linkflags)
             env.append("CXXFLAGS", cxxflags)
             env.append("CFLAGS", cflags)
@@ -737,6 +756,7 @@ def opt_append_disable_if_set(args, what, v):
             deps.generate()
 
         deps = PkgConfigDeps(self)
+        deps.set_property("whisper-cpp", "pkg_config_name", "whisper")
         deps.generate()
 
         if self.options.with_ssl == "openssl":
@@ -847,7 +867,7 @@ def _add_component(name, dependencies):
             swresample = _add_component("swresample", [])
             if self.options.get_safe("with_soxr"):
                 swresample.requires.append("soxr::soxr")
-        if self.options.postproc:
+        if self.options.get_safe("postproc"):
             _add_component("postproc", [])
 
         if self.settings.os in ("FreeBSD", "Linux"):
@@ -966,6 +986,8 @@ def _add_component(name, dependencies):
                 avfilter.frameworks.append("CoreImage")
             if Version(self.version) >= "5.0" and is_apple_os(self):
                 avfilter.frameworks.append("Metal")
+            if self.options.get_safe("with_whisper"):
+                avfilter.requires.append("whisper-cpp::whisper-cpp")
 
         if self.options.get_safe("with_libdrm"):
             avutil.requires.append("libdrm::libdrm_libdrm")

recipes/ffmpeg/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "8.0":
+    folder: "all"
   "7.1.1":
     folder: "all"
   "4.4.6":