diff --git a/package/sdl_sound/0003-renamed-physfs-export.patch b/package/sdl_sound/0003-renamed-physfs-export.patch new file mode 100644 index 0000000000..3aeded329c --- /dev/null +++ b/package/sdl_sound/0003-renamed-physfs-export.patch @@ -0,0 +1,32 @@ +This patch is taken from the Arch Linux User Repository, see: +https://aur.archlinux.org/packages/sdl_sound-patched-hg/ + +Signed-off-by: Sam Bobroff + +diff -ru SDL_sound.orig/playsound/physfsrwops.h SDL_sound/playsound/physfsrwops.h +--- SDL_sound.orig/playsound/physfsrwops.h 2014-01-11 06:28:35.494936000 +0100 ++++ SDL_sound/playsound/physfsrwops.h 2014-01-11 06:31:38.315675483 +0100 +@@ -29,6 +29,11 @@ + extern "C" { + #endif + ++/* renamed in physfs dev, add alias */ ++#ifdef PHYSFS_DECL ++#define __EXPORT__ PHYSFS_DECL ++#endif ++ + /** + * Open a platform-independent filename for reading, and make it accessible + * via an SDL_RWops structure. The file will be closed in PhysicsFS when the +@@ -77,6 +82,11 @@ + */ + __EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); + ++/* renamed in physfs dev, remove alias */ ++#ifdef PHYSFS_DECL ++#undef __EXPORT__ ++#endif ++ + #ifdef __cplusplus + } + #endif diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk index 6c4f959f28..2544b598e9 100644 --- a/package/sdl_sound/sdl_sound.mk +++ b/package/sdl_sound/sdl_sound.mk @@ -45,6 +45,13 @@ else SDL_SOUND_CONF_OPTS += --disable-speex endif +ifeq ($(BR2_PACKAGE_PHYSFS),y) +SDL_SOUND_CONF_OPTS += --enable-physfs +SDL_SOUND_DEPENDENCIES += physfs +else +SDL_SOUND_CONF_OPTS += --disable-physfs +endif + SDL_SOUND_CONF_OPTS = \ --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr \