* [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis
@ 2019-12-09 19:15 Paul Cercueil
2019-12-09 19:15 ` [Buildroot] [PATCH 2/2] SDL_mixer: Add support for libmodplug Paul Cercueil
2019-12-10 9:29 ` [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Paul Cercueil @ 2019-12-09 19:15 UTC (permalink / raw)
To: buildroot
Add a menu option to set the Vorbis decoding library to Tremor instead
of libvorbis.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
package/sdl_mixer/Config.in | 13 +++++++++++++
package/sdl_mixer/sdl_mixer.mk | 5 +++++
2 files changed, 18 insertions(+)
diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in
index 42dfe63c0a..94fcda7a0e 100644
--- a/package/sdl_mixer/Config.in
+++ b/package/sdl_mixer/Config.in
@@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER
SMPEG MP3 libraries.
http://www.libsdl.org/projects/SDL_mixer/
+
+if BR2_PACKAGE_SDL_MIXER
+
+config BR2_PACKAGE_SDL_MIXER_USE_TREMOR
+ bool "Prefer Tremor for Vorbis decoding"
+ select BR2_PACKAGE_TREMOR
+ help
+ Prefer Tremor over libvorbis for Vorbis decoding.
+ Tremor is a fixed-point implementation of an Ogg Vorbis
+ decoder. Choose this option if the target CPU has no
+ FPU.
+
+endif
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 9183a4aa8c..3159d0dee1 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -35,11 +35,16 @@ else
SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
endif
+ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] SDL_mixer: Add support for libmodplug
2019-12-09 19:15 [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Paul Cercueil
@ 2019-12-09 19:15 ` Paul Cercueil
2019-12-10 9:32 ` Peter Korsgaard
2019-12-10 9:29 ` [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2019-12-09 19:15 UTC (permalink / raw)
To: buildroot
Add support for playing back tracker modules using libmodplug.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
.../0003-Fix-include-of-modplug.h.patch | 33 +++++++++++++++++++
package/sdl_mixer/sdl_mixer.mk | 7 ++++
2 files changed, 40 insertions(+)
create mode 100644 package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
diff --git a/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch b/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
new file mode 100644
index 0000000000..841cef4ef5
--- /dev/null
+++ b/package/sdl_mixer/0003-Fix-include-of-modplug.h.patch
@@ -0,0 +1,33 @@
+From fb8e7c535a88838cc8ae364cd2a099df6316d3b0 Mon Sep 17 00:00:00 2001
+From: Paul Cercueil <paul@crapouillou.net>
+Date: Tue, 30 Apr 2019 23:12:15 +0200
+Subject: [PATCH] Fix include of modplug.h
+
+The include path should be <libmodplug/modplug.h>, since the library
+doesn't provide any specific include path in its pkg-config file.
+
+This patch was obtained from this bug report:
+https://bugzilla.libsdl.org/show_bug.cgi?id=4893
+
+Signed-off-by: Paul Cercueil <paul@crapouillou.net>
+
+---
+ music_modplug.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/music_modplug.h b/music_modplug.h
+index 92cbafd..49abbb0 100644
+--- a/music_modplug.h
++++ b/music_modplug.h
+@@ -1,6 +1,7 @@
+ #ifdef MODPLUG_MUSIC
+
+-#include "modplug.h"
++#include <libmodplug/modplug.h>
++
+ #include "SDL_rwops.h"
+ #include "SDL_audio.h"
+ #include "SDL_mixer.h"
+--
+2.21.0.593.g511ec345e18
+
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 3159d0dee1..1692054bd4 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -35,6 +35,13 @@ else
SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
endif
+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+SDL_MIXER_CONF_OPTS += --enable-music-mod-modplug
+SDL_MIXER_DEPENDENCIES += libmodplug
+else
+SDL_MIXER_CONF_OPTS += --disable-music-mod-modplug
+endif
+
ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y)
SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
SDL_MIXER_DEPENDENCIES += tremor
--
2.24.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis
2019-12-09 19:15 [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Paul Cercueil
2019-12-09 19:15 ` [Buildroot] [PATCH 2/2] SDL_mixer: Add support for libmodplug Paul Cercueil
@ 2019-12-10 9:29 ` Peter Korsgaard
2019-12-12 16:06 ` Paul Cercueil
1 sibling, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2019-12-10 9:29 UTC (permalink / raw)
To: buildroot
>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes:
> Add a menu option to set the Vorbis decoding library to Tremor instead
> of libvorbis.
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
> package/sdl_mixer/Config.in | 13 +++++++++++++
> package/sdl_mixer/sdl_mixer.mk | 5 +++++
> 2 files changed, 18 insertions(+)
> diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in
> index 42dfe63c0a..94fcda7a0e 100644
> --- a/package/sdl_mixer/Config.in
> +++ b/package/sdl_mixer/Config.in
> @@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER
> SMPEG MP3 libraries.
> http://www.libsdl.org/projects/SDL_mixer/
> +
> +if BR2_PACKAGE_SDL_MIXER
> +
> +config BR2_PACKAGE_SDL_MIXER_USE_TREMOR
> + bool "Prefer Tremor for Vorbis decoding"
> + select BR2_PACKAGE_TREMOR
> + help
> + Prefer Tremor over libvorbis for Vorbis decoding.
> + Tremor is a fixed-point implementation of an Ogg Vorbis
> + decoder. Choose this option if the target CPU has no
> + FPU.
> +
> +endif
> diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
> index 9183a4aa8c..3159d0dee1 100644
> --- a/package/sdl_mixer/sdl_mixer.mk
> +++ b/package/sdl_mixer/sdl_mixer.mk
> @@ -35,11 +35,16 @@ else
> SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
> endif
> +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y)
> +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
> +SDL_MIXER_DEPENDENCIES += tremor
> +else
> ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
Do we need an explicit option for this? Can't we just check for
BR2_PACKAGE_TREMOR here? I doubt there is any situations where tremor is
enabled but the user doesn't want to use it.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis
2019-12-10 9:29 ` [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Peter Korsgaard
@ 2019-12-12 16:06 ` Paul Cercueil
2019-12-12 16:14 ` Peter Korsgaard
0 siblings, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2019-12-12 16:06 UTC (permalink / raw)
To: buildroot
Hi Peter,
Le mar., d?c. 10, 2019 at 10:29, Peter Korsgaard <peter@korsgaard.com>
a ?crit :
>>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes:
>
> > Add a menu option to set the Vorbis decoding library to Tremor
> instead
> > of libvorbis.
>
> > Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> > ---
> > package/sdl_mixer/Config.in | 13 +++++++++++++
> > package/sdl_mixer/sdl_mixer.mk | 5 +++++
> > 2 files changed, 18 insertions(+)
>
> > diff --git a/package/sdl_mixer/Config.in
> b/package/sdl_mixer/Config.in
> > index 42dfe63c0a..94fcda7a0e 100644
> > --- a/package/sdl_mixer/Config.in
> > +++ b/package/sdl_mixer/Config.in
> > @@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER
> > SMPEG MP3 libraries.
>
> > http://www.libsdl.org/projects/SDL_mixer/
> > +
> > +if BR2_PACKAGE_SDL_MIXER
> > +
> > +config BR2_PACKAGE_SDL_MIXER_USE_TREMOR
> > + bool "Prefer Tremor for Vorbis decoding"
> > + select BR2_PACKAGE_TREMOR
> > + help
> > + Prefer Tremor over libvorbis for Vorbis decoding.
> > + Tremor is a fixed-point implementation of an Ogg Vorbis
> > + decoder. Choose this option if the target CPU has no
> > + FPU.
> > +
> > +endif
> > diff --git a/package/sdl_mixer/sdl_mixer.mk
> b/package/sdl_mixer/sdl_mixer.mk
> > index 9183a4aa8c..3159d0dee1 100644
> > --- a/package/sdl_mixer/sdl_mixer.mk
> > +++ b/package/sdl_mixer/sdl_mixer.mk
> > @@ -35,11 +35,16 @@ else
> > SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
> > endif
>
> > +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y)
> > +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
> > +SDL_MIXER_DEPENDENCIES += tremor
> > +else
> > ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
>
> Do we need an explicit option for this? Can't we just check for
> BR2_PACKAGE_TREMOR here? I doubt there is any situations where tremor
> is
> enabled but the user doesn't want to use it.
That's up to you really. I can send a v2 with the Config.in option
removed.
-Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis
2019-12-12 16:06 ` Paul Cercueil
@ 2019-12-12 16:14 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-12-12 16:14 UTC (permalink / raw)
To: buildroot
>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes:
Hi,
>> > +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y)
>> > +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor
>> > +SDL_MIXER_DEPENDENCIES += tremor
>> > +else
>> > ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
>>
>> Do we need an explicit option for this? Can't we just check for
>> BR2_PACKAGE_TREMOR here? I doubt there is any situations where
>> tremor is
>> enabled but the user doesn't want to use it.
> That's up to you really. I can send a v2 with the Config.in option
> removed.
Yes please - Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-12 16:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-09 19:15 [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Paul Cercueil
2019-12-09 19:15 ` [Buildroot] [PATCH 2/2] SDL_mixer: Add support for libmodplug Paul Cercueil
2019-12-10 9:32 ` Peter Korsgaard
2019-12-10 9:29 ` [Buildroot] [PATCH 1/2] SDL_mixer: Add option to prefer Tremor over libvorbis Peter Korsgaard
2019-12-12 16:06 ` Paul Cercueil
2019-12-12 16:14 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox