Skip to content

fix hermeticity #3104

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

Open
hustlerone wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix hermeticity #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion plugins/common/wayfire/plugins/common/cairo-util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <wayfire/render.hpp>

// TODO: do we need some kind of dependency here?
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>

@ammen99 ammen99 Aug 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems wrong, on my system, pkg-config --cflags libdrm gives -I/usr/include/libdrm where drm_fourcc.h is located. wlroots also includes the header with just drm_fourcc.h so I think that after adding the drm dep, you shouldn't need this.

@teatwig teatwig Aug 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I think adding drm to the meson.build is the only change that should be necessary.
Even in nixpkgs pkg-config correctly returns .../libdrm as an include dir:

$ pkg-config --cflags libdrm 
-I/nix/store/jl06f30bsw7ya4qvlpawjqx23x52hm62-libdrm-2.4.133-dev/include -I/nix/store/jl06f30bsw7ya4qvlpawjqx23x52hm62-libdrm-2.4.133-dev/include/libdrm


namespace wf
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/ipc-rules/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all_include_dirs = [wayfire_api_inc, wayfire_conf_inc, plugins_common_inc, ipc_include_dirs]
all_deps = [wlroots, pixman, wfconfig, wftouch, json, plugin_pch_dep]
all_deps = [wlroots, pixman, wfconfig, wftouch, json, plugin_pch_dep, drm]

shared_module('ipc-rules', ['ipc-rules.cpp'],
include_directories: all_include_dirs,
Expand Down
2 changes: 1 addition & 1 deletion src/core/img.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <GLES2/gl2.h>
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>
#include <wayfire/util/log.hpp>
#include "wayfire/img.hpp"
#include "wayfire/opengl.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/core/output-layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <cstring>
#include <climits>
#include <unordered_set>
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>
#include <wayfire/seat.hpp>

#include <wayfire/debug.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/core/vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <wayfire/vulkan.hpp>
#include <fstream>
#include <wayfire/util/log.hpp>
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>
#include <cstring>
#include <glm/gtc/matrix_transform.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "wayfire/opengl.hpp"
#include <wayfire/scene-render.hpp>
#include <cmath>
#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>

/**
* SDR reference white luminance in cd/m², used when bridging between [0,1]-relative SDR linear
Expand Down
2 changes: 1 addition & 1 deletion test/support/headless-core-harness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <array>
#include <vector>

#include <drm_fourcc.h>
#include <libdrm/drm_fourcc.h>
#include <sys/stat.h>
#include <unistd.h>

Expand Down
Loading