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

Jump to bottom

FFmpeg conan v2 #13235

Closed
wants to merge 7 commits into from
Closed

FFmpeg conan v2 #13235

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
946712e
[ffmpeg/xxx] conan v2 migration
MartinDelille Sep 24, 2022
d4ff67a
wip
MartinDelille Sep 25, 2022
e275f35
Fix some of the v2 problems
Sep 29, 2022
e35a8cb
Fixed more comments
Sep 30, 2022
05d010c
fix linter complain
Oct 25, 2022
da95539
Hack to make apple work
Oct 26, 2022
f8689a1
maybe this tricks the system
Oct 27, 2022
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
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@MartinDelille
MartinDelille authored and Esteve Soria committed Oct 25, 2022
commit d4ff67afa2e9d9a8925e375620016ace91a6ec77
14 changes: 11 additions & 3 deletions recipes/ffmpeg/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,17 @@ def opt_append_disable_if_set(args, what, v):
args.append("--extra-cflags={}".format(" ".join(extra_cflags)))
args.append("--extra-ldflags={}".format(" ".join(extra_ldflags)))

self._autotools.configure(
args=args, configure_dir=self._source_subfolder, build=False, host=False, target=False)
return self._autotools
tc.configure_args.extends (args)
tc.generate()
tc = PkgConfigDeps(self)
tc.generate()
tc = AutotoolsDeps(self)
tc.generate()
# inject tools_require env vars in build context
ms = VirtualBuildEnv(self)
ms.generate(scope="build")
#self._autotools.configure(
# args=args, configure_dir=self.source_folder, build=False, host=False, target=False)
sorny92 marked this conversation as resolved.
Show resolved Hide resolved

def _split_and_format_options_string(self, flag_name, options_list):
if not options_list:
Expand Down