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

Fix FindAVDEVICE.cmake in case without pkg-config installed with ffmpeg >= 5.1 #330

Merged
merged 2 commits into from
Dec 22, 2022

Conversation

traversaro
Copy link
Contributor

@traversaro traversaro commented Dec 9, 2022

🦟 Bug fix

Summary

ffmpeg 5.1 changed the structure of version headers (see FFmpeg/FFmpeg@884c597), this PR fixes FindAVDEVICE.cmake to work correctly (i.e. finding the version number) even in the case in which no pkg-config is installed in the system.

The GitHub online editor also added a newline at the end of the file, let me know if it is ok to leave it, otherwise I can look how to remove it. I tried but apparently it is not possible anymore to commit a change via GitHub online editor without having automatically added a newline at the end of file.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@github-actions github-actions bot added 🏯 fortress Ignition Fortress 🏰 citadel Ignition Citadel labels Dec 9, 2022
@traversaro traversaro changed the title Fix FindAVDEVICE.cmake in case without pkg-config Fix FindAVDEVICE.cmake in case without pkg-config installed Dec 9, 2022
@traversaro traversaro changed the title Fix FindAVDEVICE.cmake in case without pkg-config installed Fix FindAVDEVICE.cmake in case without pkg-config installed with ffmpeg >= 5.1 Dec 9, 2022
@j-rivero
Copy link
Contributor

ffmpeg 5.1 changed the structure of version headers (see FFmpeg/FFmpeg@884c597),

Ummm it was 51 lines trivial text file used by many, I'm going to think that there was a good reason to do it :)

The GitHub online editor also added a newline at the end of the file, let me know if it is ok to leave it, otherwise I can look how to remove it. I tried but apparently it is not possible anymore to commit a change via GitHub online editor without having automatically added a newline at the end of file.

I tried to be clever than the editor and failed miserably. They probably are now trying to be serious with the POSIX standard on text files. I'm not here to go again the standards and to waste your time so let's consider it fine unless someone want's to argue the opposite.

@j-rivero j-rivero merged commit 4aa9523 into gazebosim:ign-cmake2 Dec 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel 🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants