Thanks, applied as ac79f8676358bc9b6f1cfa1d9440da1ecd1ccc1d. Michael
[sent from post-receive hook] On Fri, 14 Feb 2025 10:02:11 +0100, Michael Tretter <[email protected]> wrote: > qcam has been ported to Qt6 and now depends on QT6. > > Signed-off-by: Michael Tretter <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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))) \
