From unknown Fri Jun 20 18:13:42 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61448 <61448@debbugs.gnu.org> To: bug#61448 <61448@debbugs.gnu.org> Subject: Status: [PATCH] ignu: opencv: Update to 4.6.0 Reply-To: bug#61448 <61448@debbugs.gnu.org> Date: Sat, 21 Jun 2025 01:13:42 +0000 retitle 61448 [PATCH] ignu: opencv: Update to 4.6.0 reassign 61448 guix-patches submitter 61448 Andy Tai severity 61448 normal tag 61448 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 00:22:19 2023 Received: (at submit) by debbugs.gnu.org; 12 Feb 2023 05:22:20 +0000 Received: from localhost ([127.0.0.1]:43819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR4od-0002Iw-Im for submit@debbugs.gnu.org; Sun, 12 Feb 2023 00:22:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:44866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR4oc-0002Ip-6I for submit@debbugs.gnu.org; Sun, 12 Feb 2023 00:22:18 -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 1pR4ob-0002Ih-Ml for guix-patches@gnu.org; Sun, 12 Feb 2023 00:22:17 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pR4oZ-00027Z-UG for guix-patches@gnu.org; Sun, 12 Feb 2023 00:22:17 -0500 Received: by mail-pl1-x632.google.com with SMTP id w5so10526420plg.8 for ; Sat, 11 Feb 2023 21:22:14 -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=as062Sdx5lRx3uLVZfP+WMLBeAzotReda6wpozA72f8=; b=dTIkOiNy1xZOYWJlGC85CNvtoXEv/s98iBO0RS4WuFiTU1IYeKEUF94f3CpMuOR2bT lf7NkKyNc7sQEf8phU2FhJDu4sEIhedxb4SVnnYbZmzR4vlhtkHDUUoE7/HtxnkSEMv0 ida4GFdx2X+8fVdi1fc73H78qNofMgnuWCgXGSs62pS1J5Hhi3+SNCQtMiqLLEnKb2cK Jj2FwvxHPLGCwgWbWjfu9GfHZm9lo50nmgM6mNBrQJl7GQVQieT2XYSygBjUOaLf4zGc IPE5Wb24n0CfwnwyWBZgTIvVw60z0eryzRLq8/1j9faXsH91M2W1KAsJEYgZSZ2A2fE8 3PSQ== 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=as062Sdx5lRx3uLVZfP+WMLBeAzotReda6wpozA72f8=; b=Hs7ZQZokwGxajtq7/lpbhJZel4hnH/IGcNsz1A6G58QFoxaA3tZFxtACJsa47wVv8m Aj2HaAnie4AwCTeapMs8CNaIcmrXSFSvdGGGi3l36kMp2zO8L2Qr5IWPSGktUi7F85+4 /gVT2expYO5fqC0HVe7qVo/z4A8E3zVukJRDPFLN0ysQq/N9Gg0CVbRXMUc+IRWCOhdi TVm871KKkbo56tmZzgjf/uUOgBFEC51e9dBUDL1ZW31uRhEnTuPAsRcLogEgleOMukpu LY/oh5dLOJkTta4ZForJM9GfvHXQPwM+tV8w+RNbl6dYT+jYN0q15Hpbhuf7NW6izou6 P1yw== X-Gm-Message-State: AO0yUKUWQ0Jtb4I3/kXueHlPPNK/Mv/d5VRzVBJYEqKmkhUPt7s/ysFc +3vr3PjDlgh0vIC88FmkuGNF6jdjGMw= X-Google-Smtp-Source: AK7set8rv2T8eFlQFCfr0PJ8zoksRbsFR1FcegiNKsFBTbasgmGnnvw6r96x4P84sIZn6Uho4YpJ1w== X-Received: by 2002:a17:90a:1a49:b0:232:fa13:4453 with SMTP id 9-20020a17090a1a4900b00232fa134453mr10712685pjl.13.1676179332865; Sat, 11 Feb 2023 21:22:12 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id nh21-20020a17090b365500b00233ce0d8d58sm1635940pjb.50.2023.02.11.21.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 21:22:12 -0800 (PST) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] ignu: opencv: Update to 4.6.0 Date: Sat, 11 Feb 2023 21:22:08 -0800 Message-Id: <20230212052208.3568-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * gnu/packages/image-processing.scm (opencv): Update to 4.6.0 --- gnu/packages/image-processing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..1ae474b6cd 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.6.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")) + "1avd51fxmy0jp09qgxj5x3dpbl3n9x7hg2mm7ma6ak9g52ayrdl5")) (modules '((guix build utils))) (snippet '(begin @@ -617,7 +617,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_extra" version)) (sha256 - (base32 "1fg2hxdvphdvagc2fkmhqk7qql9mp7pj2bmp8kmd7vicpr72qk82")))) + (base32 "17658qwpjn0s4zcn5q0sca7fzkcihzrs9lddvbn78wa8w496gwpp")))) ("opencv-contrib" ,(origin (method git-fetch) @@ -626,7 +626,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_contrib" version)) (sha256 - (base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26")))))) + (base32 "1layhlajm2v5y22vl1cvcg3z9rikg78z6cl1w3nkwjvqnm7nld46")))))) (inputs (list ffmpeg-4 gtk+ -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 00:25:00 2023 Received: (at 61448) by debbugs.gnu.org; 12 Feb 2023 05:25:00 +0000 Received: from localhost ([127.0.0.1]:43824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR4rE-0002NF-4c for submit@debbugs.gnu.org; Sun, 12 Feb 2023 00:25:00 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:53177) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pR4r9-0002Mx-7Q for 61448@debbugs.gnu.org; Sun, 12 Feb 2023 00:24:58 -0500 Received: by mail-pj1-f51.google.com with SMTP id o13so9133553pjg.2 for <61448@debbugs.gnu.org>; Sat, 11 Feb 2023 21:24:55 -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=as062Sdx5lRx3uLVZfP+WMLBeAzotReda6wpozA72f8=; b=Ax7muwG6JHrZBY+mDdH7MQZ9fKa/17dr0y3AuTqOlKUoo21nhjsMBCQFHaHwLSKNrl F7w3DDPrsG/4eJjBZlKWBpT+zynu9xg9eCsOttqLoaYhCDV+xsr93aDkqeh7j5LCpH3s Cm1NLQ5+EUlrg4xcXKeymlaiGn4TsdasTSpjGsu2fZs0lvRz0G3NguXpVgu7d+csbTPT j2SJ8DIPAOuEXWfbp8tEmJMingdrqeVACeCdz9dNcpDW3EM5S8qLww+4z1I5PnD2c0lw ff8oAi/XBUR0S4yx1BK73RKVXCtjc2g+Ecw7mMd96yMW4EI5co4Ejsq/H+DeqPzZdTxY E1Mg== 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=as062Sdx5lRx3uLVZfP+WMLBeAzotReda6wpozA72f8=; b=BeJHC4+ALWBQHojFvieFFKqHvBHQODmKaQQu2NLrGNMQiCaOZyucKoOkKlIYgZoInu I3AJxY1UdEoSi72trPMcFsKEuIcTXUCm8wWP11mhiUJw1DVvTwgQWJq2mlZ6Mwo1xf6J Te8uOzTpSIFTaxADWdG3C09iNdx30C3XYhmSnAf55Vd98XdIw12UT4leqlT2x58tb0/x SsCDb0Xm54ZeuwZYxicKndDzbmzz8vUhCbAEFuOKAWBG5S/G6Hxo3ybD6IUZBWVP2tCe ramk/yxPjC6gIYlfv+QW5wY8ufOxDcf5N3P5Eb+B/ompwDXLikGQcNUk1W8WY6oc0XLK Eonw== X-Gm-Message-State: AO0yUKW3AscUHYglGxfHuygWcWQpyE0AGYeK2J0vcL4XMa17GrpAQgjU ZNlHL/eDsazBnXuD+jMPZQxNL7Vpd4g= X-Google-Smtp-Source: AK7set+lBCrdssyM1xxPqjBU/37ODijipEdpVA32a7prMYDPn7CdTrpmnPr9FQUHd6SDlyQ3tqrOfw== X-Received: by 2002:a17:902:ca89:b0:19a:9831:c8d6 with SMTP id v9-20020a170902ca8900b0019a9831c8d6mr682534pld.50.1676179489151; Sat, 11 Feb 2023 21:24:49 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id k19-20020a170902ba9300b001991942dde7sm5750723pls.125.2023.02.11.21.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 21:24:48 -0800 (PST) From: Andy Tai To: 61448@debbugs.gnu.org Subject: [PATCH v2] gnu: opencv: Update to 4.6.0 Date: Sat, 11 Feb 2023 21:24:43 -0800 Message-Id: <20230212052443.3708-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61448 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/image-processing.scm (opencv): Update to 4.6.0 --- gnu/packages/image-processing.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 70c820e76b..1ae474b6cd 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.6.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")) + "1avd51fxmy0jp09qgxj5x3dpbl3n9x7hg2mm7ma6ak9g52ayrdl5")) (modules '((guix build utils))) (snippet '(begin @@ -617,7 +617,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_extra" version)) (sha256 - (base32 "1fg2hxdvphdvagc2fkmhqk7qql9mp7pj2bmp8kmd7vicpr72qk82")))) + (base32 "17658qwpjn0s4zcn5q0sca7fzkcihzrs9lddvbn78wa8w496gwpp")))) ("opencv-contrib" ,(origin (method git-fetch) @@ -626,7 +626,7 @@ (define-public opencv (commit version))) (file-name (git-file-name "opencv_contrib" version)) (sha256 - (base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26")))))) + (base32 "1layhlajm2v5y22vl1cvcg3z9rikg78z6cl1w3nkwjvqnm7nld46")))))) (inputs (list ffmpeg-4 gtk+ -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 17:13:00 2023 Received: (at 61448) by debbugs.gnu.org; 12 Feb 2023 22:13:00 +0000 Received: from localhost ([127.0.0.1]:47098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRKai-0006x0-JL for submit@debbugs.gnu.org; Sun, 12 Feb 2023 17:13:00 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:41663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRKag-0006wn-IN for 61448@debbugs.gnu.org; Sun, 12 Feb 2023 17:12:59 -0500 Received: by mail-qt1-f170.google.com with SMTP id z5so12047044qtn.8 for <61448@debbugs.gnu.org>; Sun, 12 Feb 2023 14:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=/0qo2X0I60eyHb7osCj15GKnU+SytB0yLM3Nxll5sbI=; b=B+Vbygk34vkLyrD6qe6aaESbG42ftESvvCMDPDz/RzVAbZZDUXopQX0k4VD5HGFeQJ Nhgoonoau7Z5qdsu+1Jo0RN0hODIM4kvcb1ib4+KeOkG2towMpiwr7W4mVTXQtUCF2BS 1abRblPWXRShALvO9Bn07TL1Tw4hG9S49tKGquOgXesqBTMw+lPbAlXErUHXheboUzTb ZYNJZSH3PrkX4Xy5jfO7j8ARQ9k77Ljyb0Yo3Y+q2faP2lw4D9lTtJjD5ezi2FkqXCev FWuM8IlmLs5lpoJnxVTdfN4a73bW2dTgjdcZ+/3ecC2CE8leufCZwHR6tTXGMA3trhTx dY4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/0qo2X0I60eyHb7osCj15GKnU+SytB0yLM3Nxll5sbI=; b=zbXiQf+lzL7iOJwAWQezRy0a/cyqpWXdXU0rwwFJjORtqcsuqp1VknZBAVKcdR7cnn 10niIDrx7dIz36R4AAhUijqPDJpP1FKMKwlrfIgSDhMUqFCXYnoINQsF5Bfs6XbMEFfR s9gUK/UiK7GgDRqsTElvU+5jhr0D4nHPv8xPHMnxxve8VQXiJg8N0fkSORUe1VQdkR8s c+Fip/XcE2HWeFhhwbvubKUiNpBPZ8LqkAOmAyrYYK6dDIHupYKfhkT6lqNQfNzvMaHx njHMSj4NS4ZUHK0xV6Qib0it/3E5wsFWfApo7DvtBJoei5waDePgbdpC6wKp4y9tKruI mJ3Q== X-Gm-Message-State: AO0yUKWnIk4SblozbWAGZt4oY/GFLvY6/6gD5PhIZM4V64Jy+GyAhv3h rFCqowG5/HtJ2tgTimuQ/9zVa7iGOX6/yJOd4mg1QOTryCs= X-Google-Smtp-Source: AK7set8I0rDBRxpNUMjlR6BLIAjNcnJ+qCP54Vsac6rwdC2P4ZT/Rl+W32kk7VZFocZYbWFqLHYtotASgclmmhytzQ4= X-Received: by 2002:ac8:7fc8:0:b0:3b9:b2c3:e961 with SMTP id b8-20020ac87fc8000000b003b9b2c3e961mr3401004qtk.100.1676239972743; Sun, 12 Feb 2023 14:12:52 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Sun, 12 Feb 2023 14:12:16 -0800 Message-ID: Subject: aiscm build error To: 61448@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61448 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Per GUix QA, OpenCV 4.6.0 caues AISCM, which uses OpenCV, to fail to build: https://bordeaux.guix.gnu.org/build/6d64c5dc-818b-470d-b55c-be5b4cccf643 due to reference to unstable API cv::aruco::drawAxis(img, camera, distortion, rvec, tvec, scm_to_double(scm_len)); that no longer exists as of OpenCV 4.6.0 bug filed against AISCM: https://github.com/wedesoft/aiscm/issues/30#issue-158142743 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 12 18:36:50 2023 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 To: 61448@debbugs.gnu.org Subject: [PATCH v3] gnu: opencv: Update to 4.7.0 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61448 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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+ -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 11:09:03 2023 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 To: 61448@debbugs.gnu.org Subject: [PATCH v4] gnu: Add opemncv-next 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61448 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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(+) 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") base-commit: a97a102d21edc0c9624cf92c1fbc0c01b1067290 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 11:10:35 2023 Received: (at 61448) by debbugs.gnu.org; 15 Feb 2023 16:10:35 +0000 Received: from localhost ([127.0.0.1]:33731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKMc-0000Uz-Tk for submit@debbugs.gnu.org; Wed, 15 Feb 2023 11:10:35 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:33282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSKMa-0000Ug-Rk for 61448@debbugs.gnu.org; Wed, 15 Feb 2023 11:10:33 -0500 Received: by mail-pl1-f174.google.com with SMTP id k13so20756490plg.0 for <61448@debbugs.gnu.org>; Wed, 15 Feb 2023 08:10:32 -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=hCAem/DA2pTpg+HLAXk1yVFWesnyp3zidx5y3loVXq9NkDNoklInbP3AoqgsngPE0G sfXq0031LGyxvnCv9JqJVTYr9ryFeLfNp4o5k0p6doUW0H1tYtqnWB98SssP4loC5VXW rRxx9qi1pKDZXLH9nT8WgSSPuI46kwqQ1mhvuSzWUoPrQOI87/dM9leP0dZE+Eb4Q3sO 9eNWltT8qfNDT2eEF5kExHfXM9sdO4XX+zjhzYP1azPtkDFVqRBxr4QeWzvN5SQhBSEw JwwohxeO2d/eFhZ7aygGlHRUH4TL/v04O9PhyJF7FZKOeo97Wkeh+XoJfABXtpq/1IIk QmOA== 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=y6UmRmPY4y6KwD1pLldBxabczzlnY4OUdkV9hYrR+ITwfV2fXlTacJFYrY31mKMY7f LID4Vt8XW5pHUxQAZP4s/l9KbE83VYoUwhrVMCvzWdxGVNBribEUzvH8nv9713gHwGD/ aEO0cgRuf2IInCmscw+2VpfuEI7jWOFROTspdOXa4wnl/a4ou01Awfn4r1GlleBZNJ19 MGeKoPVjYS2xgP8CfmpUM73noFkJYXg0f52BS2whkqd3NY/5DlzoxuB3hj4f/qLyPAhp rcFP77ODb8MyH1TlqiL9qaM45nfkPoyIW51eGL6L13AuuXvakw3BnTVAxRPl4kCfBlSe wDKw== X-Gm-Message-State: AO0yUKWpmQ8rk0DCdiJpw786YrB+y2KLqzYZ+GaAwjJWRSPaUgqs31bT OETrs4HGzmTpbncBu0p9Ls0laHo/ex8= X-Google-Smtp-Source: AK7set8HHEGsJkt8zRttfFTuRynBi9QTABODdPINFNfnnEvWaqCiZ1CB3AKREFGtmTnsfYlDTfRZ7A== X-Received: by 2002:a17:90b:3a84:b0:225:c65f:3550 with SMTP id om4-20020a17090b3a8400b00225c65f3550mr3474824pjb.9.1676477426743; Wed, 15 Feb 2023 08:10:26 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id nm1-20020a17090b19c100b00233c727510csm1661814pjb.40.2023.02.15.08.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 08:10:26 -0800 (PST) From: Andy Tai To: 61448@debbugs.gnu.org Subject: [PATCH v5] gnu: Add opencv-next Date: Wed, 15 Feb 2023 08:10:22 -0800 Message-Id: <20230215161022.18686-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 61448 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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(+) 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") base-commit: a97a102d21edc0c9624cf92c1fbc0c01b1067290 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 22 14:21:21 2023 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 To: Andy Tai Subject: Re: bug#61448: [PATCH] ignu: opencv: Update to 4.6.0 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61448-done Cc: 61448-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Fri Jun 20 18:13:42 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 20 Apr 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator