mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2024-11-19 20:08:27 +01:00
libliftoff: update
This commit is contained in:
parent
70ff0f5e28
commit
761ac51455
@ -1,39 +0,0 @@
|
|||||||
From 29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sergei Trofimovich <slyich@gmail.com>
|
|
||||||
Date: Thu, 21 Dec 2023 20:15:29 +0000
|
|
||||||
Subject: [PATCH] layer.c: fix build against upcoming `gcc-14`
|
|
||||||
(`-Werror=calloc-transposed-args`)
|
|
||||||
|
|
||||||
`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
|
|
||||||
detected minor infelicity in `calloc()` API usage in `libliftoff`:
|
|
||||||
|
|
||||||
../layer.c: In function 'liftoff_layer_create':
|
|
||||||
../layer.c:20:48: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in t
|
|
||||||
ument [-Werror=calloc-transposed-args]
|
|
||||||
20 | layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
|
|
||||||
| ^
|
|
||||||
../layer.c:20:48: note: earlier argument should specify number of elements, later size of each element
|
|
||||||
---
|
|
||||||
layer.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e]
|
|
||||||
|
|
||||||
diff --git a/layer.c b/layer.c
|
|
||||||
index 73a8186..6510ea7 100644
|
|
||||||
--- a/layer.c
|
|
||||||
+++ b/layer.c
|
|
||||||
@@ -17,8 +17,8 @@ liftoff_layer_create(struct liftoff_output *output)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
layer->output = output;
|
|
||||||
- layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
|
|
||||||
- output->device->planes_cap);
|
|
||||||
+ layer->candidate_planes = calloc(output->device->planes_cap,
|
|
||||||
+ sizeof(layer->candidate_planes[0]));
|
|
||||||
if (layer->candidate_planes == NULL) {
|
|
||||||
liftoff_log_errno(LIFTOFF_ERROR, "calloc");
|
|
||||||
free(layer);
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
@ -3,15 +3,12 @@ HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libliftoff"
|
|||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=master;protocol=https"
|
||||||
git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https \
|
|
||||||
file://29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPENDS = "libdrm"
|
DEPENDS = "libdrm"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
PV = "0.4.1"
|
PV = "0.5.0"
|
||||||
SRCREV = "e045589f37835d66e3ffe8130a597bb4eb9ee08f"
|
SRCREV = "8b08dc1c14fd019cc90ddabe34ad16596b0691f4"
|
||||||
|
|
||||||
inherit meson pkgconfig
|
inherit meson pkgconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user