diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-03-11 07:55:40 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-11 07:55:40 (GMT) |
| commit | 4bc31e04c9cea6cfa761df8e4483b237727e210e (patch) | |
| tree | 9503136b45abb34951ebcd63309c3916bf7a9b5e | |
| parent | 28e5279c1774f7416151ee458dcce2b14f5e8dbd (diff) | |
| parent | f0d3c7de27a92f92967d51ad1ace5fbb8804483e (diff) | |
| download | mxe-4bc31e04c9cea6cfa761df8e4483b237727e210e.zip mxe-4bc31e04c9cea6cfa761df8e4483b237727e210e.tar.gz mxe-4bc31e04c9cea6cfa761df8e4483b237727e210e.tar.bz2 | |
Merge branch 'patch-1' of https://github.com/SupSuper/mxe into SupSuper-patch-1
| -rw-r--r-- | src/sdl_mixer-2-fix-static-ogg-detection.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/src/sdl_mixer-2-fix-static-ogg-detection.patch b/src/sdl_mixer-2-fix-static-ogg-detection.patch new file mode 100644 index 0000000..c262c27 --- /dev/null +++ b/src/sdl_mixer-2-fix-static-ogg-detection.patch @@ -0,0 +1,55 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +This patch has been taken from: https://hg.libsdl.org/SDL_mixer/rev/0aadc9b6daac + +Gabriel Jacobo 2012-09-20 16:01:32 PDT + +When --disable-music-ogg-shared the OGG tests fail when they should pass. +Attached is a crude patch that gets them working (though the changes done to +configure.in, inside AC_CHECK_LIB, will produce ugly status string such as +"checking for ov_open_callbacks in -lvorbisidec -logg", which is mostly a +aesthetic concern) + +Upstream bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1604 + +--- a/configure ++++ b/configure +@@ -13339,7 +13339,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lvorbisidec $LIBS" ++LIBS="-lvorbisidec -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -13570,7 +13570,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lvorbisfile $LIBS" ++LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + +--- a/configure.in ++++ b/configure.in +@@ -429,7 +429,7 @@ + if test x$enable_music_ogg = xyes; then + if test x$enable_music_ogg_tremor = xyes; then + AC_CHECK_HEADER([tremor/ivorbisfile.h], [have_tremor_hdr=yes]) +- AC_CHECK_LIB([vorbisidec], [ov_open_callbacks], [have_tremor_lib=yes]) ++ AC_CHECK_LIB([vorbisidec], [ov_open_callbacks], [have_tremor_lib=yes], [-logg]) + if test x$have_tremor_hdr = xyes -a x$have_tremor_lib = xyes; then + case "$host" in + *-*-darwin*) +@@ -465,7 +465,7 @@ + fi + else + AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes]) +- AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes]) ++ AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [-lvorbis -logg -lm]) + if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then + case "$host" in + *-*-darwin*) |