Skip to content

Conversation

@deviant
Copy link
Contributor

@deviant deviant commented Jun 10, 2021

Description

Fixes compilation against CEF 91.1.0 and later. The product_version setting has been renamed to user_agent_product.

(Note: only merge this once you update the officially supported CEF to 91.1.0 (Chromium 91.0.4472.19) or later)

Motivation and Context

Fixes a compilation failure. Here's the CEF commit that caused this.

How Has This Been Tested?

Built as part of OBS 27.0 using CEF 90.6.7 on NixOS (see NixOS/nixpkgs#126505).

OBS starts up and displays the chosen web page when a Browser source is configured.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX
Copy link
Member

RytoEX commented Jun 10, 2021

This looks like a breaking change that isn't ifdef'd, and for a version of CEF we don't officially support.

@deviant
Copy link
Contributor Author

deviant commented Jun 10, 2021

I'm aware of both, hence you should consider this WIP until you bump the supported version.

@deviant
Copy link
Contributor Author

deviant commented Jun 10, 2021

(I'm happy to stick it behind an ifdef if you can give me a pointer to the right place to define this, FWIW)

@RytoEX RytoEX marked this pull request as draft June 10, 2021 18:19
@deviant deviant mentioned this pull request Jun 11, 2021
11 tasks
@WizardCM
Copy link
Member

Yep, please stick this behind compile conditional as there is no guarantee on when each platform will have the relevant CEF build configured.

#if CHROME_VERSION_BUILD >= 4472
	CefString(&settings.user_agent_product) = prod_ver.str();
#else
	CefString(&settings.product_version) = prod_ver.str();
#endif

@WizardCM WizardCM added the Bug Fix Non-breaking change which fixes an issue label Jun 15, 2021
@WizardCM WizardCM added this to the OBS Studio 27.1 milestone Jun 19, 2021
@WizardCM WizardCM force-pushed the user_agent_product branch from cae6f09 to 1fc47fb Compare July 13, 2021 10:57
@WizardCM WizardCM marked this pull request as ready for review July 13, 2021 10:57
@WizardCM WizardCM merged commit ad006a5 into obsproject:master Jul 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug Fix Non-breaking change which fixes an issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants