From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#38941] [PATCH 5/5] gnu: sdl2-mixer: Enable opus support. Resent-Message-ID: From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:51 +0100 Message-Id: <20200105104551.16961-5-timotej.lazar@araneo.si> In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38941@debbugs.gnu.org Cc: Timotej Lazar * 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)))) -- 2.24.1