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.

Sign up for GitHub

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

Jump to bottom

Use libgl-devel and libegl-devel #284

Closed
wants to merge 4 commits into from
Closed

Use libgl-devel and libegl-devel #284

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
167a261
Use libgl-devel and libegl-devel
isuruf Aug 13, 2024
aad8846
Keep libdrm-devel for now
isuruf Aug 13, 2024
2aaae17
use libdrm
isuruf Aug 13, 2024
9a57c4d
MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and co…
Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ source:
folder: opengl32sw # [win64]

build:
number: 24
number: 25
detect_binary_files_with_prefix: true
run_exports:
- {{ pin_subpackage('qt-main', max_pin='x.x') }}
Expand All @@ -69,12 +69,6 @@ requirements:
- {{ compiler('c') }}
- {{ stdlib("c") }}
- {{ compiler('cxx') }}
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-libegl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libdrm-devel') }} # [linux]
- {{ cdt('libglvnd-glx') }} # [linux]
- {{ cdt('libglvnd-egl') }} # [linux]
# For fontconfig + freetype
- pkg-config # [unix]
- make # [unix]
Expand Down Expand Up @@ -103,6 +97,9 @@ requirements:
# pin llvm<16 because of: https://bugreports.qt.io/browse/PYSIDE-2288
- clangdev >=9, <16 # [arm64]
host:
- libdrm # [linux]
- libgl-devel # [linux]
- libegl-devel # [linux]
# For pkg-config gl, fontconfig + freetype
- pthread-stubs # [linux]
- dbus # [linux]
Expand Down Expand Up @@ -189,12 +186,8 @@ requirements:
test:
requires:
- {{ compiler('cxx') }}
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-libegl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libdrm-devel') }} # [linux]
- {{ cdt('libglvnd-glx') }} # [linux]
- {{ cdt('libglvnd-egl') }} # [linux]
- libgl-devel # [linux]
- libegl-devel # [linux]
- make # [unix]
- xcb-util # [linux]
- xorg-libxdamage # [linux]
Expand Down
3 changes: 0 additions & 3 deletions recipe/yum_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
mesa-libGL
mesa-libGL-devel
mesa-libEGL-devel
mesa-dri-drivers
Copy link
Contributor

Choose a reason for hiding this comment

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

Why can’t all of these be removed too?

Copy link
Member

Choose a reason for hiding this comment

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

They can and should.

Copy link
Member

Choose a reason for hiding this comment

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

All of them should be removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

I also believe that we need a rerender for these changes to take effect, don't we?

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess the tests don't need any EGL implementation. If they did, we would need them

libX11-devel
libglvnd-glx
Loading