From patchwork Tue May 19 13:42:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 22213 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 658D927BBE3; Tue, 19 May 2020 14:44:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BB91327BBE1 for ; Tue, 19 May 2020 14:44:07 +0100 (BST) Received: from localhost ([::1]:44398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb2XP-00012d-BA for patchwork@mira.cbaines.net; Tue, 19 May 2020 09:44:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb2XK-00012Q-5b for guix-patches@gnu.org; Tue, 19 May 2020 09:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jb2XJ-0003w7-Sm for guix-patches@gnu.org; Tue, 19 May 2020 09:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jb2XJ-0000zZ-P6 for guix-patches@gnu.org; Tue, 19 May 2020 09:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41294] [PATCH] gnu: Add libfreenect. Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 May 2020 13:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "iyzsong@member.fsf.org" Cc: "41294\\@debbugs.gnu.org" <41294@debbugs.gnu.org> Received: via spool by 41294-submit@debbugs.gnu.org id=B41294.15898957923728 (code B ref 41294); Tue, 19 May 2020 13:44:01 +0000 Received: (at 41294) by debbugs.gnu.org; 19 May 2020 13:43:12 +0000 Received: from localhost ([127.0.0.1]:49612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jb2WS-0000xz-Jq for submit@debbugs.gnu.org; Tue, 19 May 2020 09:43:12 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:20581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jb2WM-0000xP-8e for 41294@debbugs.gnu.org; Tue, 19 May 2020 09:43:06 -0400 Date: Tue, 19 May 2020 13:42:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail; t=1589895774; bh=P8klUeX3rCgsgmUjN251813G3hKtwadWCgRAiShYd6k=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Atkdic7g7H8x2o0ez1wBAUas4vYG46PFcFLVi8sP1bidd6bUUeOWTUdq5uEf10nYd qvEP9WB3FLoPATdg+I+iaoW8/waSbM0GjBvJD/B91E1cWbjHIwTCw/40HU4B4vO1Ge I0mPPlzZE4xmMzBEbBk/KQI2XzNWch6yhZK1XgBg= From: Ekaitz Zarraga Message-ID: In-Reply-To: <87eergqcn4.fsf@member.fsf.org> References: <5kf9uJF2SDo9zwlTUoFI13o7P7q68o-AuSp72MvOp5PUaF2SlAPxzQJvFws5aaTOB5EHY4T3-En0Mhba7hADMIeJkgCeWUOY_Ciy0fv24Ck=@elenq.tech> <87k11c5ymm.fsf@member.fsf.org> <87sgfz1f43.fsf@member.fsf.org> <87eergqcn4.fsf@member.fsf.org> MIME-Version: 1.0 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: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, > > There's some kind of weird magic I'm not getting. > > Hello, I don't know the whole detail too, but to build a package, guix likely: > > - Load and eval the package module, to get the package object. The > 'arguments' field is a list. > - Convert this package object to a derivation, and write it in store as > a file (/gnu/store/*.drv). Where 'arguments' being part of the > builder, serialize as string to the file, it dosen't do complex things > for procedure bindings, only write their string descriptions... So > when the builder file is loaded, you get `Unknown object` errors. > > Here, to avoid duplicating the code, you can: > > > 1. Unquote list value into `arguments`. (eg: 'asdf-substitutions' in lisp.scm) This doesn't work for me. I don't know why. Just moved the lambda to a (define* deactivate-sources ...) and then when I try to put the name like (arguments `( #tests? .... ,deactivate-sources ...) Shoots an Unknown object error. I add a diff below to let you see the whole picture of what I did and doesn't work. > 2. Use `(package-arguments libfreenect-examples)` with > `substitute-keyword-arguments` to reuse arguments, but modify > `configure-flags` etc. (eg: qtx11extras) > > The build system can use 'imported-modules' to make a set of guile > modules (which can contains useful procedures, etc.) available to the > builder, but thas's overkill to be used here... I'll check that option too. Thank you for your help! diff --git a/gnu/local.mk b/gnu/local.mk index ab2bac9bc5..b9c09cc5e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -394,6 +394,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/nvi.scm \ %D%/packages/ocaml.scm \ %D%/packages/ocr.scm \ + %D%/packages/openkinect.scm \ %D%/packages/onc-rpc.scm \ %D%/packages/opencl.scm \ %D%/packages/openbox.scm \ diff --git a/gnu/packages/openkinect.scm b/gnu/packages/openkinect.scm new file mode 100644 index 0000000000..5a17acef0e --- /dev/null +++ b/gnu/packages/openkinect.scm @@ -0,0 +1,127 @@ +(define-module (gnu packages openkinect) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages gl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages image-processing)) + +(define-public libfreenect + (let ((version "0.6.1")) + (package + (name "libfreenect") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenKinect/libfreenect") + (commit (string-append "v" version)))) + (sha256 + (base32 "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; Project has not tests + #:configure-flags + '("-DBUILD_FAKENECT=ON" + "-DBUILD_CPP=ON" + "-DBUILD_EXAMPLES=OFF" ; Available in libfreenect-examples + "-DBUILD_CV=OFF" ; Available in libfreenect-cv + "-DBUILD_PYTHON=OFF" ; Available in libfreenect-python + "-DBUILD_C_SYNC=ON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules-out (string-append out "/lib/udev/rules.d"))) + (install-file "../source/platform/linux/udev/51-kinect.rules" + (string-append rules-out "51-kinect.rules")) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (synopsis "Drivers and libraries for the Xbox Kinect device") + (description "libfreenect is a userspace driver for the Microsoft Kinect. +It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.") + (home-page "https://openkinect.org/") + (license license:gpl2+)))) + +(define (disable-sources) + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ((".*libusb.*") "") + (("add_subdirectory \\(src\\)") "") + ((".*libfreenectConfig.cmake.*") "")))) + +(define-public libfreenect-examples + (package + (inherit libfreenect) + (name "libfreenect-examples") + (inputs + `(("libfreenect" ,libfreenect) + ("glut" ,freeglut))) + (arguments + `(#:tests? #f ; Project has not tests + #:configure-flags '("-DBUILD_EXAMPLES=ON" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF") + #:phases + (modify-phases %standard-phases + ;; Sources are already compiled in libfreenect input + (add-after 'unpack 'disable-sources ,disable-sources)))) ;; UNKNOW OBJECT! + (synopsis "Examples for libfreenect, the Xbox Kinect device library"))) + +(define-public libfreenect-cv + (package + (inherit libfreenect) + (name "libfreenect-cv") + (inputs + `(("libfreenect" ,libfreenect) + ("opencv" ,opencv))) + (arguments + `(#:tests? #f ; Project has not tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=ON") + #:phases + (modify-phases %standard-phases + ;; Sources are already compiled in libfreenect input + (add-after 'unpack 'disable-sources ,disable-sources)))) + (synopsis "OpenCV wrapper for libfreenect, the Xbox Kinect device +library"))) + +(define-public libfreenect-python + (package + (inherit libfreenect) + (name "libfreenect-python") + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("libfreenect" ,libfreenect))) + (propagated-inputs + `(("python" ,python) + ("python-numpy" ,python-numpy))) + (arguments + `(#:tests? #f ; Project has not tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF" + "-DBUILD_PYTHON3=ON") + #:phases + (modify-phases %standard-phases + ;; Sources are already compiled in libfreenect input + (add-after 'unpack 'disable-sources ,disable-sources)))) + (synopsis "Python wrapper for libfreenect, the Xbox Kinect device +library")))