From patchwork Tue Oct 29 07:32:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 69614 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 11B9E27BBE9; Tue, 29 Oct 2024 07:35:45 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 B1EF127BBE2 for ; Tue, 29 Oct 2024 07:35:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5gku-0002h1-0p; Tue, 29 Oct 2024 03:35: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 1t5gko-0002dT-Lb for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5gko-000059-CF for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=XcDKJche6lq4QvI65pG+Uhnka3SjfY5GorlgCv321sc=; b=GGomGdNjD6a+xZg+oeEz7A+coKX6lvQirp6stO8lvh3Ng3KY1eh9lXLH8mt30n8clA2eoryRVinhsfFraEnsS0JK+8Lw45xQmd9wzj0galdFYmh9Dy09l4pgkjhtstjU9f8Ry3CAa00JiEpcNTG1EN+sso8MOE6dB9K0LeXStYxT+WxzGqeJBVulqkJpsiwmRZ5Oq/txsWfX7d+I/6y2YTFmKx+cqbWSjbTwaJvhLK359+YQD54M1o6yiNtydH5lTidwgvj6/hqSKlnfwrkiEZ7j1Hujngej5O/+Y08xjXThAHg8WCkbXRCCo6oXJVWkanKcvJVXgNRz71+zRoY+Og==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5gko-0008SC-7U for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74079] [PATCH 1/2] gnu: x265: Only build with nasm on x86_64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 07:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74079@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 74079-submit@debbugs.gnu.org id=B74079.173018724232373 (code B ref 74079); Tue, 29 Oct 2024 07:35:02 +0000 Received: (at 74079) by debbugs.gnu.org; 29 Oct 2024 07:34:02 +0000 Received: from localhost ([127.0.0.1]:55795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5gjp-0008Py-Ph for submit@debbugs.gnu.org; Tue, 29 Oct 2024 03:34:02 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:59736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5gjn-0008Pa-HD for 74079@debbugs.gnu.org; Tue, 29 Oct 2024 03:34:00 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-539e5c15fd3so4458612e87.3 for <74079@debbugs.gnu.org>; Tue, 29 Oct 2024 00:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730187173; x=1730791973; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=XcDKJche6lq4QvI65pG+Uhnka3SjfY5GorlgCv321sc=; b=iyC3HGm06JlcABNvwZYcErToYt9OWWFiR48vfXjp5HlpTH/Hi5m7HUH9igPlyf0Dxn HxMdX+/LNFVm2lG1w/HQOhWF5+TOwbSK4v9tariwi2TxCqtukMJePEPzSZwB2ls0/hMO tsgHb2fAvelbenlcd6QnyRYdeuWaiSB+csm9Iz28IJRDPRt5os3r4e1C9roNb1A7ADsx bkLf0CAC0j96Fm+JyRBqQ/UtXG53+Bdjqwms2OnKEO/ZUsPYw0XPvauDre8bdWTdfmrj xbBBVNxiTHqsv+WtyPkWdrF8K1NK9kp8Yq3a/2rohVkg60TAVMV9cq/A2XoPQbrmSneV 4gLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730187173; x=1730791973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XcDKJche6lq4QvI65pG+Uhnka3SjfY5GorlgCv321sc=; b=F5bUa9msVtq/BrubBt5cbvr0nal/r35+7jjCwYs6TATyflXy4yZ3Rpr5l+pTxN7+Qd H06VFUk3iNdwetGYSQZTN2SP4uH5XHyZBiBu0Vtqz4Z4LBcReNxHcTmDiLjyUHBsiFiG K8XOw361ZlOUdsx9lDMLk7bw6AKu6jgUW8D+n5xQj0FXsuvqeDsgNDbBrLXPMSYSTxlT Gq7g4B3zFvIDlmTspHzQceEtDlicfq/P8WI5I13PesuEc8Tb+vShDz6gp3NDiVGssZYq 9ny4zq+ekwfjocqnEus9emp8XNhqLMXqyKMWm2lqMEMUA8eeEWzC7wd4Ir4Vioo69N10 4VVA== X-Gm-Message-State: AOJu0Yzi1K3Ww3M7r6fLaAHXOWDhUwoadyD10csRg+gZPAAjV3KPS1aW ff/9fNbTgaV05yaiO8tDREvsP+R2lb4pELLm1JtJDwkK5ajdFJjRLhhap3nN X-Google-Smtp-Source: AGHT+IE2mvusuTYo2FkjpJTL7wAXqA2s5EKHGAdeNcOEo9bB74jGf8K4S4vaTy+1FwPzwc57i2b3zA== X-Received: by 2002:a05:6512:b02:b0:539:fc75:99c4 with SMTP id 2adb3069b0e04-53b348d311cmr4744947e87.20.1730187172982; Tue, 29 Oct 2024 00:32:52 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4318b5430edsm165761565e9.2.2024.10.29.00.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 00:32:52 -0700 (PDT) From: Efraim Flashner Date: Tue, 29 Oct 2024 09:32:38 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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/video.scm (x265)[native-inputs]: Only use nasm when building for x86_64-linux. Change-Id: Id47f8bef4df0aef6cf574a39e4509024bb3a9479 --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 92c0acef3ca..bb07a21e981 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1317,9 +1317,9 @@ (define-public x265 (build-system cmake-build-system) (native-inputs ;; XXX: ASM optimization fails on i686-linux, see . - (if (string-prefix? "i686" (%current-system)) - '() - `(("nasm" ,nasm)))) + (if (target-x86-64?) + (list nasm) + '())) (arguments `(#:tests? #f ; tests are skipped if ENABLE_ASSEMBLY is TRUE. #:configure-flags From patchwork Tue Oct 29 07:32:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 69613 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 589F327BBEA; Tue, 29 Oct 2024 07:35:43 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 2CF6927BBE2 for ; Tue, 29 Oct 2024 07:35:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5gku-0002hZ-Kp; Tue, 29 Oct 2024 03:35: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 1t5gkp-0002da-5j for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5gko-00009c-TS for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jLYStz7CHvkta2I1YzY2ubICtz2j+nNgVB2nNFdS7vw=; b=jSHw11R6NwjlhyRGQ0bUZ1so76k8+i/liEvZURecqXVcDy5XDHiUaabZ4vhRGW/VroEbGKgfcNTeKnKczhW2dHny6OXyUdSpesyAWqYD/R6+pxB+0+57JwvHutb2RFN3OGZuResT9JzE6DR+MwBAxvY/kZGjk7/rJe+INvx1D0001mdryWSMdtQRYAiyhE2ukpKGbYt8YXp4/gHKEOHtd+yGDfb03Rc5gnSUDKw/BboDjn1AuizWTT0Q3y83ZAFySM5QKcQ23qcQ0T2nWxfZxWowqLg29sig7t0L9wkjTqLm3/YwM3kU55ao6TdGL+ks70nPkWGr1t6kITJ/1M6uwg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5gko-0008SK-OR for guix-patches@gnu.org; Tue, 29 Oct 2024 03:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74079] [PATCH 2/2] gnu: x265: Link together all library variants. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 07:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74079@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 74079-submit@debbugs.gnu.org id=B74079.173018724632397 (code B ref 74079); Tue, 29 Oct 2024 07:35:02 +0000 Received: (at 74079) by debbugs.gnu.org; 29 Oct 2024 07:34:06 +0000 Received: from localhost ([127.0.0.1]:55797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5gju-0008QS-96 for submit@debbugs.gnu.org; Tue, 29 Oct 2024 03:34:06 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:60467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5gjp-0008Pg-3A for 74079@debbugs.gnu.org; Tue, 29 Oct 2024 03:34:01 -0400 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-539e59dadebso5988314e87.0 for <74079@debbugs.gnu.org>; Tue, 29 Oct 2024 00:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730187175; x=1730791975; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=jLYStz7CHvkta2I1YzY2ubICtz2j+nNgVB2nNFdS7vw=; b=hJx+lqgIkxJh+4BOxZNWOc3NuxXMJrAOV3axpV3NUbKW6L3bfY0xE4TiE/kICAjbz/ VR+S9YYt23jjvEDGoa+745oFFckOPssl30xx9P8CQ/X4FCrbJ7pG3Rh0tjeHhcroNN1k JMoL5wbAVEgIKSTaHN0dMrtp9j9UcYHpp5YcuNvcq9VSU4q6oaViBucAwmZBW4Joed4R /2rkWpfpnnSFgJlCsXE6JFONxNncW7xLn2rJTByrVL8HXEyQW2TfCKa32R2LvXaWLVF8 WKS/TteJM599ioQ9WLVoMMowbwZTsBwmriC6qQzeQKu3O9VQX3vsc2ClZWaFltgsuqmm YX+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730187175; x=1730791975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jLYStz7CHvkta2I1YzY2ubICtz2j+nNgVB2nNFdS7vw=; b=CQa1puqQvoD3q8FZo+jj5e6q3Q++qIb3QsGQRukWaJmp/unmr+ZHF5Mqm/kOrIBMLp UjVG249Ku2J8AU6wLpvRZpjBzqMjHzyvBJ8YXlqQjsAeX1ynhQVMH7UZ2VzyAiMu2Ogm /V+qSLTwdnYKmu4n31mP5ZzDRy3AKzOCzA7Xc5GXrCYRMVoEyPdFIgf0lVUTw1AFGdlq qK3UqlSqTeLfb6EZnXKq4WvyscHhJlO2/UlsW1kcF/aAiukqGzHyQHEflW9OfI/tmoF+ UnCvYPS5tVL59B7EicmRUlbkd6ncATtlvFALsJQsn2KbQSqGqhubdQqvvddvHUrNR2hw r6Hw== X-Gm-Message-State: AOJu0YwKB3WOcH7+y+hRhv9vHLS/hmnsMRVpGOIcoRyi/4kBDBRBbikz Xsw/RlBgZqOxlHknEHXHtSac6Xf9gtLwWHJhLDVkN4jYdYs000SSNBWrqpVM X-Google-Smtp-Source: AGHT+IFOnRforMOahgcfTt2wC0k10df3h+QTSHvHY3jFbMcYSReWuKZx22ZhTiDcz5ns9m0/s5E7Og== X-Received: by 2002:a05:6512:2256:b0:539:edea:9ed9 with SMTP id 2adb3069b0e04-53b348ec028mr4827774e87.1.1730187174906; Tue, 29 Oct 2024 00:32:54 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38058b3c625sm11675816f8f.37.2024.10.29.00.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 00:32:54 -0700 (PDT) From: Efraim Flashner Date: Tue, 29 Oct 2024 09:32:39 +0200 Message-ID: <5ef0d25dc28ffa266a2c5f036627df4f040cef35.1730186934.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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/video.scm (x265)[arguments]: Adjust the 'configure-flags to link the 10bit and 12bit variants of the libraries. Adjust the 'build-12-bit and 'build-10-bit phases to not build the shared libraries. Remove 'install-more-libs phase. Change-Id: I338e9a3d216e35e6e38fe6ccfd29236d14054306 --- gnu/packages/video.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb07a21e981..d9ac0a22806 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1323,8 +1323,11 @@ (define-public x265 (arguments `(#:tests? #f ; tests are skipped if ENABLE_ASSEMBLY is TRUE. #:configure-flags - ;; Ensure position independent code for everyone. (list "-DENABLE_PIC=TRUE" + "-DLINKED_10BIT=ON" + "-DLINKED_12BIT=ON" + "-DEXTRA_LIB=x265_main10.a;x265_main12.a" + "-DEXTRA_LINK_FLAGS=-L../build-10bit -L../build-12bit" (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out"))) #:phases @@ -1343,7 +1346,7 @@ (define-public x265 (lambda* (#:key (configure-flags '()) #:allow-other-keys #:rest args) (mkdir "../build-12bit") (with-directory-excursion "../build-12bit" - (apply invoke + (invoke "cmake" "../source" ,@(if (target-aarch64?) '("-DENABLE_ASSEMBLY=OFF") @@ -1355,8 +1358,9 @@ (define-public x265 "-DHIGH_BIT_DEPTH=ON" "-DEXPORT_C_API=OFF" "-DENABLE_CLI=OFF" - "-DMAIN12=ON" - configure-flags) + "-DENABLE_SHARED=OFF" + "-DENABLE_PIC=TRUE" + "-DMAIN12=ON") (substitute* (cons "cmake_install.cmake" (append (find-files "CMakeFiles/x265-shared.dir") @@ -1367,7 +1371,7 @@ (define-public x265 (lambda* (#:key (configure-flags '()) #:allow-other-keys #:rest args) (mkdir "../build-10bit") (with-directory-excursion "../build-10bit" - (apply invoke + (invoke "cmake" "../source" ,@(if (target-aarch64?) '("-DENABLE_ASSEMBLY=OFF") @@ -1379,19 +1383,14 @@ (define-public x265 "-DHIGH_BIT_DEPTH=ON" "-DEXPORT_C_API=OFF" "-DENABLE_CLI=OFF" - configure-flags) + "-DENABLE_SHARED=OFF" + "-DENABLE_PIC=TRUE") (substitute* (cons "cmake_install.cmake" (append (find-files "CMakeFiles/x265-shared.dir") (find-files "CMakeFiles/x265-static.dir"))) (("libx265") "libx265_main10")) ((assoc-ref %standard-phases 'build))))) - (add-after 'install 'install-more-libs - (lambda args - (with-directory-excursion "../build-12bit" - ((assoc-ref %standard-phases 'install))) - (with-directory-excursion "../build-10bit" - ((assoc-ref %standard-phases 'install))))) (add-before 'strip 'move-static-libs (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))