From patchwork Sat Oct 9 15:28:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33714 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 45CEF27BBE4; Sat, 9 Oct 2021 16:29:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F1B927BBE1 for ; Sat, 9 Oct 2021 16:29:19 +0100 (BST) Received: from localhost ([::1]:53432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEHm-0006s4-Mk for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEHX-0006pW-7s for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEHX-00025m-0O for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEHW-0000LD-Ty for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 3/7] gnu: opusfile: Add new phase after unpack. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.16337933361267 (code B ref 51085); Sat, 09 Oct 2021 15:29:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:28:56 +0000 Received: from localhost ([127.0.0.1]:53982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHQ-0000KK-ID for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:56 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHN-0000Ji-NK for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A3EFF240026 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793327; bh=IiHEICBD7jhtHWEOosBA+4eWekqbKmmWsMmrBqXVtyM=; h=From:To:Cc:Subject:Date:From; b=lG5Q2Mbd8p9Oe+4YSbopW2/T4hpCtQVKE5J28tBWjdoF02Q1pmCA9UuzrsANRQgJT a64xdhpR9bEtzZO2NF6k2u8OUzZzfU8d4zk34kmbzp9ZVSIBle1j31sXByhL1rdihT PH+UQ4dt1vBPsSttZ9I+mZt9BP++kwFv8BZ1zc0oZRw6GVhyCjgs83Bc7g89hOYHUa lKtrOg5rcX/UXi3RG77TeSjFaxhHHbxRjNgcjw+NXYZthg+zNZi14AvX6yVOtKOar/ I736WapFZMQRb4FOMSSIut6YR70ImZFDd6Mb8lVd+lPG0wjsnlPZUNg+jdEaUcoa1A ta7Z3AQgKkQdA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVQ4xbcz9rxX; Sat, 9 Oct 2021 17:28:46 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:16 +0000 Message-Id: <20211009152820.294764-3-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xiph.scm (opusfile)[arguments]<#:phases>: After the unpack phase add a fix-multistream phase to adjust the include header call of opus_multistream.h so that opusfile can find it. --- gnu/packages/xiph.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index fbbcbd6e61..0c9c799067 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -406,7 +407,16 @@ decoding .opus files.") "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#:configure-flags '("--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-multistream + ;; Opus include directory should be passed explicitly: + ;; https://github.com/xiph/opusfile/issues/10 however, + ;; opus_multistream.h still can't be found by the compiler. + (lambda _ + (substitute* "include/opusfile.h" + (("opus_multistream\\.h") "opus/opus_multistream.h"))))))) ;; Required by opusfile.pc and opusurl.pc. (propagated-inputs `(("libogg" ,libogg)