From patchwork Wed Feb 15 16:08:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 46953 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 3C9871685E; Wed, 15 Feb 2023 16:10:19 +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, URIBL_BLOCKED autolearn=unavailable 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 A000116856 for ; Wed, 15 Feb 2023 16:10:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSKM8-0004Ly-G9; Wed, 15 Feb 2023 11:10:04 -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 1pSKM7-0004Lg-21 for guix-patches@gnu.org; Wed, 15 Feb 2023 11:10: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 1pSKM6-0002HI-OO for guix-patches@gnu.org; Wed, 15 Feb 2023 11:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSKM6-0000Tk-D2 for guix-patches@gnu.org; Wed, 15 Feb 2023 11:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61448] [PATCH v4] gnu: Add opemncv-next 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: Wed, 15 Feb 2023 16:10: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.16764773431751 (code B ref 61448); Wed, 15 Feb 2023 16:10:02 +0000 Received: (at 61448) by debbugs.gnu.org; 15 Feb 2023 16:09:03 +0000 Received: from localhost ([127.0.0.1]:33726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKL9-0000SA-Au for submit@debbugs.gnu.org; Wed, 15 Feb 2023 11:09:03 -0500 Received: from mail-pl1-f177.google.com ([209.85.214.177]:33613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKL5-0000Ra-Nc for 61448@debbugs.gnu.org; Wed, 15 Feb 2023 11:09:01 -0500 Received: by mail-pl1-f177.google.com with SMTP id k13so20752194plg.0 for <61448@debbugs.gnu.org>; Wed, 15 Feb 2023 08:08:59 -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=s/8bn40b/Xz1XF92mUxPKM24ixGlrwpv+fyV/ih2SQg=; b=pUdtxh67WysRGrtELGHft+HTutZB9RQ5oqgPnYpgsF8WJ55Zh9ly3s4lrvcSOBH42O sF19ghkqe0zlyKGsUn00Znx+xtvGyYA0jx7GAS5Mqn+0y46PaqkPuJrjHA2TU6pTwwmM 6Z09dtgd4ojsPIpVf9pJI8wH3jJxn2Eq8QfAgIR8uO2Gai5/LJZOWCk2/bdkbUla7mSy iuInwtGkZKf0UKYfcpD4nb8RcR62OSJO9OmXf3aMWjLUNw4tDehonLk8VD1GFjjPn5s5 E2/85XT+15lXsgQk9t0iyAlgiYrP3rxjGzIQk9zhQY7K1uN92Wa3TEOtrxeAO7sc+kJy 96gQ== 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=s/8bn40b/Xz1XF92mUxPKM24ixGlrwpv+fyV/ih2SQg=; b=3Ji3WMwOOYMuU2E6fPqEa6+SSEiPm7eXyOrSdQLl1hRF7jorNDzYZHN4Htw60FvCVG haMtNg/XD4czaKNz26liPs4kv1awFNuEWY5nAOzD3KmxFUl1lo0l8IAspzTY1ntP55Uu nh4UEQdhHcMhz/wCEhu0AQzeSNpaNm5RgwJlAH4XxGCJmq9XZecoFDNLuBtdLZhLEmDx 7pGzgj0NUi0oVK3l07NgJBrb9PCyImDvccP5Va3C4Lxe0QxWE6ADRjfq61BYJkI9z8UH y4HhfH9D++XAMMS2kZPi6RyBDzYp+4p8jyj+FeDYyKVeciPTnH5D+cHg1OvpzyWEnAJE Ks+Q== X-Gm-Message-State: AO0yUKUV0Hw+lFIvNArS1gaQpis4v/kPCP+nYTkz5WD9SKoE0ISg6nDZ qKPC31LxuL/42EdS5UNhlTCuzlOPG0w= X-Google-Smtp-Source: AK7set+ISqjNkFd/pUS96ox1E+zT7EF5FV57hXy4OYNhvnStPeSmvV3uSr1xx9hZ5cKiIs7PoZmJyg== X-Received: by 2002:a05:6a20:160d:b0:c6:6fef:545c with SMTP id l13-20020a056a20160d00b000c66fef545cmr3005402pzj.21.1676477333359; Wed, 15 Feb 2023 08:08:53 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id n3-20020a63b443000000b00499a90cce5bsm10537773pgu.50.2023.02.15.08.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 08:08:52 -0800 (PST) From: Andy Tai Date: Wed, 15 Feb 2023 08:08:48 -0800 Message-Id: <20230215160848.18588-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-next): New variable as opencv (4.5.4) is depended on by aiscm which does not build with later opencv (4.6.0 and later) so make later opencv release as opencv-next, now at version 4.7.0 --- gnu/packages/image-processing.scm | 79 +++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) base-commit: a97a102d21edc0c9624cf92c1fbc0c01b1067290 diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..0482984e32 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -673,6 +673,85 @@ (define-public opencv (home-page "https://opencv.org/") (license license:bsd-3))) +;; aiscm depends on opencv 4.5.4 so we cannot just update opencv to 4.7.0 +;; for now we place newer opencv as opencv-next +(define-public opencv-next + (package + (inherit opencv) + (name "opencv-next") + (version "4.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opencv/opencv") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l45v41nns2jmn9nr9fb0yvhqzfjpxjxn75i1c02rsfy3r3lv22v")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove external libraries. We have almost all available + ;; in Guix: + (with-directory-excursion "3rdparty" + (for-each delete-file-recursively + '("carotene" "cpufeatures" + "ffmpeg" + "include" + "ippicv" + "ittnotify" + "libjasper" + "libjpeg" + "libjpeg-turbo" + "libpng" + "libtengine" + "libtiff" + "libwebp" + "openexr" + "openjpeg" + "openvx" + "protobuf" + ;; "quirc" + "tbb" + "zlib"))) + + ;; Some jars found: + (for-each delete-file + '("modules/java/test/pure_test/lib/junit-4.11.jar" + "samples/java/sbt/sbt/sbt-launch.jar")))))) + (native-inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests) ;For running the tests + ("opencv-extra" ,(origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/opencv/opencv_extra") + (commit version))) + (file-name (git-file-name + "opencv_extra" version)) + (sha256 (base32 + "0bdg5kwwdimnl2zp4ry5cmfxr9xb7zk2ml59853d90llsqjis47a")))) + ("opencv-contrib" ,(origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/opencv/opencv_contrib") + (commit version))) + (file-name (git-file-name + "opencv_contrib" version)) + (sha256 (base32 + "0hbfn835kxh3hwmwvzgdglm2np1ri3z7nfnf60gf4x6ikp89mv4r")))))) + + (arguments + (substitute-keyword-arguments (package-arguments opencv) + ((#:phases phases + '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-broken-tests-opencv-4.7-specific + (lambda _ + (substitute* "modules/dnn/test/test_layers.cpp" + (("(TEST_P\\(Test_Caffe_layers, )(Interp\\).*)" + all pre post) + (string-append pre "DISABLED_" post))))))))))) + (define-public vips (package (name "vips")