We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to add FLAC version checking in configure

SDL_mixer.FLAC_config.patch (text/plain), 3.33 KB, created by Austen Dicken on 2008-04-16 13:51:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Austen Dicken

Created: 2008-04-16 13:51:02 UTC

Size: 3.33 KB

patch

obsolete

>Index: configure.in
>===================================================================
>--- configure.in	(revision 3582)
>+++ configure.in	(working copy)
>@@ -318,6 +318,7 @@
>         fi
>     fi
> fi
>+libflac_ver=8
> AC_ARG_ENABLE([music-flac],
> AC_HELP_STRING([--enable-music-flac], [enable FLAC music [[default=yes]]]),
>               [], [enable_music_flac=yes])
>@@ -326,32 +327,55 @@
>               [dynamically load FLAC support [[default=yes]]]),
>               [], [enable_music_flac_shared=yes])
> if test x$enable_music_flac = xyes; then
>-    AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes])
>-    AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new], [have_flac_lib=yes])
>-    if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
>-        case "$host" in
>-            *-*-darwin*)
>-                flac_lib=[`find_lib FLAC*.dylib`]
>-                ;;
>-            *-*-cygwin* | *-*-mingw32*)
>-                flac_lib=[`find_lib "libFLAC*.dll"`]
>-                ;;
>-            *)
>-                flac_lib=[`find_lib "libFLAC.so.[0-9]"`]
>-                if test x$flac_lib = x; then
>-                    flac_lib=[`find_lib "libFLAC.so.[0-9]*"`]
>-                fi
>-                ;;
>-        esac
>-        SOURCES="$SOURCES $srcdir/*_flac.c"
>-        EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
>-        if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
>-            echo "-- dynamic libFLAC -> $flac_lib"
>-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
>-        else
>-            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC"
>-        fi
>-    fi
>+	AC_CHECK_HEADER([FLAC/export.h], [have_flac_export=yes])
>+	if test x$have_flac_export = xyes; then
>+		LIBS_SAVED="$LIBS"
>+		LIBS="-lFLAC"
>+	    AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
>+	    AC_TRY_RUN([
>+#include "FLAC/export.h"
>+#include "stdio.h"
>+int main( int argc, char *argv[] ) {
>+#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
>+	return 0;
>+#else
>+	return 1;
>+#endif
>+}
>+], have_flac_ver=yes, have_flac_ver=no)
>+		LIBS="$LIBS_SAVED"
>+		AC_MSG_RESULT($have_flac_ver)
>+		if test x$have_flac_ver = xno; then
>+			echo "*** FLAC support has been disabled."
>+		else
>+			AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes])
>+			AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new], [have_flac_lib=yes])
>+			if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then	
>+			    case "$host" in
>+			        *-*-darwin*)
>+			            flac_lib=[`find_lib FLAC*.dylib`]
>+			            ;;
>+			        *-*-cygwin* | *-*-mingw32*)
>+			            flac_lib=[`find_lib "libFLAC*.dll"`]
>+			            ;;
>+			        *)
>+			            flac_lib=[`find_lib "libFLAC.so.[0-9]"`]
>+			            if test x$flac_lib = x; then
>+			                flac_lib=[`find_lib "libFLAC.so.[0-9]*"`]
>+			            fi
>+			            ;;
>+			    esac
>+			    SOURCES="$SOURCES $srcdir/*_flac.c"
>+			    EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
>+			    if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
>+			        echo "-- dynamic libFLAC -> $flac_lib"
>+			        EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
>+			    else
>+			        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC"
>+			    fi
>+			fi
>+		fi
>+	fi
> fi
> AC_ARG_ENABLE(music-mp3,
> [  --enable-music-mp3      enable MP3 music via smpeg [[default=yes]]],

Actions: View | Diff

Attachments on bug 567: 252 | 253

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.