From patchwork Tue May 16 19:48:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1782289 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=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4QLRdp0JC7z20db for ; Wed, 17 May 2023 05:49:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 483EC429A0; Tue, 16 May 2023 19:49:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 483EC429A0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jm_tvNy1qULF; Tue, 16 May 2023 19:49:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 69A9A429A1; Tue, 16 May 2023 19:49:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 69A9A429A1 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D02281BF8A8 for ; Tue, 16 May 2023 19:49:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A9E23616C3 for ; Tue, 16 May 2023 19:49:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A9E23616C3 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 jzaQmUJ1-uat for ; Tue, 16 May 2023 19:49:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9B407616C9 Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9B407616C9 for ; Tue, 16 May 2023 19:49:00 +0000 (UTC) Received: from fwd73.dcpf.telekom.de (fwd73.aul.t-online.de [10.223.144.99]) by mailout12.t-online.de (Postfix) with SMTP id 341C810DAA for ; Tue, 16 May 2023 21:48:58 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.6.127]) by fwd73.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1pz0fI-3qEg3l0; Tue, 16 May 2023 21:48:56 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:53394) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pz0fH-0005RO-2N for buildroot@buildroot.org; Tue, 16 May 2023 21:48:55 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 16 May 2023 21:48:53 +0200 Message-Id: <20230516194855.1548486-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1684266536-D2FEE2C5-04562CBA/0/0 CLEAN NORMAL X-TOI-MSGID: 0a10dc20-38b6-44f9-8af5-1cb68a69425b Subject: [Buildroot] [PATCH v2 1/3] package/vdr: Fix patch for uclibc build 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" uClibc-ng 1.0.42 added support for getloadavg: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=ad3a130dad88ad7a59dcd965b0cf9bd0d713595e leading to build errors of the vdr package: skinlcars.c:1105:12: error: 'int getloadavg(double*, int)' was declared 'extern' and later 'static' [-fpermissive] since its version bump in buildroot: https://git.busybox.net/buildroot/commit/?id=61ae6add9e5d4761536fa4ff24150d5f8f82a61d Fixes: http://autobuild.buildroot.net/results/d3a/d3a65044fabdafa1b6d75a508eae006a2cfebdc0/ Signed-off-by: Bernd Kuhls --- I do not know whether all external toolchains were already updated to uClibc-ng >= 1.0.42 so I fixed the patch instead of removing it. Due to uClibc-ng providing getloadavg() sending 0001-getloadavg.patch makes no sense imho. v2: no changes package/vdr/0001-getloadavg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch index 9e6316e284..f6ba84c9e5 100644 --- a/package/vdr/0001-getloadavg.patch +++ b/package/vdr/0001-getloadavg.patch @@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +/* uclibc and dietlibc do not have this junk -ReneR */ +#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) ++int getloadavg (double loadavg[], int nelem) +{ + int fd; + From patchwork Tue May 16 19:48:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1782287 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4QLRdH32rSz20db for ; Wed, 17 May 2023 05:49:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8931C429B2; Tue, 16 May 2023 19:49:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8931C429B2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RtB3PznV9dAD; Tue, 16 May 2023 19:49:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 5FD8E42999; Tue, 16 May 2023 19:49:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5FD8E42999 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 71CDD1BF386 for ; Tue, 16 May 2023 19:49:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 508D5616C2 for ; Tue, 16 May 2023 19:49:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 508D5616C2 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 qerx5oSbV_2C for ; Tue, 16 May 2023 19:49:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C4A3D616B1 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp3.osuosl.org (Postfix) with ESMTPS id C4A3D616B1 for ; Tue, 16 May 2023 19:48:59 +0000 (UTC) Received: from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout07.t-online.de (Postfix) with SMTP id 0EF6FBE16 for ; Tue, 16 May 2023 21:48:57 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.6.127]) by fwd85.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1pz0fI-0HGELZ0; Tue, 16 May 2023 21:48:56 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:53394) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pz0fH-0005RO-2Y for buildroot@buildroot.org; Tue, 16 May 2023 21:48:55 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 16 May 2023 21:48:54 +0200 Message-Id: <20230516194855.1548486-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516194855.1548486-1-bernd.kuhls@t-online.de> References: <20230516194855.1548486-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1684266536-AD58EDAB-F433B210/0/0 CLEAN NORMAL X-TOI-MSGID: 7865d078-8172-48bd-ab11-4d636aea2a28 Subject: [Buildroot] [PATCH 2/3] package/vdr: reformatted patches 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" git-formatted patches due to the upstream repo using git: http://git.tvdr.de/?p=vdr.git Sent patches upstream and added Upstream: tags. Signed-off-by: Bernd Kuhls --- Resent patch, did not show-up on the buildroot mailinglist. .checkpackageignore | 3 -- ...compat.patch => 0002-Fix-musl-build.patch} | 49 ++++++++++++------ package/vdr/0003-Include-limits.h.patch | 51 +++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 ----------- ...at_cntr-is-an-internal-symbol-of-som.patch | 2 + 5 files changed, 87 insertions(+), 48 deletions(-) rename package/vdr/{0002-musl-compat.patch => 0002-Fix-musl-build.patch} (77%) create mode 100644 package/vdr/0003-Include-limits.h.patch delete mode 100644 package/vdr/0003-include-missing-limits.patch diff --git a/.checkpackageignore b/.checkpackageignore index 13f67695f5..2250f0ef08 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1596,9 +1596,6 @@ package/vde2/0001-no-cxx.patch Upstream package/vde2/0002-fstp-Add-static-to-inline-functions.patch Upstream package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch Upstream package/vdr/0001-getloadavg.patch Upstream -package/vdr/0002-musl-compat.patch Upstream -package/vdr/0003-include-missing-limits.patch Upstream -package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch Upstream package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream package/vlc/0002-automake-add-subdir-objects-option.patch Upstream package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch Upstream diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-Fix-musl-build.patch similarity index 77% rename from package/vdr/0002-musl-compat.patch rename to package/vdr/0002-Fix-musl-build.patch index b6f8f414a9..8c0b8d663b 100644 --- a/package/vdr/0002-musl-compat.patch +++ b/package/vdr/0002-Fix-musl-build.patch @@ -1,12 +1,28 @@ -Fix musl build +From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Tue, 16 May 2023 19:57:39 +0200 +Subject: [PATCH] Fix musl build Downloaded from https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch +Initial commit: +https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html + Signed-off-by: Bernd Kuhls +--- + i18n.h | 2 +- + osd.c | 2 +- + thread.c | 4 +++- + tools.c | 4 ++-- + tools.h | 14 ++++++++++++-- + vdr.c | 6 ++++++ + 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/i18n.h b/i18n.h -index f8ad9de..b002bbf 100644 +index 03deb6f2..85ce4077 100644 --- a/i18n.h +++ b/i18n.h @@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); @@ -19,7 +35,7 @@ index f8ad9de..b002bbf 100644 ///< the current language. If no translation is available, the original ///< string will be returned. diff --git a/osd.c b/osd.c -index 524700a..ef975f5 100644 +index 47bda686..0d360c81 100644 --- a/osd.c +++ b/osd.c @@ -12,7 +12,7 @@ @@ -32,10 +48,10 @@ index 524700a..ef975f5 100644 #include "tools.h" diff --git a/thread.c b/thread.c -index 47eb977..58dba43 100644 +index 93eb8c0d..6e854541 100644 --- a/thread.c +++ b/thread.c -@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) +@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter) writeLockThreadId = 0; pthread_rwlockattr_t attr; pthread_rwlockattr_init(&attr); @@ -45,7 +61,7 @@ index 47eb977..58dba43 100644 pthread_rwlock_init(&rwlock, &attr); } -@@ -205,7 +207,7 @@ cMutex::cMutex(void) +@@ -210,7 +212,7 @@ cMutex::cMutex(void) locked = 0; pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -55,10 +71,10 @@ index 47eb977..58dba43 100644 } diff --git a/tools.c b/tools.c -index 754673d..fef9d2d 100644 +index d04033b1..8b161eec 100644 --- a/tools.c +++ b/tools.c -@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) +@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName) { if (!FileName) return NULL; @@ -67,7 +83,7 @@ index 754673d..fef9d2d 100644 if (!TargetName) { if (errno == ENOENT) // file doesn't exist TargetName = strdup(FileName); -@@ -1528,7 +1528,7 @@ +@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir() struct dirent *cReadDir::Next(void) { if (directory) { @@ -77,7 +93,7 @@ index 754673d..fef9d2d 100644 #else while ((result = readdir(directory)) != NULL) { diff --git a/tools.h b/tools.h -index 73cca5a..03f5fd1 100644 +index ff6169ee..60eda179 100644 --- a/tools.h +++ b/tools.h @@ -28,6 +28,16 @@ @@ -97,7 +113,7 @@ index 73cca5a..03f5fd1 100644 typedef unsigned char uchar; extern int SysLogLevel; -@@ -400,7 +410,7 @@ +@@ -444,7 +454,7 @@ class cReadDir { private: DIR *directory; struct dirent *result; @@ -106,7 +122,7 @@ index 73cca5a..03f5fd1 100644 union { // according to "The GNU C Library Reference Manual" struct dirent d; char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; -@@ -738,7 +748,7 @@ public: +@@ -818,7 +828,7 @@ public: data[i] = T(0); size = 0; } @@ -116,10 +132,10 @@ index 73cca5a..03f5fd1 100644 qsort(data, size, sizeof(T), Compare); } diff --git a/vdr.c b/vdr.c -index 8a49471..c2a82aa 100644 +index 1bdc51ab..0f426e61 100644 --- a/vdr.c +++ b/vdr.c -@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) +@@ -661,12 +661,18 @@ int main(int argc, char *argv[]) } } else if (Terminal) { @@ -137,4 +153,7 @@ index 8a49471..c2a82aa 100644 +#endif } - isyslog("VDR version %s started", VDRVERSION); + // Set user id in case we were started as root: +-- +2.39.2 + diff --git a/package/vdr/0003-Include-limits.h.patch b/package/vdr/0003-Include-limits.h.patch new file mode 100644 index 0000000000..7ddfd1703c --- /dev/null +++ b/package/vdr/0003-Include-limits.h.patch @@ -0,0 +1,51 @@ +From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001 +From: Roberto Oliveira +Date: Tue, 16 May 2023 20:01:18 +0200 +Subject: [PATCH] Include limits.h + +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Initial commits: +https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339 +https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html + +Signed-off-by: Bernd Kuhls +--- + config.h | 1 + + tools.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 72dd3d2a..b9ea769f 100644 +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +diff --git a/tools.c b/tools.c +index 8b161eec..56a2e0dd 100644 +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ extern "C" { + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + +-- +2.39.2 + diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch deleted file mode 100644 index c2efe291e6..0000000000 --- a/package/vdr/0003-include-missing-limits.patch +++ /dev/null @@ -1,30 +0,0 @@ -vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined -in limits.h. -Needs to be explicitly included on ppc64le and for all archs for debug build. - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch - -Signed-off-by: Bernd Kuhls ----- - ---- a/config.h -+++ b/config.h -@@ -19,6 +19,7 @@ - #include "i18n.h" - #include "font.h" - #include "tools.h" -+#include - - // VDR's own version number: - ---- a/tools.c -+++ b/tools.c -@@ -27,6 +27,7 @@ - #include - #include "i18n.h" - #include "thread.h" -+#include - - int SysLogLevel = 3; - diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch index 9cc45a96c1..7b1a4c2c05 100644 --- a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -10,6 +10,8 @@ anything because musl has a basic NLS implementation. Even gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub libintl-musl implementation. +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029745.html + Signed-off-by: Thomas Petazzoni --- i18n.c | 2 ++ From patchwork Tue May 16 19:48:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1782288 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4QLRdY4N6cz20db for ; Wed, 17 May 2023 05:49:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9FCA0429A2; Tue, 16 May 2023 19:49:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9FCA0429A2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id byZwzKOlvWOf; Tue, 16 May 2023 19:49:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 30215429AC; Tue, 16 May 2023 19:49:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 30215429AC 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 B6E2C1BF386 for ; Tue, 16 May 2023 19:49:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 90D9D81EF0 for ; Tue, 16 May 2023 19:49:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 90D9D81EF0 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 7gfIiOwzNbdm for ; Tue, 16 May 2023 19:49:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 81C3C83F43 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by smtp1.osuosl.org (Postfix) with ESMTPS id 81C3C83F43 for ; Tue, 16 May 2023 19:49:01 +0000 (UTC) Received: from fwd78.dcpf.telekom.de (fwd78.aul.t-online.de [10.223.144.104]) by mailout02.t-online.de (Postfix) with SMTP id 1413A2AF3B for ; Tue, 16 May 2023 21:48:59 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.6.127]) by fwd78.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1pz0fI-4Wv6kD0; Tue, 16 May 2023 21:48:56 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:53394) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pz0fH-0005RO-3B for buildroot@buildroot.org; Tue, 16 May 2023 21:48:56 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 16 May 2023 21:48:55 +0200 Message-Id: <20230516194855.1548486-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516194855.1548486-1-bernd.kuhls@t-online.de> References: <20230516194855.1548486-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1684266536-08FC4714-2F771C9A/0/0 CLEAN NORMAL X-TOI-MSGID: 896dd6fa-cb0b-400c-b074-37dce08a7ae3 Subject: [Buildroot] [PATCH v2 3/3] package/vdr: fix musl build 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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/bdacedd845a2bf4db9826f0d3868f6b48d456d2a/ Signed-off-by: Bernd Kuhls --- v2: no changes package/vdr/0005-Fix-musl-build.patch | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/vdr/0005-Fix-musl-build.patch diff --git a/package/vdr/0005-Fix-musl-build.patch b/package/vdr/0005-Fix-musl-build.patch new file mode 100644 index 0000000000..390e78eab5 --- /dev/null +++ b/package/vdr/0005-Fix-musl-build.patch @@ -0,0 +1,37 @@ +From 075472ec580e03cc89971f0c118cb363776a304d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 16 May 2023 20:22:12 +0200 +Subject: [PATCH] Fix musl build + +malloc_trim is a GNU extension and therefore not present in non-glibc C +libraries such as musl. Wrapping this in an ifdef fixes musl builds. + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029742.html + +Signed-off-by: Bernd Kuhls +--- + vdr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vdr.c b/vdr.c +index 0f426e61..bc4902de 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -1588,12 +1588,14 @@ int main(int argc, char *argv[]) + cSchedules::Cleanup(); + // Plugins housekeeping: + PluginManager.Housekeeping(); ++#if defined(__GLIBC__) + // Memory cleanup: + static time_t LastMemoryCleanup = 0; + if ((Now - LastMemoryCleanup) > MEMCLEANUPDELTA) { + malloc_trim(0); + LastMemoryCleanup = Now; + } ++#endif + } + } + +-- +2.39.2 +