From af85e45afcd677ce240fc951a18de9afb0ec0015 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 20:31:05 +0200 Subject: [PATCH] package/libdisplay-info: new package Needed for upcoming Kodi version 21.0-Omega. Depends on the previous patch to fix build error on Coldfire. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...0001-displayid.c-Include-sys-types.h.patch | 36 +++++++++++++++++++ package/libdisplay-info/Config.in | 8 +++++ package/libdisplay-info/libdisplay-info.hash | 3 ++ package/libdisplay-info/libdisplay-info.mk | 18 ++++++++++ 6 files changed, 67 insertions(+) create mode 100644 package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch create mode 100644 package/libdisplay-info/Config.in create mode 100644 package/libdisplay-info/libdisplay-info.hash create mode 100644 package/libdisplay-info/libdisplay-info.mk diff --git a/DEVELOPERS b/DEVELOPERS index c1819954ae..3237c90c39 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -362,6 +362,7 @@ F: package/libbroadvoice/ F: package/libcap/ F: package/libcdio/ F: package/libcec/ +F: package/libdisplay-info/ F: package/libcodec2/ F: package/libcrossguid/ F: package/libdeflate/ diff --git a/package/Config.in b/package/Config.in index 9cdbd677ff..c9d5c9ccaa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1679,6 +1679,7 @@ menu "Hardware handling" source "package/libatasmart/Config.in" source "package/libblockdev/Config.in" source "package/libcec/Config.in" + source "package/libdisplay-info/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" source "package/libftdi1/Config.in" diff --git a/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch b/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch new file mode 100644 index 0000000000..3fa57ee10d --- /dev/null +++ b/package/libdisplay-info/0001-displayid.c-Include-sys-types.h.patch @@ -0,0 +1,36 @@ +From 648c1cb66b571b037976b61363654f39448f5fac Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 7 May 2023 14:14:48 +0200 +Subject: [PATCH] displayid.c: Include sys/types.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build error +../displayid.c:377:10: error: ‘ssize_t’ undeclared (first use in this function); did you mean ‘size_t’? + +seen with: +arc-linux-gcc.br_real (Buildroot 2021.11-4428-g6b6741b) 10.2.0 + +Upstream: https://gitlab.freedesktop.org/emersion/libdisplay-info/-/commit/5c9801a75f2815790ad1ed5500cec2728a36c6ec + +Signed-off-by: Bernd Kuhls +--- + displayid.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/displayid.c b/displayid.c +index 398772b..f1749c6 100644 +--- a/displayid.c ++++ b/displayid.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #include "bits.h" + #include "displayid.h" +-- +2.39.2 + diff --git a/package/libdisplay-info/Config.in b/package/libdisplay-info/Config.in new file mode 100644 index 0000000000..b8363ed61b --- /dev/null +++ b/package/libdisplay-info/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBDISPLAY_INFO + bool "libdisplay-info" + select BR2_PACKAGE_HWDATA + select BR2_PACKAGE_HWDATA_PNP_IDS + help + EDID and DisplayID library. + + https://gitlab.freedesktop.org/emersion/libdisplay-info diff --git a/package/libdisplay-info/libdisplay-info.hash b/package/libdisplay-info/libdisplay-info.hash new file mode 100644 index 0000000000..a0829479a8 --- /dev/null +++ b/package/libdisplay-info/libdisplay-info.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 51cdb0362882ca2af62532ab4d95e60d81e9890b339264719fd55f8e3945d695 libdisplay-info-0.1.1.tar.bz2 +sha256 15b396244e58830c5614b9394f4deccfe684970cd507f299383ab57ad339eedd LICENSE diff --git a/package/libdisplay-info/libdisplay-info.mk b/package/libdisplay-info/libdisplay-info.mk new file mode 100644 index 0000000000..26a6a9a4d9 --- /dev/null +++ b/package/libdisplay-info/libdisplay-info.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libdisplay-info +# +################################################################################ + +LIBDISPLAY_INFO_VERSION = 0.1.1 +LIBDISPLAY_INFO_SOURCE = libdisplay-info-$(LIBDISPLAY_INFO_VERSION).tar.bz2 +LIBDISPLAY_INFO_SITE = https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/$(LIBDISPLAY_INFO_VERSION) +LIBDISPLAY_INFO_LICENSE = MIT +LIBDISPLAY_INFO_LICENSE_FILES = LICENSE +LIBDISPLAY_INFO_INSTALL_STAGING = YES +LIBDISPLAY_INFO_DEPENDENCIES = hwdata + +# workaround for static_assert on uclibc-ng < 1.0.42 +LIBDISPLAY_INFO_CFLAGS += $(TARGET_CFLAGS) -Dstatic_assert=_Static_assert + +$(eval $(meson-package))