From patchwork Sun Feb 12 23:36:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 46899 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 A7C291665A; Sun, 12 Feb 2023 23:37:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A5A2F1664B for ; Sun, 12 Feb 2023 23:37:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRLu5-0008Ex-KL; Sun, 12 Feb 2023 18:37:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRLu3-0008EZ-K2 for guix-patches@gnu.org; Sun, 12 Feb 2023 18:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRLu3-0002al-Ay for guix-patches@gnu.org; Sun, 12 Feb 2023 18:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRLu2-0000fF-JF for guix-patches@gnu.org; Sun, 12 Feb 2023 18:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61448] [PATCH v3] gnu: opencv: Update to 4.7.0 References: <20230212052208.3568-1-atai@atai.org> In-Reply-To: <20230212052208.3568-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 23:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61448@debbugs.gnu.org Cc: Andy Tai Received: via spool by 61448-submit@debbugs.gnu.org id=B61448.16762450102534 (code B ref 61448); Sun, 12 Feb 2023 23:37:02 +0000 Received: (at 61448) by debbugs.gnu.org; 12 Feb 2023 23:36:50 +0000 Received: from localhost ([127.0.0.1]:47133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRLtq-0000eo-Fe for submit@debbugs.gnu.org; Sun, 12 Feb 2023 18:36:50 -0500 Received: from mail-pl1-f173.google.com ([209.85.214.173]:44757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRLto-0000ea-Ll for 61448@debbugs.gnu.org; Sun, 12 Feb 2023 18:36:49 -0500 Received: by mail-pl1-f173.google.com with SMTP id o8so9443025pls.11 for <61448@debbugs.gnu.org>; Sun, 12 Feb 2023 15:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=fMPpPVJy2LLuU1dVYUUWyemU6fppSCdg5vKw9TneUQ4=; b=TwAGhmInr1qvwR38o+GtD8nkERJq0EdIwQ7wIzt/AKwy7/1eU85ZZjBDz3WCvm+QLh fXmnlE8OtT8FYMDPIuNzj1OZ1MjhOrIux8t2hAZTf3a6t7wmgUaair1M4UD5ovI7vDwe eXCx0TozDJPwLLlK47rZqpdrvql51idsSRAKBIqstRIekMnM2/Jclb4lWDyeD/BTZq/v GNzNvKVA8Ca6L/aVZQlyh2QKN3yeDiIPp18CvafvYg9wP9zGyzEULMVMn/vrbhkmTOvD GfhOv0KiVcQ5o9Smd3D8onLPVf1sDEeE70WB56HDl8yGpd61pQ9TF3jW8CWRKjCW1p1a hIwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fMPpPVJy2LLuU1dVYUUWyemU6fppSCdg5vKw9TneUQ4=; b=2fMjZwF3lB1WCINqia8YUrvGyEHOCAJOziybAIYQ33ERncbar/P21pL8/p9fUsAcFa OISqi7Hlbsf3B2rHB8OIyIrHe4KrH15xIMbmkImrfCy4AmJYPUkdGnaxLOGlDGtCHZVR rlzzSz+LVWXgfTLF+wNVcadf7KA9bssLv7tEZ/KSC3FirXJorS/n0jicBJTEX1Krc9xY GtrXYZMLzR6kFlfUzXympFDO/AMNgcG7w9vMBsrIJXUkfAf68WZFrHjtqaLIH6/B0C14 cAplLqbb9fwWSMtLmeSM8ovVw6BECrCA7Hr6OHry4X/Bu3oAALWOEPhbqs2ukrmlMMwL kN8A== X-Gm-Message-State: AO0yUKXD0hUnScboz3jzt/xYVZM2feHwzqZ3EOcom4POZrfPUL7+/wEo m7oiJhjBursETa1zI0HDKzWrUpCBTDo= X-Google-Smtp-Source: AK7set+AGkYpf8oCBq5EHD6Hn3p7/EbyvBY7XDsZVDEpy4hIszuYzvfLdydnRLDtGFnzNIDu+LeWWQ== X-Received: by 2002:a17:903:11c3:b0:196:3ecd:c39a with SMTP id q3-20020a17090311c300b001963ecdc39amr25946199plh.43.1676245002341; Sun, 12 Feb 2023 15:36:42 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id 5-20020a170902ee4500b00192aa53a7d5sm3150482plo.8.2023.02.12.15.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:36:41 -0800 (PST) From: Andy Tai Date: Sun, 12 Feb 2023 15:36:38 -0800 Message-Id: <20230212233638.4395-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image-processing.scm (opencv): Update to 4.7.0 --- gnu/packages/image-processing.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..c6c3b34705 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -460,7 +460,7 @@ (define-public vtk-7 (define-public opencv (package (name "opencv") - (version "4.5.4") + (version "4.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -469,7 +469,7 @@ (define-public opencv (file-name (git-file-name name version)) (sha256 (base32 - "0gf2xs3r4s51m20mpf0wdidpk0xzp3m2w6jx72fwldhn0pshlmcj")) + "0l45v41nns2jmn9nr9fb0yvhqzfjpxjxn75i1c02rsfy3r3lv22v")) (modules '((guix build utils))) (snippet '(begin @@ -498,9 +498,6 @@ (define-public opencv "tbb" "zlib"))) - ;; Milky icon set is non-free: - (delete-file-recursively "modules/highgui/src/files_Qt/Milky") - ;; Some jars found: (for-each delete-file '("modules/java/test/pure_test/lib/junit-4.11.jar" @@ -583,7 +580,8 @@ (define-public opencv ;; opencv-extra/testdata. (substitute* "modules/dnn/test/test_layers.cpp" (("(TEST_P\\(Test_Caffe_layers, )\ -(Accum\\).*|DataAugmentation\\).*|Resample\\).*|Correlation\\).*)" all pre post) +(Accum\\).*|DataAugmentation\\).*|Resample\\).*|Correlation\\).*|Interp\\).*)" + all pre post) (string-append pre "DISABLED_" post))))) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) @@ -617,7 +615,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_extra" version)) (sha256 - (base32 "1fg2hxdvphdvagc2fkmhqk7qql9mp7pj2bmp8kmd7vicpr72qk82")))) + (base32 "0bdg5kwwdimnl2zp4ry5cmfxr9xb7zk2ml59853d90llsqjis47a")))) ("opencv-contrib" ,(origin (method git-fetch) @@ -626,7 +624,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_contrib" version)) (sha256 - (base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26")))))) + (base32 "0hbfn835kxh3hwmwvzgdglm2np1ri3z7nfnf60gf4x6ikp89mv4r")))))) (inputs (list ffmpeg-4 gtk+