From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wP2XE2JHG2QyQAEASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 19:22:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gCPREmJHG2RhxAAAG6o9tA (envelope-from ) for ; Wed, 22 Mar 2023 19:22:26 +0100 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 CAF193C652 for ; Wed, 22 Mar 2023 19:22:25 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=PCf1Hta6; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679509345; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=IGPKBqUatilu700eS6bTGED33Qf/2wDc+PLodYk0EdA=; b=el19DbZ/q28sAlDk6CK6xB7MBGl32Rf1ggf7ZMGVzvYy6mZjgZn1dQ4kthq4BDj5hy/vjn G17a4NtGDhIqIGYAuN4fijfd+Xuofgn+1NWPm3U0M/hryDHVstamsV3/n/uzStyYn8z0bT 6phLFdY5XP18OG4kJIlmRd6QZr0zYMoEOI2MCy3e9QLKrYrlUwNHSSTwmK/uDJGQSdcb0V pf2nfaE7Xba0A0ebqiWeaKLwi6IP9sTWSY4JHD6MDSg+lygGzdNdCyHn5O6n2dyrp7AYAF YZ2ZAk5u/gR5bQ4i22bdIa0+lx5zC0f3TOostIWYavkfZh2MVCU1/yOXOEZp9g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679509345; a=rsa-sha256; cv=none; b=IKUoBsSX4do6r0l63f2ud3XTbdw1wtz/5em13KbB4pLGClTTbtG++nrWYDkOHLCA1nsLsB lBsoSeEhun0KfCIHa7YO5vg/USbpOBstG5T8Wv+v78xd3tCkuEtzyFV8v2RJqTnAUz3R57 XUrh+CAqjvxaK6YTloqhC444GBSFfUVtltMjBSnH33CNZZ0DKytNtW346m1AgiptwXN/D/ maCNE3Z54e3BeO9dCE8zTPMumnlilZ0jtqVjQ3KGyVu/S1eBYYnx3HokxyT8Nqxx1CtD1R ATenW0v4QdlsR92zVPxfpVekdikbsgppILrFN0ZXBs2SB7bqdnWV1OA13KRhOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=PCf1Hta6; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pf368-0000uG-Lw; Wed, 22 Mar 2023 14:22:08 -0400 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 1pf362-0000rM-Ii for guix-patches@gnu.org; Wed, 22 Mar 2023 14:22:02 -0400 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 1pf362-0002ac-4f for guix-patches@gnu.org; Wed, 22 Mar 2023 14:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pf362-00089H-0k for guix-patches@gnu.org; Wed, 22 Mar 2023 14:22:02 -0400 Subject: bug#61448: [PATCH] ignu: opencv: Update to 4.6.0 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 18:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 61448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai Cc: 61448-done@debbugs.gnu.org Mail-Followup-To: 61448@debbugs.gnu.org, maxim.cournoyer@gmail.com, atai@atai.org Received: via spool by 61448-done@debbugs.gnu.org id=D61448.167950928131251 (code D ref 61448); Wed, 22 Mar 2023 18:22:01 +0000 Received: (at 61448-done) by debbugs.gnu.org; 22 Mar 2023 18:21:21 +0000 Received: from localhost ([127.0.0.1]:36685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf35M-00087y-U8 for submit@debbugs.gnu.org; Wed, 22 Mar 2023 14:21:21 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:37542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf35K-00087f-T8 for 61448-done@debbugs.gnu.org; Wed, 22 Mar 2023 14:21:19 -0400 Received: by mail-qt1-f176.google.com with SMTP id r5so23815051qtp.4 for <61448-done@debbugs.gnu.org>; Wed, 22 Mar 2023 11:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679509273; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=IGPKBqUatilu700eS6bTGED33Qf/2wDc+PLodYk0EdA=; b=PCf1Hta6njE5RaH9yD+cwHzRXFqVd+SMdGr40vgh/kvG/4oGFST1Eulc5//+2ZHTKS HoY+LzxIuco0OcdEBpp/u6fd8nzG/lVgVOAHNMTGvWOPRjaGo/vrTNZjYhRJ65ZVu6c2 BJiaagFM7EZOaEMZcduo/bIkAzeYS6Maheoye3N/Y7LA8dxDorHaonGl8fSXYRQF9dXf GNdbRbX5IbuALp3kSWzc21XQO+XUcrDXv7ILOqGeNMYGt00Vx9UzkN5N/oujQNcCiLqo BTAU0AnyT3bs202+lL6j0z29ky7RPF58qy4jRMzX+uDqqKXpoXEZsjVzfOeWYpGKzM+4 ldtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679509273; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IGPKBqUatilu700eS6bTGED33Qf/2wDc+PLodYk0EdA=; b=nluXg0ukuK/Db7/YsuCIiGix7W1JJ6uNO0ruin8Bd8BqjH9EPotpV7PP5zAJY9RrEA pn5Tnt+ykmIi+vOLqJBjSxWoJAW3yX01bmDeioebXIrKYOef6do4Sv/CNwTHgrXu8Elm qnxhgz9cPW9QLvUQCqbV8ttf6toBE+DSlHSeoAI6ndT5BmFZUWgNiK9Ghdtk+dUHiNSZ 3HazRz5e4feYdWPGpOJaRz3vMx6bbTkyWRrPDRVlQj2oOQDAsr98u15+n9YyWviuHW41 xQ0UokEXVmLUgdiOaErrqxc5cT3/MeO51VvfsQe4rhwxE1WCF3np7RRa/p9l4TpCG6zC vP9Q== X-Gm-Message-State: AO0yUKUzFRxfjwM/KkCDg50K4ZQMrQDwdalgkIDHzHF/jBvgbXZYvGEl C6WQHlG483joa/egRhmZ84iA07VGipTgzg== X-Google-Smtp-Source: AK7set9qw4h0LqZuZ/WsLB2NawJe62MkQEJuRZ5dDHEAmHh4aAlY6lI3LoP9X9eFaMqu2fffXKcgIQ== X-Received: by 2002:ac8:5c07:0:b0:3d2:a927:21b8 with SMTP id i7-20020ac85c07000000b003d2a92721b8mr9010515qti.11.1679509273052; Wed, 22 Mar 2023 11:21:13 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id t4-20020ac85304000000b003e3870008c8sm2584887qtn.23.2023.03.22.11.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 11:21:12 -0700 (PDT) From: Maxim Cournoyer References: <20230212052208.3568-1-atai@atai.org> <20230215161022.18686-1-atai@atai.org> Date: Wed, 22 Mar 2023 14:21:10 -0400 In-Reply-To: <20230215161022.18686-1-atai@atai.org> (Andy Tai's message of "Wed, 15 Feb 2023 08:10:22 -0800") Message-ID: <878rfohckp.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: X-Migadu-Queue-Id: CAF193C652 X-Spam-Score: -1.95 X-Migadu-Spam-Score: -1.95 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: JMhkfatrEOx8 Hello, Andy Tai writes: > * 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 There's no need to repeat the explanation in the change log, as it's written in the code as a comment, where it belongs. > --- > gnu/packages/image-processing.scm | 79 +++++++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > > 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") You can leave the name as "opencv", so users doing 'guix install opencv' will get the latest version. The only time where it may be better use use "-next" in the name, is when both versions are expected to be propagated together and found in the same profile, where they'd conflict if same-named (that's very niche though). > + (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" [...] > + (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")))))) This indentation is way off; was this 'guix style'? > + (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") > > base-commit: a97a102d21edc0c9624cf92c1fbc0c01b1067290 I've made the adjustments below; --8<---------------cut here---------------start------------->8--- @@ -699,11 +699,11 @@ (define-public opencv (home-page "https://opencv.org/") (license license:bsd-3))) -;; TODO: Make the default opencv after aiscm can use a newer one. +;; TODO: Make this the default opencv after aiscm is able to use it. (define-public opencv-next (package (inherit opencv) - (name "opencv-next") + (name "opencv") (version "4.7.0") (source (origin (method git-fetch) @@ -711,71 +711,70 @@ (define-public opencv-next (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")))))) + (snippet + '(begin + ;; Remove external libraries. Almost all of them are + ;; 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"))) + ;; Delete any bundled .jar files. + (for-each delete-file (find-files "." "\\.jar$")))) + (sha256 + (base32 + "0l45v41nns2jmn9nr9fb0yvhqzfjpxjxn75i1c02rsfy3r3lv22v")))) + (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))))))))))) + ((#: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\\).*)" _ pre post) + (string-append pre "DISABLED_" post))))))))))) (define-public vips (package --8<---------------cut here---------------end--------------->8--- And installed the change. Thank you! -- Thanks, Maxim