Skip to contentSkip to conversation

SDL_mixer: Add option to prefer Tremor over libvorbis

PATCH Superseded Paul Cercueil 2 participants 6 messages Dec 9, 2019 – Dec 12, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 SDL_mixer: Add option to prefer Tremor over libvorbis

Add a menu option to set the Vorbis decoding library to Tremor instead of libvorbis.

---
 package/sdl_mixer/Config.in    | 13 +++++++++++++
 package/sdl_mixer/sdl_mixer.mk |  5 +++++
 2 files changed, 18 insertions(+)
package/sdl_mixer/Config.in +13 -0
index 42dfe63c0a..94fcda7a0e 100644
@@ -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
package/sdl_mixer/sdl_mixer.mk +5 -0
index 9183a4aa8c..3159d0dee1 100644
@@ -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))
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/2 SDL_mixer: Add support for libmodplug

Add support for playing back tracker modules using libmodplug.

---
 .../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
package/sdl_mixer/0003-Fix-include-of-modplug.h.patch new file +33 -0
new file mode 100644
index 0000000000..841cef4ef5
@@ -0,0 +1,33 @@
+From fb8e7c535a88838cc8ae364cd2a099df6316d3b0 Mon Sep 17 00:00:00 2001
+From: Paul Cercueil <[email protected]>
+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 <[email protected]>
+
+---
+ 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
+
package/sdl_mixer/sdl_mixer.mk +7 -0
index 3159d0dee1..1692054bd4 100644
@@ -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
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/2 SDL_mixer: Add support for libmodplug

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Add support for playing back tracker modules using libmodplug.

---
 .../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

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 SDL_mixer: Add option to prefer Tremor over libvorbis

In reply to Paul Cercueil
Quoted 37 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Add a menu option to set the Vorbis decoding library to Tremor instead of libvorbis.

---
 package/sdl_mixer/Config.in    | 13 +++++++++++++
 package/sdl_mixer/sdl_mixer.mk |  5 +++++
 2 files changed, 18 insertions(+)
package/sdl_mixer/Config.in +13 -0
index 42dfe63c0a..94fcda7a0e 100644
@@ -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
package/sdl_mixer/sdl_mixer.mk +0 -0
index 9183a4aa8c..3159d0dee1 100644

package/sdl_mixer/sdl_mixer.mk else · line 42

Quoted 8 lines
package/sdl_mixer/sdl_mixer.mk +4 -0
@@ -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.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 SDL_mixer: Add option to prefer Tremor over libvorbis

Hi Peter,

Le mar., d?c. 10, 2019 at 10:29, Peter Korsgaard <[email protected]> a ?crit :

Quoted 43 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Add a menu option to set the Vorbis decoding library to Tremor

instead

Review

Quoted 9 lines

of libvorbis.

---
 package/sdl_mixer/Config.in    | 13 +++++++++++++
 package/sdl_mixer/sdl_mixer.mk |  5 +++++
 2 files changed, 18 insertions(+)
(quoted diff) +0 -0

b/package/sdl_mixer/Config.in

Review

Quoted 21 lines

index 42dfe63c0a..94fcda7a0e 100644

package/sdl_mixer/Config.in +13 -0
@@ -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
(quoted diff) +0 -0

b/package/sdl_mixer/sdl_mixer.mk

Quoted 6 lines

index 9183a4aa8c..3159d0dee1 100644

package/sdl_mixer/sdl_mixer.mk +0 -0
@@ -35,11 +35,16 @@ else
 SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
 endif
Quoted 10 lines

package/sdl_mixer/sdl_mixer.mk else · line 42

Quoted 5 lines
package/sdl_mixer/sdl_mixer.mk +4 -0
+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

#5 lore raw

PATCH 1/2 SDL_mixer: Add option to prefer Tremor over libvorbis

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Hi,

Quoted 11 lines
Quoted 10 lines

package/sdl_mixer/sdl_mixer.mk else · line 42

Quoted 5 lines
package/sdl_mixer/sdl_mixer.mk +4 -0
+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.

Quoted 2 lines

That's up to you really. I can send a v2 with the Config.in option removed.

Yes please - Thanks.

Signature · 1 line
Bye, Peter Korsgaard