From patchwork Sun Jan 5 10:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19589 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 2BE46179F0; Sun, 5 Jan 2020 10:47:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E19BF179EE for ; Sun, 5 Jan 2020 10:47:17 +0000 (GMT) Received: from localhost ([::1]:40948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3RF-0005jg-FN for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44411) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R2-0005VJ-Lz for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3R1-0002s5-OG for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37747) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3R1-0002ru-L2 for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3R1-0007LE-Jn for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 5/5] gnu: sdl2-mixer: Enable opus support. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116828122 (code B ref 38941); Sun, 05 Jan 2020 10:47:03 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:08 +0000 Received: from localhost ([127.0.0.1]:43716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q7-0007JV-NN for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:08 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q3-0007Hz-9C for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:03 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 1e265c1d for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=/Mt4mRnOLQorAoeZuhQQD VRHs3g=; b=RWMBCE+O/ZiRn9YikFj3/Q+qM4b29Lmvm1bn7Hll+lYy4f12RE0uY iBFdVdMhP+vcWG84kypvKl2V/OoTR0xdKiHgHQfR+kOu/oDU46NI03Y4p/yXuT4a BxR7Pg5LuBeiMTa1ZIlf1gOpZmzg89/CcLCmiRJGsGGfzOJ/11nL2ynYKTcEJ4fj 0zGWJDmNmDMGpmwWAMnZqc2v5trQn0/JeLbxjhrIPhweIkDAmTuet8Cx9ZHaJuF1 v3Yq/OsOe7QNeIH9ae2KwAbsLSzux08bzh2kCR7cyDAwBGjVXw1fQa6alfxAbHKK 8ne6O/7YNMB8aQvMnNVns78NgoMVCi9Ow== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 60e297c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:46:00 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:51 +0100 Message-Id: <20200105104551.16961-5-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/sdl.scm (sdl2-mixer)[inputs]: Add opusfile. [native-inputs]: Add pkg-config. [arguments]: Link opusfile at build time. --- gnu/packages/sdl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80f3da9327..80725561fb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -420,15 +420,19 @@ directory.") (substitute-keyword-arguments (package-arguments sdl-mixer) ((#:configure-flags flags) `(cons* + "--disable-music-opus-shared" ;; These options were renamed in SDL2 mixer. Keeping the inherited ;; variants produces a harmless warning. "--disable-music-mod-modplug-shared" "--disable-music-midi-fluidsynth-shared" ,flags)))) (inputs - ;; The default MOD library changed in SDL2 mixer. - `(("libmodplug" ,libmodplug) + `(("opusfile" ,opusfile) + ;; The default MOD library changed in SDL2 mixer. + ("libmodplug" ,libmodplug) ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) + (native-inputs + `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer))))