Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ffmpeg] Re-enable Conan 1.x build #25136

Closed
wants to merge 3 commits into from
Closed

[ffmpeg] Re-enable Conan 1.x build #25136

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e49653f
Re-enable Conan 1.x build
uilianries Sep 4, 2024
27d5749
Remove unused import
uilianries Sep 4, 2024
062a3bc
Try to mitigate long list error using short paths
uilianries Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions recipes/ffmpeg/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from conan import ConanFile, conan_version
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import is_apple_os
from conan.tools.build import cross_building
Expand Down Expand Up @@ -198,6 +198,7 @@ class FFMpegConan(ConanFile):
"disable_filters": None,
"enable_filters": None,
}
short_paths = True

@property
def _settings_build(self):
Expand Down Expand Up @@ -354,10 +355,6 @@ def validate(self):
raise ConanInvalidConfiguration("FFmpeg '{}' option requires '{}' option to be enabled".format(
dependency, "' or '".join(features)))

if Version(self.version) >= "6.1" and conan_version.major == 1 and is_msvc(self) and self.options.shared:
# 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':
Expand Down
Loading