mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump libdrm dependency to 2.4.95 

96bef0517e "drm-backend: add support for
writeback connectors" started using DRM_MODE_CONNECTOR_WRITEBACK and
DRM_CLIENT_CAP_WRITEBACK_CONNECTORS. These were introduced in libdrm
2.4.95.

According to
https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/311
Ubunut Xenial is the only mentioned distribution that does not provide a
libdrm new enough. I think that is fine to drop now, 2016 was a good
while ago.

Libdrm 2.4.95 also introduced DRM_CLIENT_CAP_ASPECT_RATIO,
DRM_MODE_PICTURE_ASPECT_64_27, DRM_MODE_PICTURE_ASPECT_256_135.

The fallback definitions for the above are dropped.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2020-09-16 17:11:40 +03:00 committed by Daniel Stone
parent 7d2da94b05
commit 9b94a7d833
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libweston/backend-drm/drm-internal.h
View File

@ -60,10 +60,6 @@
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#ifndef DRM_CLIENT_CAP_ASPECT_RATIO
#define DRM_CLIENT_CAP_ASPECT_RATIO 4
#endif
#ifndef GBM_BO_USE_CURSOR #ifndef GBM_BO_USE_CURSOR
#define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64 #define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64
#endif #endif
@ -114,17 +110,6 @@
#define MAX_CLONED_CONNECTORS 4 #define MAX_CLONED_CONNECTORS 4
#ifndef DRM_MODE_PICTURE_ASPECT_64_27
#define DRM_MODE_PICTURE_ASPECT_64_27 3
#define DRM_MODE_FLAG_PIC_AR_64_27 \
(DRM_MODE_PICTURE_ASPECT_64_27<<19)
#endif
#ifndef DRM_MODE_PICTURE_ASPECT_256_135
#define DRM_MODE_PICTURE_ASPECT_256_135 4
#define DRM_MODE_FLAG_PIC_AR_256_135 \
(DRM_MODE_PICTURE_ASPECT_256_135<<19)
#endif
/** /**
* Represents the values of an enum-type KMS property * Represents the values of an enum-type KMS property

2
meson.build
View File

@ -144,7 +144,7 @@ dep_libinput = dependency('libinput', version: '>= 0.8.0')
dep_libevdev = dependency('libevdev') dep_libevdev = dependency('libevdev')
dep_libm = cc.find_library('m') dep_libm = cc.find_library('m')
dep_libdl = cc.find_library('dl') dep_libdl = cc.find_library('dl')
dep_libdrm = dependency('libdrm', version: '>= 2.4.86') dep_libdrm = dependency('libdrm', version: '>= 2.4.95')
dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true) dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true)
dep_threads = dependency('threads') dep_threads = dependency('threads')