From patchwork Fri Jun 25 15:44:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 12708 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 51B95C321A for ; Fri, 25 Jun 2021 15:44:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 74A4C684CF; Fri, 25 Jun 2021 17:44:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MZAX6lyr"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 326A0684C9 for ; Fri, 25 Jun 2021 17:44:11 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AB6EB8B6; Fri, 25 Jun 2021 17:44:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1624635850; bh=sDQw94+VSx85h760yvI7u+DanDn8QQ1Zyd9Hdh1ON0k=; h=From:To:Cc:Subject:Date:From; b=MZAX6lyrGpb0hywEJFwZc9CkFcpx0wlAHHNQafapAbb4yJQv7h3zXCEdUlJQpPggz 3By7BJM1CvZPEETbbOgwI+J960btxmefDJK20hym/a7tBs/nlmSIFZ7hHv5notAjPP 3jkMjhJa0P9VX3n0Ppv8Vkeej5sK7WPJSyOwnyII= From: Kieran Bingham To: libcamera devel Date: Fri, 25 Jun 2021 16:44:07 +0100 Message-Id: <20210625154407.1127913-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] media-libs/libcamera: Split out the Android camera HAL X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The camera HAL interface has historically been linked directly into the libcamera shared library. The HAL is now built as it's own .so file, so install accordingly. Switch from using dosym to making use of the cros-camera_dohal to aim for consistency with other HAL installations. BUG=None TEST=cros deploy ${DUT} libcamera && cros_camera_service Change-Id: I0d3f02218306e10f7d73a08a1546a2b89596127b --- Now that the libcamera split series is merged, this change is required to build libcamera on ChromeOS. For all the chrome users out there, you will need this patch to apply to your tree. This patch has already been submitted to chrome, and can be expected to be merged through those processes - but until then - here's what you'll need. -- Kieran media-libs/libcamera/libcamera-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild index c6b2ea63d74d..1e28d2e5c8ac 100644 --- a/media-libs/libcamera/libcamera-9999.ebuild +++ b/media-libs/libcamera/libcamera-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 CROS_WORKON_PROJECT="chromiumos/third_party/libcamera" CROS_WORKON_INCREMENTAL_BUILD="1" -inherit cros-workon meson +inherit cros-camera cros-workon meson DESCRIPTION="Camera support library for Linux" HOMEPAGE="https://www.libcamera.org" @@ -67,7 +67,7 @@ src_compile() { src_install() { meson_src_install - dosym ../libcamera.so "/usr/$(get_libdir)/camera_hal/libcamera.so" + cros-camera_dohal "${D}/usr/$(get_libdir)/libcamera-hal.so" libcamera-hal.so dostrip -x "/usr/$(get_libdir)/libcamera/" }