[Buildroot] [PATCH v2] SDL_mixer: Prefer Tremor over libvorbis

[Buildroot] [PATCH v2] SDL_mixer: Prefer Tremor over libvorbis

[Paul Cercueil]

When Tremor is enabled, configure SDL_mixer to use this Vorbis decoding
library instead of libvorbis. Since Tremor does fixed-point math, it is
safe to assume that if it's enabled then it is faster than libvorbis on
the target architecture.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---

Notes:
    v2: Remove Config.in option; enable Tremor support if Tremor is enabled
        in the config.

 package/sdl_mixer/sdl_mixer.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 81ace86498..d6f7b42deb 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -42,11 +42,16 @@ else
 SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug
 endif
 
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
+SDL_MIXER_DEPENDENCIES += tremor
+else
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
 SDL_MIXER_CONF_OPTS += --enable-music-ogg
 SDL_MIXER_DEPENDENCIES += libvorbis
 else
 SDL_MIXER_CONF_OPTS += --disable-music-ogg
 endif
+endif
 
 $(eval $(autotools-package))
-- 
2.24.0

[Buildroot] [PATCH v2] SDL_mixer: Prefer Tremor over libvorbis

[Thomas Petazzoni]

Hello,

On Thu, 12 Dec 2019 18:18:59 +0100
Paul Cercueil <paul@crapouillou.net> wrote:

> When Tremor is enabled, configure SDL_mixer to use this Vorbis decoding
> library instead of libvorbis. Since Tremor does fixed-point math, it is
> safe to assume that if it's enabled then it is faster than libvorbis on
> the target architecture.
> 
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>

The expected format/capitalization for the commit title is:

	package/sdl_mixer: prefer tremor over libvorbis

> +ifeq ($(BR2_PACKAGE_TREMOR),y)
> +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
> +SDL_MIXER_DEPENDENCIES += tremor
> +else
>  ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
>  SDL_MIXER_CONF_OPTS += --enable-music-ogg
>  SDL_MIXER_DEPENDENCIES += libvorbis
>  else
>  SDL_MIXER_CONF_OPTS += --disable-music-ogg
>  endif
> +endif

These conditions are better written like this:

ifeq ...

else ifeq ...

else ...

endif

Note how having the "ifeq" on the same line as the "else" avoids the
need for an additional "endif" at the end of condition.

I fixed both minor nits, and applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com