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: conan v2 support #15819

Merged
merged 18 commits into from
Apr 13, 2023
Merged

ffmpeg: conan v2 support #15819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e2a924a
conan v2 support
SpaceIm Feb 8, 2023
e992a74
Merge branch 'master' into ffmpeg-conan-v2
SpaceIm Mar 22, 2023
8b79edb
remove base_path
SpaceIm Mar 22, 2023
1ad6773
limit the diff
SpaceIm Mar 23, 2023
d6a263b
back to shutil.copy
SpaceIm Mar 23, 2023
6fad507
typo
SpaceIm Mar 23, 2023
a94f2d9
chore: nuke `get_gnu_triplet`
Mar 29, 2023
584f517
note broken code path (only affect PkgConfigDeps)
Mar 29, 2023
946f37c
handle emtpy cflags & ldflags
SpaceIm Apr 1, 2023
fd1ed38
fix target arch & os
SpaceIm Apr 1, 2023
5f0359f
handle NM, AR, STRIP, LD & RANLIB
SpaceIm Apr 1, 2023
69a3141
back to previous logic regarding --pkg-config
SpaceIm Apr 2, 2023
139aafd
set default cc & cxx value if not set in profile
SpaceIm Apr 2, 2023
24395f1
fix component_version for ffmpeg >= 5.1
SpaceIm Apr 2, 2023
18f521d
don't add --as if with_asm is False
SpaceIm Apr 2, 2023
1b244ee
fix msvc
SpaceIm Apr 2, 2023
de0f80a
small fix
SpaceIm Apr 2, 2023
1cfddba
fill --pkg-config except on Linux
SpaceIm Apr 3, 2023
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
2 changes: 0 additions & 2 deletions recipes/ffmpeg/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ sources:
patches:
"5.1":
- patch_file: "patches/5.0-0001-fix-hwcontext_vulkan.patch"
base_path: "source_subfolder"
patch_description: "Compatibility with vulkan >= 1.3.239"
patch_type: "portability"
patch_source: "https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/eb0455d64690eed0068e5cb202f72ecdf899837c"
"5.0":
- patch_file: "patches/5.0-0001-fix-hwcontext_vulkan.patch"
base_path: "source_subfolder"
patch_description: "Compatibility with vulkan >= 1.3.239"
patch_type: "portability"
patch_source: "https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/eb0455d64690eed0068e5cb202f72ecdf899837c"
Loading