diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.com> | 2020-09-16 17:11:40 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2020-10-16 16:20:54 +0000 |
| commit | 9b94a7d833b4171d9482401309ecee5f1bf40996 (patch) | |
| tree | e276ca5042324a4fcd79feef45d4d00d642d193d | |
| parent | 7d2da94b05eb0ca1fda75e45254cbe05ceea7088 (diff) | |
Bump libdrm dependency to 2.4.95
96bef0517ec5318c6c253f27fc2f4aeb289bad9b "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>
| -rw-r--r-- | libweston/backend-drm/drm-internal.h | 15 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h index 6d491576..ec9cc437 100644 --- a/libweston/backend-drm/drm-internal.h +++ b/libweston/backend-drm/drm-internal.h @@ -60,10 +60,6 @@ #include "backend.h" #include "libweston-internal.h" -#ifndef DRM_CLIENT_CAP_ASPECT_RATIO -#define DRM_CLIENT_CAP_ASPECT_RATIO 4 -#endif - #ifndef GBM_BO_USE_CURSOR #define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64 #endif @@ -114,17 +110,6 @@ #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 diff --git a/meson.build b/meson.build index 757c58dc..cb1c6bb0 100644 --- a/meson.build +++ b/meson.build @@ -144,7 +144,7 @@ dep_libinput = dependency('libinput', version: '>= 0.8.0') dep_libevdev = dependency('libevdev') dep_libm = cc.find_library('m') 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_threads = dependency('threads') |