From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cHQEHPQd12ZaGQAAe85BDQ:P1 (envelope-from ) for ; Tue, 03 Sep 2024 14:32:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id cHQEHPQd12ZaGQAAe85BDQ (envelope-from ) for ; Tue, 03 Sep 2024 16:32:20 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KeIJj1Qz; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=NcgKf9Js; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725373940; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: 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=q4QpueM+XRNemcfcrdReCiuiVq3N+vUZR/q4jp6l9rI=; b=iQD+9icT5fvBOnyJ5sm7lsqWQDi9yE8Ztjpiy6Je86GwQEWn2uQBqE0VY3Yv96+Z3qiDcB 6MWcxtOQsUQpHQNP1wEtOcXhSaevs/iH72Hw6VV+r8LhGchKBe8szt1TH8P8wFB1qAVJes hbqxP3mK/ywCYvGwqOQngyycwnppzZt4b2r2GfeaUQu/7adSQXbO6qm24987Rf9lwPEs0x LxcFRB+8B3Z+sM9VxbctiVB56sl1ipH5zsJEVreKBD119XMWumHE1EDLQH+zZGED+lQFLX CwhaTCcN47Ht0I6vbJ2UdJRT3b/Nbfn+wGO4hu2aXE+Y/k2Ko5Rh9WFyxq1hHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KeIJj1Qz; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=NcgKf9Js; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725373940; a=rsa-sha256; cv=none; b=XEm4cqdWLNV3yF4cU8NLwB/Hs61fEO5lZ+vcS3dTlc2Y1DmmvtcSDB+OEtuRX2tx6pkmkk fnx5tU/LkNQF6XwVCXnZD1kR9CvT1Rf7lM4YYnTUOkOXi95ftpqKUYc0RGojQwlFXsyk2h qNlh3gUIVhnMpvP2yA1VmpAFsiUiJ2AbZ9fbOcAaM58bb4Khle7SxJ4TNNXpHeK5av0xcn UwxInJ4wMlpxOuB8S2EA8G3VN0MCku5kzqRIyQcJVgNONQUD1X3ebB5ND5hQMBkkfliyXr Lcm6huRNcaO6/GIcjsJY3WZYgYdJIR4byMKRbzz1atLTCF8u7QwYQN8q+kg9GQ== 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 471CF68377 for ; Tue, 3 Sep 2024 16:32:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slUZf-0001bN-4b; Tue, 03 Sep 2024 10:32:03 -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 1slUZc-0001WP-Ky for bug-guix@gnu.org; Tue, 03 Sep 2024 10:32:00 -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 1slUZc-0003Up-CO for bug-guix@gnu.org; Tue, 03 Sep 2024 10:32:00 -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=q4QpueM+XRNemcfcrdReCiuiVq3N+vUZR/q4jp6l9rI=; b=KeIJj1Qz+lyx7uG024E5ehq7Ze2+/d8Z7L8Ap742oujBQpvPTNp45W67p3qjLsnbgDnyW4MiNOkKXtWfsEI+YJpBhX44Jb99Ibv+cCyVaTcpPtr1P9DxMON/53uVFuzSI8G//LJJ7KQWhE/JV7PssSlD6pa3CidvpjG5TbTs6eEXmG8/SXJ+2G9odd8ErWOGlFw9kTz/yqpVrjOICYwRNx5A1gLOgOpA3GELEoriaxkX1/g6ZSzhwsTobYP0r+oo1ovxlBGT9xibC6vlA7pOfVNDwn/0Um0LH8nyDlXxgruikSTaIMWkaBM/vgRlTnER21cYE7rFS8ifst0Lw944TA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1slUac-000683-Gd for bug-guix@gnu.org; Tue, 03 Sep 2024 10:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#72917: [PATCH] gnu: ffmpeg-{5, 4, 3}: Fix build on i686 with binutils 2.41. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 03 Sep 2024 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72917 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 72917@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista , dariqq@posteo.net, ludo@gnu.org Received: via spool by 72917-submit@debbugs.gnu.org id=B72917.172537397123539 (code B ref 72917); Tue, 03 Sep 2024 14:33:02 +0000 Received: (at 72917) by debbugs.gnu.org; 3 Sep 2024 14:32:51 +0000 Received: from localhost ([127.0.0.1]:60474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slUaR-00067b-4m for submit@debbugs.gnu.org; Tue, 03 Sep 2024 10:32:51 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slUaP-00067L-1w for 72917@debbugs.gnu.org; Tue, 03 Sep 2024 10:32:50 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4Wyp3K1YtxzDr2j; Tue, 3 Sep 2024 14:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725373901; bh=+IdsDFj3EJ8hH2zvxWJeLjxFsmEG0GEkj99+APu0bzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NcgKf9JsXLMeCpJ3s8Dgd1ff0Stk6aTlMPOnZSIdDk4RdmExgDbtQYOpJBXpGfmQo Yd5JmhKbL0RAMOUxjhPRNMQCgy7r/HcPeNKk4kzN5Ge4t1JB+lYbZy9EnZCNk9hYf9 zHRHuAjp3D8mSqzOsYq/hj1xuMN7xlETWndXrH3E= X-Riseup-User-ID: ADEE0DFCB1C4686AD387A138093D83960EE00A7A9600C4819EF7C63B14ABEDEF Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4Wyp3H6y7yzFw39; Tue, 3 Sep 2024 14:31:39 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 3 Sep 2024 11:30:59 -0300 Message-ID: <20240903143059.5704-1-nandre@riseup.net> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 471CF68377 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.48 X-Spam-Score: -2.48 X-TUID: DyCQ7vCvhZXK Fixes . * gnu/packages/video.scm (ffmpeg-5): Replace 'bypass-openal-check string substitution with one that matches on this and earlier versions of ffmpeg. (ffmpeg-4): Inherit package arguments from ffmpeg-5. Reported-by: Dariqq Change-Id: Ie5b51a174be45b511757dece369563975e498bac --- gnu/packages/video.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ac9fabeb38..8b4da65836 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1845,6 +1845,9 @@ (define-public ffmpeg ;; https://lists.gnu.org/archive/html/guix-devel/2024-08/msg00159.html (lambda _ (substitute* "configure" + ;; This string only matches on ffmpeg v6 and above. + ;; Replace it with the one defined at ffmpeg-5 which + ;; matches on all ffmpeg versions. See #71917. (("alGetError \\|\\|") "alGetError \|\| true \|\|"))))) #~()) @@ -1889,7 +1892,18 @@ (define-public ffmpeg-5 version ".tar.xz")) (sha256 (base32 - "0qwhyhil805hns7yksdxagnrcc90h60al7lz1rc65kd1j2w3nf2l")))))) + "0qwhyhil805hns7yksdxagnrcc90h60al7lz1rc65kd1j2w3nf2l")))) + (arguments + (if (target-x86-32?) + (substitute-keyword-arguments (package-arguments ffmpeg) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'bypass-openal-check + (lambda _ + (substitute* "configure" + (("die \"ERROR: openal not found\"") + "true"))))))) + (package-arguments ffmpeg))))) (define-public ffmpeg-4 (package @@ -1907,7 +1921,7 @@ (define-public ffmpeg-4 (inputs (modify-inputs (package-inputs ffmpeg) (replace "sdl2" sdl2-2.0))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) + (substitute-keyword-arguments (package-arguments ffmpeg-5) ((#:configure-flags flags ''()) #~(cons "--enable-avresample" #$flags)))))) base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87 -- 2.45.2