Mercurial > mxe-octave

changeset 2477:54363e195f8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package sdl_mixer: use libmodplug instead of libmikmod
author Tony Theodore <tonyt@logyst.com>
date Thu, 03 May 2012 02:19:16 +1000
parents 64ee707dd119
children ce0389409fd8
files src/sdl_mixer.mk
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/sdl_mixer.mk	Wed May 02 15:43:16 2012 +0200
+++ b/src/sdl_mixer.mk	Thu May 03 02:19:16 2012 +1000
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := SDL_mixer-$($(PKG)_VERSION)
 $(PKG)_FILE     := SDL_mixer-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.libsdl.org/projects/SDL_mixer/release/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc sdl libmikmod ogg vorbis smpeg
+$(PKG)_DEPS     := gcc sdl libmodplug ogg vorbis smpeg
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://hg.libsdl.org/SDL_mixer/tags' | \
@@ -19,7 +19,7 @@
     $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in'
     echo \
         'Libs.private:' \
-        "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \
+        "`$(TARGET)-pkg-config libmodplug --libs`" \
         "`$(PREFIX)/$(TARGET)/bin/smpeg-config     --libs`" \
         >> '$(1)/SDL_mixer.pc.in'
     $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
@@ -29,7 +29,8 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-sdl-prefix='$(PREFIX)/$(TARGET)' \
         --disable-sdltest \
-        --enable-music-mod \
+        --disable-music-mod \
+        --enable-music-mod-modplug \
         --enable-music-ogg \
         --disable-music-flac \
         --enable-music-mp3 \
@@ -39,7 +40,6 @@
         --disable-music-mp3-shared \
         --disable-smpegtest \
         --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \
-        LIBMIKMOD_CONFIG='$(PREFIX)/$(TARGET)/bin/libmikmod-config' \
         LIBS='-lvorbis -logg'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=