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.

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] Update to 5.0 #23312

Merged
merged 58 commits into from
Jan 3, 2023
Merged

[ffmpeg] Update to 5.0 #23312

merged 58 commits into from
Jan 3, 2023

Conversation

Sibras
Copy link
Contributor

@Sibras Sibras commented Feb 28, 2022

[ffmpeg] Updated to 5.0 release.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/ffmpeg/vcpkg.json

Valid values for the license field can be found in the documentation

@JonLiu1993 JonLiu1993 linked an issue Feb 28, 2022 that may be closed by this pull request
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Feb 28, 2022
@JonLiu1993
Copy link
Member

@Sibras ,Thanks for your pr, looks CI tested failed in many triplet,
Please take a look:
https://dev.azure.com/vcpkg/public/_build/results?buildId=68078&view=artifacts&pathAsName=false&type=publishedArtifacts

@Sibras
Copy link
Contributor Author

Sibras commented Feb 28, 2022

The errors in the CI were unfortunately somewhat expected.
ffmpeg builds fine but several other packages fail due to ffmpeg 5.0 removing older deprecated API. So any project that hasnt updated accordingly now fails to compile.

From the CI the current packages that only work with ffmpeg 4.x and not 5.x are:
aubio
avcpp
ignition
opencv4
pangolin

These projects would need to be fixed or possibly do one of those unwanted but perhaps necessary dual ffmpeg ports.

@cenit
Copy link
Contributor

cenit commented Feb 28, 2022

add also opencv2 and opencv3 that are not tested by CI (which for compatibility reasons tests only opencv4) but are still used anyway

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout e6509c997fef840f7cfdb84cf6e757b70ee283a8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index dfb11fa..f13931e 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "89a620b10d38c235afa130f17d59503035bcb1d5",
+      "git-tree": "e5fb0b01f935d3afb92285ba6ad1279c49a36878",
       "version": "5.0.0",
       "port-version": 0
     },

@JonLiu1993
Copy link
Member

@Sibras ,Is this pr temporarily blocked?

@Sibras
Copy link
Contributor Author

Sibras commented Mar 12, 2022

@Sibras ,Is this pr temporarily blocked?

Yep, I put it up so that people who want ffmpeg 5.0 know how to do it. But until a solution is provided to fix the downstream projects that are not compatible with 5.0 this PR is blocked.

Not sure what the best solution is to proceed. Either create a separate ffmpeg5 port, wait for some of those dependent projects to be fixed (some havnt been maintained for years so this is unlikely, opencv2/3 also unlikely to get fixed). Or have some way for dependency ports to specify what port versions (min/max) they support.

@JonLiu1993
Copy link
Member

Because of blocking, temporarily convert this pr to draft

@JonLiu1993 JonLiu1993 marked this pull request as draft March 18, 2022 09:13
@ghesketh
Copy link
Contributor

@Sibras ,Is this pr temporarily blocked?

Yep, I put it up so that people who want ffmpeg 5.0 know how to do it. But until a solution is provided to fix the downstream projects that are not compatible with 5.0 this PR is blocked.

Not sure what the best solution is to proceed. Either create a separate ffmpeg5 port, wait for some of those dependent projects to be fixed (some havnt been maintained for years so this is unlikely, opencv2/3 also unlikely to get fixed). Or have some way for dependency ports to specify what port versions (min/max) they support.

It seems like creating a new package (e.g., ffmpeg5) would be consistent with historical vcpkg practices, such as with opencv, sdl, etc.

@traversaro
Copy link
Contributor

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 5.0.0
-- Old SHA: 89a620b10d38c235afa130f17d59503035bcb1d5
-- New SHA: 6f361162d526d0dfa3843d54372e49d3c1b4bd99
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@horenmar
Copy link
Contributor

For the record, newer versions of opencv should also support ffmpeg 5.

@cenit
Copy link
Contributor

cenit commented Jun 16, 2022

i will try to back port support also to older version if reasonable

JonLiu1993
JonLiu1993 previously approved these changes Dec 23, 2022
@JonLiu1993 JonLiu1993 added requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Dec 23, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for ignition-cmake2 have changed but the version was not updated
version: 2.16.0
old SHA: 1e94a4739cf0e6197a67fbd5770cbff1afcf5f51
new SHA: e0229e6592e49e38cbd38efd2fdd2e7bfe6dbadb
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for ffmpeg have changed but the version was not updated
version: 5.0.0
old SHA: 63dd066e60c32d9e3ac36f821cf905affa1ba04b
new SHA: 91fa777293991dcc9d6c4043184ebdabcb606f4e
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for ignition-math6 have changed but the version was not updated
version: 6.9.2
old SHA: 6ba12e1d6fbb4b7b72e209a4dad9b3bf0ec83879
new SHA: 4e2aee16ba73208b597a3207829db009dab93775
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Dec 29, 2022
github-actions[bot]
github-actions bot previously approved these changes Dec 30, 2022
Comment on lines 4 to 11
"git-tree": "0a71b1f5734a3ead9f3941a4fae62aeeede10681",
"version": "4.4.3",
"port-version": 2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Sibras, Don't change the history "git-tree", please add new one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, got messed up in one of the many upstream merges.

github-actions[bot]
github-actions bot previously approved these changes Dec 30, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for ffmpeg have changed but the version was not updated
version: 5.0.0
old SHA: 91fa777293991dcc9d6c4043184ebdabcb606f4e
new SHA: f9ec761c4698e9009ab1b2fcf9f8a59ce5995bde
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@Sibras
Copy link
Contributor Author

Sibras commented Dec 31, 2022

All dependent ports have now been updated in master, this PR is now good to go.

@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed depends:different-pr This PR or Issue depends on a PR which has been filed requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Jan 3, 2023
@vicroms vicroms merged commit 0f719b3 into microsoft:master Jan 3, 2023
@vicroms
Copy link
Member

vicroms commented Jan 3, 2023

Thanks for all the hard work!

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Jan 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ffmpeg] update to 5.0