From patchwork Sun May 7 14:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1778130 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QDmqx6Rztz213r for ; Mon, 8 May 2023 00:23:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D61C0613AB; Sun, 7 May 2023 14:23:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D61C0613AB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3xsJRfYzxMcw; Sun, 7 May 2023 14:23:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 52EA260A9C; Sun, 7 May 2023 14:23:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 52EA260A9C X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 963FC1BF2F8 for ; Sun, 7 May 2023 14:23:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6FFF982176 for ; Sun, 7 May 2023 14:23:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6FFF982176 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3x96EuLM0dSG for ; Sun, 7 May 2023 14:23:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EC23B8215C Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by smtp1.osuosl.org (Postfix) with ESMTPS id EC23B8215C for ; Sun, 7 May 2023 14:23:22 +0000 (UTC) Received: from fwd89.dcpf.telekom.de (fwd89.aul.t-online.de [10.223.144.115]) by mailout02.t-online.de (Postfix) with SMTP id 8C40F1A881; Sun, 7 May 2023 16:23:20 +0200 (CEST) Received: from fli4l.lan.fli4l ([79.214.192.80]) by fwd89.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1pvfIF-1DeeGH0; Sun, 7 May 2023 16:23:19 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:49366) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pvfIF-0006RF-10; Sun, 07 May 2023 16:23:19 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 7 May 2023 16:23:19 +0200 Message-Id: <20230507142319.1001150-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507142319.1001150-1-bernd.kuhls@t-online.de> References: <20230507142319.1001150-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1683469399-D3FFCC25-36E744C6/0/0 CLEAN NORMAL X-TOI-MSGID: 23cffa24-542b-4664-becf-0af7795d20fc Subject: [Buildroot] [PATCH 2/2] package/libdisplay-info: new package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Needed for upcoming Kodi version 21.0-Omega. Depends on the previous patch to enable staging install of hwdata. Disable -fPIC on BR2_m68k_cf to avoid build failure: /tmp/ccgMh4YA.s: Assembler messages: /tmp/ccgMh4YA.s: Fatal error: Tried to convert PC relative branch to absolute jump For details see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101971#c11 Signed-off-by: Bernd Kuhls --- 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 | 24 +++++++++++++ 6 files changed, 73 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 57b67e091e..10ab602a0b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -364,6 +364,7 @@ F: package/libbluray/ F: package/libbroadvoice/ 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 eaac32a01a..b59bd74dec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1676,6 +1676,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..334b786fff --- /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/-/merge_requests/163 + +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..d11f682a5a --- /dev/null +++ b/package/libdisplay-info/libdisplay-info.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# 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 + +# m68k_cf can't use meson's default -fPIC, so we need to disable it to +# avoid a build failure. +ifeq ($(BR2_m68k_cf),y) +LIBDISPLAY_INFO_CONF_OPTS += -Db_staticpic=false +endif + +$(eval $(meson-package))