From patchwork Mon Jan 23 13:35:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 1730446 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 4P0rgm0CkDz23gd for ; Tue, 24 Jan 2023 00:35:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2C045405A5; Mon, 23 Jan 2023 13:34:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2C045405A5 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 TG2Z0seuTQtm; Mon, 23 Jan 2023 13:34:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 325DC40472; Mon, 23 Jan 2023 13:34:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 325DC40472 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 024231BF359 for ; Mon, 23 Jan 2023 13:34:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DF4BF81EBB for ; Mon, 23 Jan 2023 13:34:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DF4BF81EBB 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 G2O6U0ieKdJz for ; Mon, 23 Jan 2023 13:34:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B472F81E91 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by smtp1.osuosl.org (Postfix) with ESMTPS id B472F81E91 for ; Mon, 23 Jan 2023 13:34:40 +0000 (UTC) Received: by mail-ed1-x532.google.com with SMTP id v5so14589240edc.3 for ; Mon, 23 Jan 2023 05:34:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3NEhJJAhcUkItgE3T21op51704j/Zka7Xx4n+krGPrk=; b=Nu1l/jDWQ84CsLX6sjDqMBfe5JEpzl1TXLjv0mH8eDlilVkniwYCoQmGNC/ZIHEfmK V2gCwXDMggc+8STMD3xzMZGFgNpRjuOrIXoT4p2jBwdK/Epfa0qUoaJP1wq1veokavM2 w1N7pY5oCB4Sl9Zpn/CYenhMZH9mOon0r+8d7uE+up+u9u1H33dMxkyGQ55WA0Z2Sq80 dZXMuPMkgzwirFsQfq2sg/Pw/D0RmO5ZKY2x/mh5ZZmC1NlmJfvFBF0SHMT77cjIigYL 9lGpFYr9g27nAfxgmVzLUeOhgQ9Vrm74ZE8KyIOYeurs+n/C2aWk2mnXWKO91ZbPjDHd G5gw== X-Gm-Message-State: AFqh2krs33hrLCnlA1XoAzKhnjpnpCNUabqyW4pYGRF6dKl1irrbJvVR t3AOMz3WJSByJz71Y1k+7UMpDJJLE/Qnug== X-Google-Smtp-Source: AMrXdXtvCXv1NpThaAeP1lA88hzkCrgnSzK6d0+HfagEQx1stbnppTop8SrAH95W1hjmu6cy6evAAw== X-Received: by 2002:a05:6402:2315:b0:49e:6a70:d9a6 with SMTP id l21-20020a056402231500b0049e6a70d9a6mr15652489eda.25.1674480878510; Mon, 23 Jan 2023 05:34:38 -0800 (PST) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id b2-20020a0564021f0200b0048c85c5ad30sm21372953edb.83.2023.01.23.05.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:34:37 -0800 (PST) From: Marcus Folkesson To: buildroot@buildroot.org Date: Mon, 23 Jan 2023 14:35:25 +0100 Message-Id: <20230123133526.3371864-2-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230123133526.3371864-1-marcus.folkesson@gmail.com> References: <20230123133526.3371864-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3NEhJJAhcUkItgE3T21op51704j/Zka7Xx4n+krGPrk=; b=eJhkEmRrWZIEDeMNCIz4p40DGLHtR2chjquVmqRa80fU4g//dMrNgZCfOyHxpoOtzD TMBCN5ThxmW1ofkmE+h5kviCGE5tfd9LXUV3idM1DFacxtbUyN68Y4gQOS+L/9BtrQ0R 8/srDZtdsxiol2RJ15Dxjgiyv0yVGVjKCigoQa0bHs9cYMR+M1xmxmw/9BrHMgelS+Xi TQXk6jrE+1zom+EHLLFZYmrK5jgnjWKc7BqgqkBON7ymvHvJig96eeV0aF4WOxZ7yOgU bNN3Ce4REozhqPh0e0N0H9UqgEU4Avd4jK9uEoEIMBvcf2Wxf0mwVHpzLKHPASgwZYCu yyng== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=eJhkEmRr Subject: [Buildroot] [PATCH v2 2/3] package/libcamera-apps: bump to version 1.1.0 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: Marcus Folkesson , Kieran Bingham Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Marcus Folkesson --- ...ror-and-Wfatal-errors-compiler-comma.patch | 37 ------------------ ...preview-compile-conversion-from-Wind.patch | 39 ------------------- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 4 +- 4 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch delete mode 100644 package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch diff --git a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch deleted file mode 100644 index 988d89cca3..0000000000 --- a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 5 Feb 2021 18:24:08 +0100 -Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command - line option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes (with bootlin-riscv64-musl toolchain): - - .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ‘long unsigned int’ to ‘int’ changes value from ‘2154321408’ to ‘-2140645888’ [-Werror=overflow] - 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - | ^~~~~~~~~~~~~~~ - cc1plus: all warnings being treated as errors - -Signed-off-by: Peter Seiderer ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 748c6dd..1ca1e39 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ endif() - - set (CMAKE_EXPORT_COMPILE_COMMANDS ON) - set (CMAKE_CXX_STANDARD 17) --add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) -+add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) - add_definitions(-D_FILE_OFFSET_BITS=64) - - if (CMAKE_COMPILER_IS_GNUCXX) --- -2.34.1 - diff --git a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch b/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch deleted file mode 100644 index cc9069aa86..0000000000 --- a/package/libcamera-apps/0002-preview-fix-egl_preview-compile-conversion-from-Wind.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 60715769cd5368a63b2bdc2e6d6bb6df0030a54d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 31 Mar 2022 21:44:22 +0200 -Subject: [PATCH] preview: fix egl_preview compile (conversion from Window to - EGLNativeWindowType) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/preview/egl_preview.cpp:329:69: error: invalid conversion from ‘Window’ {aka ‘long unsigned int’} to ‘EGLNativeWindowType’ {aka ‘fbdev_window*’} [-fpermissive] - 329 | egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); - | ^~~~~~~ - | | - | Window {aka long unsigned int} - -[Upstream: https://github.com/raspberrypi/libcamera-apps/pull/283] -Signed-off-by: Peter Seiderer ---- - preview/egl_preview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/preview/egl_preview.cpp b/preview/egl_preview.cpp -index b936e57..593583d 100644 ---- a/preview/egl_preview.cpp -+++ b/preview/egl_preview.cpp -@@ -326,7 +326,7 @@ void EglPreview::makeWindow(char const *name) - wm_delete_window_ = XInternAtom(display_, "WM_DELETE_WINDOW", False); - XSetWMProtocols(display_, window_, &wm_delete_window_, 1); - -- egl_surface_ = eglCreateWindowSurface(egl_display_, config, window_, NULL); -+ egl_surface_ = eglCreateWindowSurface(egl_display_, config, reinterpret_cast(window_), NULL); - if (!egl_surface_) - throw std::runtime_error("eglCreateWindowSurface failed"); - --- -2.35.1 - diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 2dbb74d463..cc2d3b6926 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 2d895ad5d11a6004b1e84eb8d486d5dca64dda1b41e0f4f3f87904666f249e3e libcamera-apps-1.1.0.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index f4fc019c17..a5d9227250 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 -LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_VERSION = 1.1.0 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \