sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Require libdrm >= 2.4.95

Browse source 
So we can drop the DRM_FORMAT_INVALID fallback

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3480>
This commit is contained in:
Bilal Elmoussaoui 2024-01-03 14:44:48 +01:00
parent a72f44132d
commit 786a9d9072
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -51,6 +51,7 @@ wayland_protocols_req = '>= 1.32'
# native backend version requirements # native backend version requirements
libinput_req = '>= 1.19.0' libinput_req = '>= 1.19.0'
gbm_req = '>= 21.3' gbm_req = '>= 21.3'
libdrm_req = '>= 2.4.95'
# screen cast version requirements # screen cast version requirements
libpipewire_req = '>= 0.3.33' libpipewire_req = '>= 0.3.33'
@ -270,7 +271,7 @@ if have_native_backend
endif endif
if have_wayland or have_native_backend if have_wayland or have_native_backend
libdrm_dep = dependency('libdrm') libdrm_dep = dependency('libdrm', version: libdrm_req)
endif endif
have_egl_device = get_option('egl_device') have_egl_device = get_option('egl_device')

5
src/backends/native/meta-kms-utils.c
View file

@ -23,11 +23,6 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include <glib.h> #include <glib.h>
/* added in libdrm 2.4.95 */
#ifndef DRM_FORMAT_INVALID
#define DRM_FORMAT_INVALID 0
#endif
float float
meta_calculate_drm_mode_refresh_rate (const drmModeModeInfo *drm_mode) meta_calculate_drm_mode_refresh_rate (const drmModeModeInfo *drm_mode)
{ {

5
src/backends/native/meta-renderer-native.c
View file

@ -76,11 +76,6 @@
#define EGL_DRM_MASTER_FD_EXT 0x333C #define EGL_DRM_MASTER_FD_EXT 0x333C
#endif #endif
/* added in libdrm 2.4.95 */
#ifndef DRM_FORMAT_INVALID
#define DRM_FORMAT_INVALID 0
#endif
struct _MetaRendererNative struct _MetaRendererNative
{ {
MetaRenderer parent; MetaRenderer parent;