From patchwork Wed Apr 3 10:25:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 901 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BB62F6110E for ; Wed, 3 Apr 2019 12:25:57 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2A77A9AA; Wed, 3 Apr 2019 12:25:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554287157; bh=aFtJTRlak4oEQjDY4ywqQ2zlXRKvGj+Yg0DShaQGbO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eisuneg++3pLmQ10HQbxlKow3Nc//EkGm82s8VS+ELJxpZhkcugCt6EtqsImJC6bu jZfpXWJdf9cyKdg2QvrvtyQIyI/9SDClkG1E9CcWxPo96zGVt0Q/ZHx6RpwYQ6ld0W yMAyUs33XNL6GPCdHpxYewscHTOYbv2rOfmPYI2Q= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 17:25:44 +0700 Message-Id: <20190403102545.7143-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403102545.7143-1-kieran.bingham@ideasonboard.com> References: <20190403102545.7143-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: ipu3: Catch return value when disabling links X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 10:25:58 -0000 Ensure that any error from the disableLinks() call during match() is propogated to the caller. Fixes: d698ed27494a ("libcamera: ipu3: Create ImgUDevice class") Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/ipu3/ipu3.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 164e187c769d..fed04ce50387 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -511,7 +511,8 @@ bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator) * going through a library teardown->match() sequence would fail * at the moment. */ - if (imguMediaDev_->disableLinks()) + ret = imguMediaDev_->disableLinks(); + if (ret) goto error; ret = registerCameras(); From patchwork Wed Apr 3 10:25:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 902 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F0DE16110E for ; Wed, 3 Apr 2019 12:25:59 +0200 (CEST) Received: from Q.imgcgcw.net (unknown [147.50.13.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 547349B6; Wed, 3 Apr 2019 12:25:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1554287159; bh=FD1XdkfazQVqMRserQj3la/+Jp8ST8QPFmxEg4EPbdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=al1pHU9EQMCEEWHeLXejf1VbWRvN2LyvX9MmRYdhL0ekuwmphy1FtzuYZ8iXYz4wr VQgHPvSpWJjzOL0pd9DBZlRGErqmfznkCBtU+gZiC40LntF18Gb2Namry9xp+w3m2O pud+X9UuUJG8U69ABu30yiQ8qIVmahU8hr7hALxk= From: Kieran Bingham To: LibCamera Devel Date: Wed, 3 Apr 2019 17:25:45 +0700 Message-Id: <20190403102545.7143-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403102545.7143-1-kieran.bingham@ideasonboard.com> References: <20190403102545.7143-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] qcam: meson: Use pkg-config method for qt5 dependencies X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 10:26:00 -0000 Meson searches for qmake to determine if QT5 is available to support the optional qcam component. When cross compiling, meson can incorrectly identify the host qmake which will cause incorrect linkage and usage of system headers. Set the dependency method to specify pkg-config which resolves the issue. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/qcam/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 8a71cda3dfe5..3d8b1b3b759d 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -8,7 +8,10 @@ qcam_sources = files([ ]) import('qt5') -qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'], required : false) +qt5_dep = dependency('qt5', + method : 'pkg-config', + modules : ['Core', 'Gui', 'Widgets'], + required : false) if qt5_dep.found() qcam = executable('qcam', qcam_sources,