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

Update deps: zstd, FFmpeg #79

Merged
merged 3 commits into from
Mar 31, 2023
Merged

Update deps: zstd, FFmpeg #79

merged 3 commits into from
Mar 31, 2023

Conversation

klecki
Copy link
Contributor

@klecki klecki commented Mar 28, 2023

No description provided.

@klecki
Copy link
Contributor Author

klecki commented Mar 28, 2023

7739801 and 7739797

@klecki klecki mentioned this pull request Mar 28, 2023
Merged
18 tasks
@klecki
Update deps: Protobuf, zstd, FFmpeg
bfe09b8 
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>

Forgot to update FFmpeg

Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
@JanuszL JanuszL assigned JanuszL and unassigned awolant Mar 29, 2023
@JanuszL
Copy link
Contributor

JanuszL commented Mar 29, 2023

I think we need to add --init to this line https://github.com/NVIDIA/DALI/blob/main/docker/Dockerfile.deps#L53.

@klecki
Copy link
Contributor Author

klecki commented Mar 29, 2023 •
edited

I think we need to add --init to this line NVIDIA/DALI@main/docker/Dockerfile.deps#L53.

I agree, if I have a submodule, I always hit it with the --init.

@klecki
Remove ffmpeg patches that were upstreamed
7df53a4 
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
@klecki
Revert protobuf update that breaks CMake transitive dependencies
00b8321 
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
@klecki
Copy link
Contributor Author

klecki commented Mar 30, 2023

After the recent Protobuf breaking change, they broke transitive dependency linking in their CMake build:
protocolbuffers/protobuf#12292
protocolbuffers/protobuf#12201

Revert the update until it can be updated with additional workarounds from us.

@klecki klecki changed the title Update deps: Protobuf, zstd, FFmpeg Update deps: zstd, FFmpeg Mar 31, 2023
@klecki klecki merged commit 88c2edb into NVIDIA:main Mar 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@banasraf banasraf banasraf approved these changes

@JanuszL JanuszL JanuszL approved these changes

Assignees

@banasraf banasraf

@JanuszL JanuszL

Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@klecki @JanuszL @banasraf @awolant