From patchwork Wed Sep 19 19:55:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 971916 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42FrFQ0HFSz9sBq for ; Thu, 20 Sep 2018 05:55:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99277881DC; Wed, 19 Sep 2018 19:55:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Udz7BA6avMl4; Wed, 19 Sep 2018 19:55:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5932A881E9; Wed, 19 Sep 2018 19:55:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B206E1C0E11 for ; Wed, 19 Sep 2018 19:55:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ADFC7881ED for ; Wed, 19 Sep 2018 19:55:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D0ZwAi7RTPXi for ; Wed, 19 Sep 2018 19:55:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 29A0D881DC for ; Wed, 19 Sep 2018 19:55:30 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id ADACE4405FB; Wed, 19 Sep 2018 22:55:08 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Wed, 19 Sep 2018 22:55:23 +0300 Message-Id: <7acb964ef43990041ffde9bf8477122943a1c5aa.1537386923.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] libv4l: fix build with glibc 2.28 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add two upstream patches adding the needed header for the major/minor macros. Fixes: http://autobuild.buildroot.net/results/f38/f3858970c1bbb7b0201389f7656c9ccf15a59fda/ Cc: Fabrice Fontaine Signed-off-by: Baruch Siach --- ...5-libv4lconvert-fix-compiler-warning.patch | 45 +++++++++++++++++++ .../libv4l/0006-fix-glibc-2.28-build.patch | 23 ++++++++++ 2 files changed, 68 insertions(+) create mode 100644 package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch create mode 100644 package/libv4l/0006-fix-glibc-2.28-build.patch diff --git a/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch b/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch new file mode 100644 index 000000000000..941a51e638c5 --- /dev/null +++ b/package/libv4l/0005-libv4lconvert-fix-compiler-warning.patch @@ -0,0 +1,45 @@ +From 380fe7d4548a99bfcfc1594b6f0b3dd2369978f1 Mon Sep 17 00:00:00 2001 +From: Hans Verkuil +Date: Sun, 1 Apr 2018 12:10:33 +0200 +Subject: [PATCH] libv4lconvert: fix compiler warning + + CC control/libv4lconvert_la-libv4lcontrol.lo +control/libv4lcontrol.c: In function ‘v4lcontrol_get_usb_info’: +control/libv4lcontrol.c:391:13: warning: In the GNU C Library, "minor" is defined + by . For historical compatibility, it is + currently defined by as well, but we plan to + remove this soon. To use "minor", include + directly. If you did not intend to use a system-defined macro + "minor", you should undefine it after including . + c == '\n' && minor_dev == minor(st.st_rdev)) + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Dropped the '#if defined(MAJOR_IN_SYSMACROS)' to ensure that sysmacros.h +is always included. It seems that #if is no longer needed. At least, +nobody complained when I removed it in other places earlier :-) + +Signed-off-by: Hans Verkuil +Signed-off-by: Baruch Siach +--- +Upstream status: commit 380fe7d4548a9 + + lib/libv4lconvert/control/libv4lcontrol.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c +index 1e784eda8a92..59f28b137b98 100644 +--- a/lib/libv4lconvert/control/libv4lcontrol.c ++++ b/lib/libv4lconvert/control/libv4lcontrol.c +@@ -20,9 +20,7 @@ + */ + + #include +-#if defined(MAJOR_IN_SYSMACROS) + #include +-#endif + #include + #include + #include +-- +2.18.0 + diff --git a/package/libv4l/0006-fix-glibc-2.28-build.patch b/package/libv4l/0006-fix-glibc-2.28-build.patch new file mode 100644 index 000000000000..295c0bb54525 --- /dev/null +++ b/package/libv4l/0006-fix-glibc-2.28-build.patch @@ -0,0 +1,23 @@ +v4l2-ctl: fix glibc 2.28 build + +Include header needed for the major/minor macros in glibc 2.28+. + +This patch is extracted from upstream commit 65e7b2a4076845d (v4l2-ctl: show +media/entity info if available). + +Signed-off-by: Baruch Siach +--- +Upstream status: commit 65e7b2a4076845d + +diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp +index e02dc7563e50..12a19bc7ac06 100644 +--- a/utils/v4l2-ctl/v4l2-ctl.cpp ++++ b/utils/v4l2-ctl/v4l2-ctl.cpp +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include +