From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [ptxdist] [PATCH] libcamera: version bump 0.2.0 -> 0.4.0
Date: Thu, 30 Jan 2025 12:27:40 +0100 [thread overview]
Message-ID: <20250130112740.2752410-1-m.tretter@pengutronix.de> (raw)
qcam has been ported to Qt6 and now depends on QT6.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
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
next reply other threads:[~2025-01-30 11:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-30 11:27 Michael Tretter [this message]
2025-02-14 9:02 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250130112740.2752410-1-m.tretter@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox