03a8884c46
Afterd255b67972(autotools: do not overwrite first include path), the ordering of include paths has changed: the system directories are specified with explicit options passed to autoreconf, which means that any directory specified in the package _AUTORECONF_OPTS are no longer first: - in package/autoconf/autoconf.mk, we define AUTORECONF as: AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" - in package/pkg-autotools.mk, we call AUTORECONF with: $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) So, the include directory specified by SDL_MIXER_AUTORECONF_OPTS is now lagging behind the system headers, and the very issue thatd255b67972was suposed to fix in a generic way, pops up back for this specific case. We fix that by patching sdl_mixer so that it uses the bog-down standard mechanisms, to specify the macro directory from within configure.in, instead of specifying it on the command line, so that the magic introduced byd255b67972does happen. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Michael Walle <michael@walle.cc> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
55 lines
1.5 KiB
Makefile
55 lines
1.5 KiB
Makefile
################################################################################
|
|
#
|
|
# sdl_mixer
|
|
#
|
|
################################################################################
|
|
|
|
SDL_MIXER_VERSION = 1.2.12
|
|
SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
|
|
SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
|
|
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
|
|
|
|
# We're patching configure.in, so we need to autoreconf
|
|
SDL_MIXER_AUTORECONF = YES
|
|
|
|
SDL_MIXER_CONF_OPTS = \
|
|
--without-x \
|
|
--with-sdl-prefix=$(STAGING_DIR)/usr \
|
|
--disable-music-midi \
|
|
--disable-music-mod \
|
|
--disable-music-mp3 \
|
|
--disable-music-flac # configure script fails when cross compiling
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBMAD),y)
|
|
SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
|
|
SDL_MIXER_DEPENDENCIES += libmad
|
|
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 += host-pkgconf libmodplug
|
|
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
|
|
|
|
$(eval $(autotools-package))
|