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

[cmake][modules] FindBluray correctly append rather than set compile definition #25193

Merged
merged 1 commit into from May 11, 2024

Conversation

fuzzard
Copy link
Contributor

@fuzzard fuzzard commented May 11, 2024

Description

Fixes #25184

Motivation and context

Fix #25184. @78andyp if you wouldnt mind confirming.

How has this been tested?

Windows/macos correctly set HAVE_LIBBLURAY

What is the effect on users?

Fixes bluray support

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • Student submission (PR was done for educational purposes and will be treated as such)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • [ x] I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@fuzzard fuzzard added Type: Fix non-breaking change which fixes an issue CMake v22 "P" labels May 11, 2024
@fuzzard fuzzard added this to the "P" 22.0 Alpha 1 milestone May 11, 2024
Copy link
Member

@thexai thexai left a comment

Choose a reason for hiding this comment

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

Tested: confirmed opening Blu-Ray ISO is broken before and working after.

@78andyp
Copy link
Contributor

78andyp commented May 11, 2024

Hi. Works here as well - checked BDMV addition to library and playback - both fine, thanks.

@fuzzard fuzzard merged commit 5cce824 into xbmc:master May 11, 2024
2 checks passed
@fuzzard fuzzard deleted the fix_cmake_bluray branch May 11, 2024 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Type: Fix non-breaking change which fixes an issue v22 "P"
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commit #24064 breaks Bluray folder library addition and playback
3 participants