From fd34e2b21ecd39476599dfcee493048c1f02986e Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Wed, 19 Jun 2024 21:58:17 +0200 Subject: [PATCH] PACKAGE-sdl_mixer: allow for `mpg123` & `flac` support (#107) update sdl_mixer.mk --- package/sdl_mixer/sdl_mixer.mk | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index a4bfcc36..30f35bda 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -13,19 +13,22 @@ SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION)) SDL_MIXER_LICENSE = Zlib SDL_MIXER_LICENSE_FILES = COPYING -# Package does not build in parallel due to improper make rules -SDL_MIXER_MAKE = $(MAKE1) - SDL_MIXER_INSTALL_STAGING = YES -SDL_MIXER_DEPENDENCIES = sdl +SDL_MIXER_DEPENDENCIES = host-pkgconf sdl -# We're patching configure.in, so we need to autoreconf -SDL_MIXER_AUTORECONF = YES +SDL_MIXER_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr -SDL_MIXER_CONF_OPTS = \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-music-mp3 \ - --disable-music-flac # configure script fails when cross compiling +ifeq ($(BR2_PACKAGE_MPG123),y) +SDL_MIXER_DEPENDENCIES += mpg123 +else +SDL_MIXER_CONF_OPTS += --disable-music-mp3 +endif + +ifeq ($(BR2_PACKAGE_FLAC),y) +SDL_MIXER_DEPENDENCIES += flac +else +SDL_MIXER_CONF_OPTS += --disable-music-flac +endif ifeq ($(BR2_PACKAGE_FLUIDSYNTH),y) SDL_MIXER_DEPENDENCIES += fluidsynth @@ -54,13 +57,13 @@ SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl endif ifeq ($(BR2_PACKAGE_LIBMIKMOD),y) -SDL_MIXER_DEPENDENCIES += host-pkgconf libmikmod +SDL_MIXER_DEPENDENCIES += libmikmod SDL_MIXER_CONF_OPTS += LIBMIKMOD_CONFIG=$(STAGING_DIR)/usr/bin/libmikmod-config else SDL_MIXER_CONF_OPTS += --disable-music-mod ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug -SDL_MIXER_DEPENDENCIES += host-pkgconf libmodplug +SDL_MIXER_DEPENDENCIES += libmodplug endif endif