From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kJj/HevVRWH5aQAAgWs5BA (envelope-from ) for ; Sat, 18 Sep 2021 14:04:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sFrbGevVRWG4FwAA1q6Kng (envelope-from ) for ; Sat, 18 Sep 2021 12:04:59 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A95E61C12 for ; Sat, 18 Sep 2021 14:04:58 +0200 (CEST) Received: from localhost ([::1]:43408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRZ5V-0007SL-OZ for larch@yhetil.org; Sat, 18 Sep 2021 08:04:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRZ4c-00071s-T3 for guix-patches@gnu.org; Sat, 18 Sep 2021 08:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRZ4c-0003bR-LN for guix-patches@gnu.org; Sat, 18 Sep 2021 08:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRZ4c-0005Rz-4Z for guix-patches@gnu.org; Sat, 18 Sep 2021 08:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49970] [PATCH] gnu: Add librealsense. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 12:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49970 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: phodina Cc: 49970@debbugs.gnu.org Received: via spool by 49970-submit@debbugs.gnu.org id=B49970.163196658820876 (code B ref 49970); Sat, 18 Sep 2021 12:04:02 +0000 Received: (at 49970) by debbugs.gnu.org; 18 Sep 2021 12:03:08 +0000 Received: from localhost ([127.0.0.1]:33752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRZ3g-0005Qa-BY for submit@debbugs.gnu.org; Sat, 18 Sep 2021 08:03:08 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRZ3e-0005Q5-E0 for 49970@debbugs.gnu.org; Sat, 18 Sep 2021 08:03:03 -0400 Received: by mail-wm1-f65.google.com with SMTP id z184-20020a1c7ec1000000b003065f0bc631so11949453wmc.0 for <49970@debbugs.gnu.org>; Sat, 18 Sep 2021 05:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=f4DGc9rnYzbaNTAIiQIw1vV1ryZn4TxsQz7LPo7Tp9k=; b=UkfvsmieLcR4BC/MjwGpk6asR6mehsr6zVBHWOIJCovU72gdFXdpBfexbhTgIHnf9C TzDNG5qnkKppEwNyisCsnWzF4OOoxXxKTxUMuDqmDQkm9ulfn9fSX8w5xkppX/Do6yXf dwuWKOBg3VvdEZ/CY2tkX+NPWISn4Ik+TNRymX5Cb9HiCI+/lkkH4wCv+4Y5iXKLuvDl +0tZzUsFCD/byGiYy75nQqRkbFUjaAI4V/mBjYY0UuU/Asrg9YAIBaUfYTByPfbq992T +TqBE9O2wpTFkIhUhkr3gB+PPb9tXDScKkM3jIuU/zUJq+JPklxFhCzCvHvV3SxqpTQe PkNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=f4DGc9rnYzbaNTAIiQIw1vV1ryZn4TxsQz7LPo7Tp9k=; b=w6WCdH9l5NieeamV39rgcUsfR5HRqr5CMfcIJEm2qZGVC4JXC82YAwMaOAtJqhd3MH HVVsb9ROFSUVQf1Z/R4MHlCD5/L2TwnLBGh/MaEjqO7xX//VMsWXt5cjC+YzKMtKBYdc cIUC5fEsSh4MvhmBB6nRmIydPOhY0RY2g00MZ+lySyLCVjX5e2bTNl/Nfso804WLTfUW +Adf2NAdSJhOt9xzV043sj6LI8QPFRtEYreJjyaTr0UzQZuXfVYC5Y1i7WmzgeOREmFw p5ZNMM6SMDeQIcEguPrNQl2S0swwOEJXS2H42kHdWneODmlefAHQDaqNItPOCCo+mIEX +fFQ== X-Gm-Message-State: AOAM532jRJYA9bfJJ5A/ANrw3OqQ7mnlRtsZq9vq66fBVTDgcKtVlh3M EYPTMt3exfn0U5KKsHEyLjE= X-Google-Smtp-Source: ABdhPJwCO0QJXDlxP07xNwzjlcvNCrj3hzWmkFD5bPnB93pMm+8N1JvgLa22bX6OEaJYO77oldvTyA== X-Received: by 2002:a1c:228b:: with SMTP id i133mr20108485wmi.179.1631966576500; Sat, 18 Sep 2021 05:02:56 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u2sm9320674wmj.29.2021.09.18.05.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 05:02:55 -0700 (PDT) Message-ID: <77c3dd2d26f0497f83800ae56bd2e2ca87c17867.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 18 Sep 2021 14:02:54 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631966699; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=f4DGc9rnYzbaNTAIiQIw1vV1ryZn4TxsQz7LPo7Tp9k=; b=oRFF5eXZ2NeEV8Gj88WRxYEAiJHAdkAhqoxzu48fxaECO8wKryjR70PX9P+ANB5CZXcJm4 5VTFqvXsWtneJ8DKkbyIKoSzWoUPpuaCzxA8hK0jVYPJphNe3kps/gvH3rgPpcPMsHk1UM WmyG3LKFcma0cXv07vyo6IlM6cs1nxgTZXeR19EHfzkFMUGZdXSrfTonkb06/X9J+bPdpD Yvlnibv3jImTVwuFrRIGB8Xr5rsvpYCBx/KHwlTC51GnCseLm2Co/DxWlw/GIdVXb+UlJX D+MmLPUDo6OeRnXDTvaVhS78AjmV3kepglqOj0SMLoSURH4XaoXar6VSaJQeqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631966699; a=rsa-sha256; cv=none; b=aPceMBLSJ6d7BIH2mERZWbl6VJdk6TSL5/Nqm49eFcwI3+OYa4WOlyb/LlG0eRMs9UCJ8P 06M27y6dpmJ5uNCogzwVXeLMf8cpo6j8DEOkcWZY8gs6rPPSQ7ey0ZQijKk3icXcZ8kwtY RoNW/0Ie6F2311V8+El3Y+vJj5ioLZ/D65GQpU4Ace+ytrdW/t8QKtJVTOFb8e+VCSSywA 71EcImICn+bOXg8tczaajXvdsDOvNBNW726pNYVesxGKSMyVhKTgBRJvKsWSVnp6gRVPjj f38jD+yIoB08aI/DU9eYIa/O+T55a9j6NMH1cfszc+eiEiGVxqV0LG5xfMA22Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ukfvsmie; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ukfvsmie; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A95E61C12 X-Spam-Score: 0.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: aHZr6sUG4dqb Hi Petr, Am Samstag, den 18.09.2021, 11:47 +0000 schrieb phodina: > Hi Liliana, > > thanks for the comment! My appology for the licence. > --8<---------------cut here---------------start------------->8--- > * gnu/packages/video.scm (librealsense): New variable. > * gnu/packages/patches/librealsense-remove-network- > connectivity.patch: New file. Looking at this patch, it only seems to disable some warnings, which frankly we can choose to ignore. Is this really required to build librealsense? > diff --git a/gnu/packages/patches/librealsense-remove-network- > connectivity.patch b/gnu/packages/patches/librealsense-remove- > network-connectivity.patch > new file mode 100644 > index 0000000000..73926587ff > --- /dev/null > +++ b/gnu/packages/patches/librealsense-remove-network- > connectivity.patch > @@ -0,0 +1,68 @@ > +From cfc87289d7636f439e2b91d88e35430949b29c0f Mon Sep 17 00:00:00 > 2001 > +From: Petr Hodina > +Date: Sat, 31 Jul 2021 05:58:40 +0200 > +Subject: [PATCH] Remove network connectivity > + > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 0c15d9510..a4d891444 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.1.0) > + project(librealsense2 LANGUAGES CXX C) > + > + include(CMake/lrs_options.cmake) > +-include(CMake/connectivity_check.cmake) > + > + #Deprecation message, should be removed in future releases > + if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR > ${ANDROID_USB_HOST_UVC}) > +@@ -12,14 +11,12 @@ if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR > ${ANDROID_USB_HOST_UVC}) > + endif() > + > + # Checking Internet connection, as TM2 needs to download the FW > from amazon cloud > +-if(BUILD_WITH_TM2 AND NOT INTERNET_CONNECTION) > +- message(WARNING "No internet connection, disabling > BUILD_WITH_TM2") > ++if(BUILD_WITH_TM2) > + set(BUILD_WITH_TM2 OFF) > + endif() > + > + # Checking Internet connection, as DEPTH CAM needs to download the > FW from amazon cloud > +-if(IMPORT_DEPTH_CAM_FW AND NOT INTERNET_CONNECTION) > +- message(WARNING "No internet connection, disabling > IMPORT_DEPTH_CAM_FW") > ++if(IMPORT_DEPTH_CAM_FW) > + set(IMPORT_DEPTH_CAM_FW OFF) > + endif() > + > +diff --git a/common/fw/CMakeLists.txt b/common/fw/CMakeLists.txt > +index 32b1dd29a..9961e4d1d 100644 > +--- a/common/fw/CMakeLists.txt > ++++ b/common/fw/CMakeLists.txt > +@@ -6,8 +6,6 @@ project(fw) > + > + file(READ "firmware-version.h" ver) > + > +-message(STATUS "Fetching recommended firmwares:") > +- > + set(REALSENSE_FIRMWARE_URL "https://librealsense.intel.com" CACHE > STRING > + "URL to download firmware binaries from") > + > +@@ -51,16 +49,6 @@ set_target_properties (${PROJECT_NAME} PROPERTIES > FOLDER Resources) > + > + function(target_binary url version sha1 symbol ext) > + set(binary "${CMAKE_CURRENT_BINARY_DIR}/${symbol}- > ${version}${ext}") > +- message(STATUS "${url}/${symbol}-${version}${ext}") > +- file(DOWNLOAD "${url}/${symbol}-${version}${ext}" "${binary}" > +- EXPECTED_HASH SHA1=${sha1} > +- STATUS status) > +- list(GET status 0 error_code) > +- if (NOT ${error_code} EQUAL 0) > +- message(FATAL_ERROR "Download firmwnare (${status}) - ${url}") > +- else() > +- message(STATUS "Download firmware ${status} for ${symbol}- > ${version}${ext}") > +- endif() > + string(TOUPPER ${symbol} SYMBOL) > + string(REPLACE "." "," version_commas ${version}) > + string(REPLACE "\\" "\\\\" binary_escaped "${binary}") > +-- > +2.32.0 > + > diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm > index 1b9179c6a8..ee783338f4 100644 > --- a/gnu/packages/video.scm > +++ b/gnu/packages/video.scm > @@ -53,6 +53,7 @@ > ;;; Copyright © 2021 Maxim Cournoyer > ;;; Copyright © 2020 Hartmut Goebel > ;;; Copyright © 2021 Raghav Gururajan > +;;; Copyright © 2021 Petr Hodina > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -145,6 +146,7 @@ > #:use-module (gnu packages mp3) > #:use-module (gnu packages ncurses) > #:use-module (gnu packages networking) > + #:use-module (gnu packages ninja) > #:use-module (gnu packages ocr) > #:use-module (gnu packages pcre) > #:use-module (gnu packages perl) > @@ -577,6 +579,54 @@ other software.") > ;; Library. > license:lgpl3+)))) > > +(define-public librealsense > + (package > + (name "librealsense") > + (version "2.47.0") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url " > https://github.com/IntelRealSense/librealsense") > + (commit (string-append "v" version)))) > + (patches > + (search-patches "librealsense-remove-network- > connectivity.patch")) > + (file-name (git-file-name name version)) > + (modules '((guix build utils))) > + (sha256 > + (base32 > + "1jshhcnvbaa3xm5jr1s5m6z62wn1cspb7wkfdc1w88kp9j02ss8w" > )))) > + (build-system cmake-build-system) > + (arguments > + `(#:tests? #f ; tests require camera hardware > + #:configure-flags (list "-DBUILD_EXAMPLES=ON" > + "-DBUILD_GRAPHICAL_EXAMPLES=ON" > + "-DINTERNET_CONNECTION=OFF" > + "-DCHECK_FOR_UPDATES=OFF") > + #:phases > + (modify-phases %standard-phases > + ;; more convenient than manually invoking > setup_udev_rules.sh > + ;; and substituting the path in the script > + (add-after 'unpack 'copy-udev-rules > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (string-append (assoc-ref outputs "out") > + "/lib/udev/rules.d"))) > + (mkdir-p (string-append out)) > + (copy-file "config/99-realsense-libusb.rules" > + (string-append out > + "/99-realsense-libusb.rules")))))))) > + (native-inputs `(("pkg-config" ,pkg-config) > + ("ninja" ,ninja))) > + (inputs `(("glfw" ,glfw) > + ("gtk+" ,gtk+) > + ("libusb" ,libusb) > + ("glu" ,glu))) > + (synopsis "Intel RealSense SDK") > + (description "Intel RealSense SDK 2.0 is a cross-platform library > for > +Intel RealSense depth cameras (D400 & L500 series and the SR300) and > the > +T265 tracking camera.") > + (home-page "https://github.com/IntelRealSense/librealsense") > + (license license:asl2.0))) > + > (define-public tslib > (package > (name "tslib") librealsense also seems to bundle a bunch of software in its third- party directory. How much of that could we unbundle?