From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 30 Jan 2025 12:27:57 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tdSiC-006JqC-0p for lore@lore.pengutronix.de; Thu, 30 Jan 2025 12:27:56 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tdSiC-0006Yo-Jk; Thu, 30 Jan 2025 12:27:56 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tdShx-0006YD-1w; Thu, 30 Jan 2025 12:27:41 +0100 From: Michael Tretter To: ptxdist@pengutronix.de Date: Thu, 30 Jan 2025 12:27:40 +0100 Message-Id: <20250130112740.2752410-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] libcamera: version bump 0.2.0 -> 0.4.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false qcam has been ported to Qt6 and now depends on QT6. Signed-off-by: Michael Tretter --- rules/libcamera.in | 9 +++++---- rules/libcamera.make | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rules/libcamera.in b/rules/libcamera.in index 83488113501c..efa65e6abad3 100644 --- a/rules/libcamera.in +++ b/rules/libcamera.in @@ -17,10 +17,11 @@ menuconfig LIBCAMERA select GST_PLUGINS_BASE1 if LIBCAMERA_GSTREAMER select LIBEVENT if LIBCAMERA_CAM select LIBDRM if LIBCAMERA_CAM_KMS_SINK - select QT5 if LIBCAMERA_QCAM - select QT5_MODULE_QTBASE if LIBCAMERA_QCAM - select QT5_MODULE_QTBASE_GUI if LIBCAMERA_QCAM - select QT5_MODULE_QTBASE_WIDGETS if LIBCAMERA_QCAM + select QT6 if LIBCAMERA_QCAM + select QT6_MODULE_QTBASE if LIBCAMERA_QCAM + select QT6_MODULE_QTBASE_GUI if LIBCAMERA_QCAM + select QT6_MODULE_QTBASE_WIDGETS if LIBCAMERA_QCAM + select QT6_OPENGL if LIBCAMERA_QCAM prompt "libcamera " help A complex camera support library for Linux, Android, and ChromeOS. diff --git a/rules/libcamera.make b/rules/libcamera.make index 77c29e22e44b..4b06142c21d8 100644 --- a/rules/libcamera.make +++ b/rules/libcamera.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera # # Paths and names # -LIBCAMERA_VERSION := 0.2.0 -LIBCAMERA_MD5 := 08f0681221c654838e54e6b3a32f89b5 +LIBCAMERA_VERSION := 0.4.0 +LIBCAMERA_MD5 := 286fe1efb70329bcb59a592db06134e3 LIBCAMERA := libcamera-$(LIBCAMERA_VERSION) LIBCAMERA_SUFFIX := tar.gz LIBCAMERA_URL := https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) @@ -72,6 +72,7 @@ LIBCAMERA_CONF_OPT := \ $(CROSS_MESON_USR) \ -Dandroid=disabled \ -Dcam=$(call ptx/endis,PTXCONF_LIBCAMERA_CAM)d \ + -Ddoc_werror=false \ -Ddocumentation=disabled \ -Dgstreamer=$(call ptx/endis,PTXCONF_LIBCAMERA_GSTREAMER)d \ -Dipas=$(subst $(ptx/def/space),$(ptx/def/comma),$(strip $(LIBCAMERA_IPASC-y))) \ -- 2.39.5