From patchwork Thu Aug 13 14:59:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 23609 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 43CA827BBE4; Thu, 13 Aug 2020 16:01:15 +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 A675527BBE3 for ; Thu, 13 Aug 2020 16:01:14 +0100 (BST) Received: from localhost ([::1]:58178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6EjC-00027s-7U for patchwork@mira.cbaines.net; Thu, 13 Aug 2020 11:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6Ej0-00021W-NX for guix-patches@gnu.org; Thu, 13 Aug 2020 11:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6Ej0-0006gF-CG for guix-patches@gnu.org; Thu, 13 Aug 2020 11:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k6Ej0-0007bh-BB for guix-patches@gnu.org; Thu, 13 Aug 2020 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42807] [PATCH v2 2/2] gnu: darktable: Add dependency on libavif, ocl-icd. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Aug 2020 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42807@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 42807-submit@debbugs.gnu.org id=B42807.159733084129194 (code B ref 42807); Thu, 13 Aug 2020 15:01:02 +0000 Received: (at 42807) by debbugs.gnu.org; 13 Aug 2020 15:00:41 +0000 Received: from localhost ([127.0.0.1]:50645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6Eie-0007am-MK for submit@debbugs.gnu.org; Thu, 13 Aug 2020 11:00:40 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6Eib-0007aH-DC for 42807@debbugs.gnu.org; Thu, 13 Aug 2020 11:00:37 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 774D12400FD for <42807@debbugs.gnu.org>; Thu, 13 Aug 2020 17:00:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1597330831; bh=GpY8aufvrRgZXtS4uvPCQ/ukBBKa0qMJ2gU3apbhbP8=; h=From:To:Cc:Subject:Date:From; b=HU5U4VqjF8mVmxCN6tuVVTfcMBbimogcCZbJ6wFpsQriu7wmm8VU0waUkN0q5yMGf 88L1+FP/bY1snjrfVBPdy7ys2T+GReaHRpSi8Q7cuF1M40Veg+yrIYQTPhetrzaXxE FLnU8vvyy87Db4SEkouereGIfMPZzF9g1Y8TO/pwS7opcsu7r1oMbAYdG97wlGlYid 7RFawpue1vsCexAW2X/+AsKBjgOH8Vn5muBj/pXyvIVMZfsYZKhBWM2DOLzB6vTNMc FubMa3gavH87mxc+fjOU/QzQ28lrl3E+z9T8pO8S7yMIhRjC6ZdwJGzX7psPVAiAzN QmgRG9l0xmD1w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BS8rZ1ctZz9rxH; Thu, 13 Aug 2020 17:00:29 +0200 (CEST) From: Vinicius Monego Date: Thu, 13 Aug 2020 11:59:16 -0300 Message-Id: <20200813145916.38243-2-monego@posteo.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200813145916.38243-1-monego@posteo.net> References: <20200810232325.61515-1-monego@posteo.net> <20200813145916.38243-1-monego@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/photo.scm (darktable)[inputs]: Add libavif, ocl-icd. [arguments]: Set LD_LIBRARY_PATH for OpenCL. [supported-systems]: Remove i686 which is not supported anymore. --- gnu/packages/photo.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 688de5c460..2684ac294d 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -503,15 +503,19 @@ photographic equipment.") (string-append (assoc-ref inputs "ilmbase") "/include/OpenEXR:" (or (getenv "CPATH") ""))) #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/darktable") - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas")))) - #t))))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/darktable") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))) + ;; For libOpenCL.so. + `("LD_LIBRARY_PATH" = + (,(string-append (assoc-ref inputs "ocl-icd") + "/lib")))) + #t))))) (native-inputs `(("clang" ,clang-9) ("desktop-file-utils" ,desktop-file-utils) @@ -541,6 +545,7 @@ photographic equipment.") ("lcms" ,lcms) ("lensfun" ,lensfun) ;optional, for the lens distortion plugin ("libgphoto2" ,libgphoto2) ;optional, for camera tethering + ("libavif" ,libavif) ;optional, for AVIF support ("libjpeg" ,libjpeg-turbo) ("libomp" ,libomp) ("libpng" ,libpng) @@ -552,6 +557,7 @@ photographic equipment.") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins + ("ocl-icd" ,ocl-icd) ;optional, for OpenCL support ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view @@ -565,7 +571,7 @@ developer. It manages your digital negatives in a database, lets you view them through a zoomable lighttable and enables you to develop raw images and enhance them.") ;; See src/is_supported_platform.h for supported platforms. - (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) + (supported-systems '("x86_64-linux" "aarch64-linux")) (license (list license:gpl3+ ;; Darktable itself. license:lgpl2.1+)))) ;; Rawspeed library.