From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id Y3QrHCYBOF/hXAAA0tVLHw (envelope-from ) for ; Sat, 15 Aug 2020 15:37:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EHxNFyYBOF/lIQAAbx9fmQ (envelope-from ) for ; Sat, 15 Aug 2020 15:37:10 +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 DFFB3940654 for ; Sat, 15 Aug 2020 15:37:09 +0000 (UTC) Received: from localhost ([::1]:45126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6yF2-0007Vm-Pp for larch@yhetil.org; Sat, 15 Aug 2020 11:37:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6yEx-0007TK-4d for guix-patches@gnu.org; Sat, 15 Aug 2020 11:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6yEw-0005l0-Pg for guix-patches@gnu.org; Sat, 15 Aug 2020 11:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k6yEw-00016m-Kj for guix-patches@gnu.org; Sat, 15 Aug 2020 11:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42873] [PATCH] gnu: Add entangle. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Aug 2020 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42873@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15975057784207 (code B ref -1); Sat, 15 Aug 2020 15:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Aug 2020 15:36:18 +0000 Received: from localhost ([127.0.0.1]:56245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6yED-00015m-Nz for submit@debbugs.gnu.org; Sat, 15 Aug 2020 11:36:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:43900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6yEC-00015g-SB for submit@debbugs.gnu.org; Sat, 15 Aug 2020 11:36:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6yEC-00060a-EM for guix-patches@gnu.org; Sat, 15 Aug 2020 11:36:16 -0400 Received: from mout02.posteo.de ([185.67.36.66]:32871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6yE9-0005Vn-GI for guix-patches@gnu.org; Sat, 15 Aug 2020 11:36:16 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7AD752400FB for ; Fri, 14 Aug 2020 23:58:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1597442328; bh=5SGTgrUgaG/AhLcUCL7dvbKhtSiJZGMTjQpaYzG9pOs=; h=From:To:Cc:Subject:Date:From; b=DIKq+i0hwfVjVMhdS+B2m59kUw8GPy+t5PmdUXCpMm8NteFMi9w/WssX0RH3nW3wU bh20bXVpCICWenPmPXwBzkv21CtuapZzafgV2CQRk4srg4iK2ruP28tzwDAYqtzqTm 002/UOxD5bGn0JESyKyRx5Y2cqS0hK4+p5feck6V43u5oRGrx+WVu8h+htq2qx2dRv mjfXR3OsUHJllFz8feRbd8XqmZ8Gv3eHl059sLhVSGI7t1bEncwpahknzZi+2jzfBs weygNCfMuxG4mVtCzSGaM14ykGqGU5CRbrpJNDR4/xZRusVZtz+RjhDoG2qH4zvCM7 CZfiM8qQufyrA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BSy4k5TJNz6tmG; Fri, 14 Aug 2020 23:58:46 +0200 (CEST) From: Vinicius Monego Date: Fri, 14 Aug 2020 18:58:15 -0300 Message-Id: <20200814215815.65088-1-monego@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 17:58:48 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=DIKq+i0h; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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-Spam-Score: 5.09 X-TUID: d+n+NTKHsMPP * gnu/packages/photo.scm (entangle): New variable. --- gnu/packages/photo.scm | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index abdb751a5a..5fcbb9205b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -28,6 +28,7 @@ (define-module (gnu packages photo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix download) @@ -40,6 +41,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cups) #:use-module (gnu packages curl) @@ -611,6 +613,71 @@ paint brushes, image filters, colour adjustments and more advanced features such as Batch image processing.") (license license:gpl3+))) +(define-public entangle + (package + (name "entangle") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/entangle/entangle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pdmgxjdb3xlcqsaz7l8qzj5f7g7nwzhsrgid8929bm36d49cgc7")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'install 'wrap-gi-python + ;; Make GTK find files needed by plugins. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/entangle") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + #t))))) + (native-inputs + `(("cmake" ,cmake) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("gexiv2" ,gexiv2) + ("gst-plugins-base" ,gst-plugins-base) + ("gstreamer" ,gstreamer) + ("gtk+" ,gtk+) + ("lcms" ,lcms) + ("libgphoto2" ,libgphoto2) + ("libgudev" ,libgudev) + ("libpeas" ,libpeas) + ("libraw" ,libraw) + ("python" ,python) + ("python-pygobject" ,python-pygobject))) + (home-page "https://entangle-photo.org/") + (synopsis "Camera control and capture") + (description + "Entangle is an application which uses GTK and libgphoto2 to provide a +graphical interface for tethered photography with digital cameras. It includes +control over camera shooting and configuration settings and 'hands off' shooting +directly from the controlling computer.") + (license license:gpl3+))) + (define-public hugin (package (name "hugin") -- 2.20.1