(#24249) ffmpeg: add new version 7.0.1

* ffmpeg: add version 7.0.1 * use nasm only when building x86 Signed-off-by: Uilian Ries <[email protected]> * fix config.yml with correct folder Signed-off-by: Uilian Ries <[email protected]> * Avoid building 7.0.1 in Debug Signed-off-by: Uilian Ries <[email protected]> * Fix missint setting Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Uilian Ries <[email protected]>
conan-io · Aug 2, 2024 · 7921442 · 7921442
1 parent 67c0f1f
commit 7921442
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/recipes/ffmpeg/all/conandata.yml b/recipes/ffmpeg/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "7.0.1":
+    url: "https://ffmpeg.org//releases/ffmpeg-7.0.1.tar.bz2"
+    sha256: "5e77e84b6434d656106fafe3bceccc77176449014f3eba24d33db3fbd0939dc9"
   "6.1.1":
     url: "http://ffmpeg.org/releases/ffmpeg-6.1.1.tar.bz2"
     sha256: "5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20"

diff --git a/recipes/ffmpeg/all/conanfile.py b/recipes/ffmpeg/all/conanfile.py
@@ -349,9 +349,21 @@ def validate(self):
             # Linking fails with "Argument list too long" for some reason on Conan v1
             raise ConanInvalidConfiguration("MSVC shared build is not supported for Conan v1")
 
+        if Version(self.version) == "7.0.1" and self.settings.build_type == "Debug":
+            # FIXME: FFMpeg fails to build in Debug mode with the following error:
+            # ld: libavcodec/libavcodec.a(vvcdsp_init.o): in function `ff_vvc_put_pixels2_8_sse4':
+            # src/libavcodec/x86/vvc/vvcdsp_init.c:69: undefined reference to `ff_h2656_put_pixels2_8_sse4'
+            # May be related https://github.com/ffvvc/FFmpeg/issues/234
+            raise ConanInvalidConfiguration(f"{self.ref} Conan recipe does not support build_type=Debug. Contributions are welcome to fix this issue.")
+
     def build_requirements(self):
         if self.settings.arch in ("x86", "x86_64"):
-            self.tool_requires("yasm/1.3.0")
+            if Version(self.version) >= "7.0":
+                # INFO: FFmpeg 7.0+ added avcodec vvc_mc.asm which fails to assemble with yasm 1.3.0
+                # src/libavcodec/x86/vvc/vvc_mc.asm:55: error: operand 1: expression is not simple or relocatable
+                self.tool_requires("nasm/2.16.01")
+            else:
+                self.tool_requires("yasm/1.3.0")
         if not self.conf.get("tools.gnu:pkg_config", check_type=str):
             self.tool_requires("pkgconf/2.1.0")
         if self._settings_build.os == "Windows":

diff --git a/recipes/ffmpeg/config.yml b/recipes/ffmpeg/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "7.0.1":
+    folder: "all"
   "6.1.1":
     folder: "all"
   "6.1":