Skip to content
Snippets Groups Projects

meson: allow using OpenGL without libplacebo and not with glew.h missing on Win32

Merged Steve Lhomme requested to merge robUx4/vlc:bare-opengl into master
All threads resolved!

It's not defined if libplacebo is not found.

It also doesn't build with the Windows SDK which doesn't have glew.h.

Merge request reports

Merge request pipeline #312207 passed

Merge request pipeline passed for 8c46cfc2

Approval is optional

Merged by Steve LhommeSteve Lhomme 2 years ago (Feb 10, 2023 6:47am UTC)

Merge details

  • Changes merged into master with 8c46cfc2.
  • Deleted the source branch.
  • Auto-merge enabled

Pipeline #312211 passed

Pipeline passed for 8c46cfc2 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Steve Lhomme added 4 commits

    added 4 commits

    • 7ef3ebd3 - meson: do not use opengl_dep on Windows if glew.h is missing
    • 2a4a5fe1 - meson: don't compile OpenGL code on Windows if glew.h is missing
    • 4121cf29 - meson: allow using opengl without libplacebo
    • fb0fc5ab - meson: define X_DISPLAY_MISSING once

    Compare with previous version

  • Steve Lhomme resolved all threads

    resolved all threads

  • MR Acceptance result

    :tada: This MergeRequest has been Accepted! Congratulations.

    MR acceptance checks details:

    • :white_check_mark: MR should be considered mergeable by Gitlab
    • :white_check_mark: Last pipeline should be successful
    • :white_check_mark: MergeRequest should have at least one external review and/or vote
    • :white_check_mark: All threads should be resolved, and score >= 0
    • :white_check_mark: MergeRequest should have no activity (threads/votes) for (24h/24h)

    This message was automatically generated by homer-bot.

  • Steve Lhomme added 24 commits

    added 24 commits

    • fb0fc5ab...da353484 - 20 commits from branch videolan:master
    • 649f80e1 - meson: do not use opengl_dep on Windows if glew.h is missing
    • 8afa82d3 - meson: don't compile OpenGL code on Windows if glew.h is missing
    • 82c75ef0 - meson: allow using opengl without libplacebo
    • 8c46cfc2 - meson: define X_DISPLAY_MISSING once

    Compare with previous version

  • Steve Lhomme enabled an automatic merge when the pipeline for 8c46cfc2 succeeds

    enabled an automatic merge when the pipeline for 8c46cfc2 succeeds

  • merged

  • Please register or sign in to reply
    Loading