diff options
Diffstat (limited to 'audio/zinf/files/patch-aa')
| -rw-r--r-- | audio/zinf/files/patch-aa | 60 |
1 files changed, 26 insertions, 34 deletions
diff --git a/audio/zinf/files/patch-aa b/audio/zinf/files/patch-aa index a3a07f1f1ede..28a4b23f0574 100644 --- a/audio/zinf/files/patch-aa +++ b/audio/zinf/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.in.orig Sat Oct 12 02:57:17 2002 -+++ configure.in Thu Oct 17 09:56:22 2002 -@@ -170,8 +170,8 @@ +--- configure.in.orig Wed Jan 1 08:37:26 2003 ++++ configure.in Sat Jan 11 04:37:46 2003 +@@ -172,8 +172,8 @@ ;; freebsd*) host_os="freebsd" @@ -11,18 +11,19 @@ ;; netbsd*) host_os="freebsd" -@@ -323,8 +323,10 @@ +@@ -324,9 +324,9 @@ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - ac_save_CFLAGS="$CFLAGS" +- ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $ESD_CFLAGS" +- CFLAGS="$CFLAGS $ESD_CFLAGS" + CPPFLAGS="$CPPFLAGS $ESD_CFLAGS" LIBS="$LIBS $ESD_LIBS" rm -f conf.esdtest AC_MSG_CHECKING(for ESD - version >= $min_esd_version) -@@ -383,7 +385,7 @@ +@@ -385,7 +385,7 @@ } ],, have_esound=false, have_esound=false) @@ -31,16 +32,7 @@ LIBS="$ac_save_LIBS" AC_LANG_RESTORE rm -f conf.esdtest -@@ -410,7 +412,7 @@ - - dnl optional freetype support.. - save_CPPFLAGS="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" -+CPPFLAGS="$CPPFLAGS" - AC_LANG_SAVE - AC_LANG_C - AC_CHECK_HEADERS(freetype.h, have_freetype="true", have_freetype="false") -@@ -460,9 +462,9 @@ +@@ -474,9 +474,9 @@ gtk_config_major=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` gtk_config_minor=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` gtk_config_micro=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` @@ -52,7 +44,7 @@ LIBS="$GTK_LIBS $LIBS" AC_TRY_RUN([ -@@ -489,7 +491,7 @@ +@@ -503,7 +503,7 @@ gtk_major_version, gtk_minor_version, gtk_micro_version); return 1; }], , have_gtk=false, have_gtk=false]) @@ -61,7 +53,7 @@ LIBS="$ac_save_LIBS" if test "$have_gtk" = "false"; then AC_MSG_RESULT(no) -@@ -510,7 +512,7 @@ +@@ -524,7 +524,7 @@ OSINC="$OSINC -I$srcdir/ui/download/unix/include" OSINC="$OSINC -I$srcdir/ui/musicbrowser/include" OSINC="$OSINC -I$srcdir/ftc/kjofol" @@ -70,7 +62,7 @@ AC_DEFINE(HAVE_GTK) else GTK_CFLAGS="" -@@ -531,18 +533,10 @@ +@@ -545,18 +545,10 @@ AC_SUBST(GTK_PREFIX) AC_SUBST(EXTRALIBS) @@ -91,16 +83,16 @@ ORBIT_LIBS="" ORBIT_IDL="" -@@ -652,7 +646,7 @@ +@@ -680,7 +672,7 @@ alsa_min_major_version=0 - alsa_min_minor_version=5 + alsa_min_minor_version=9 alsa_min_micro_version=0 - ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LIBS="$LIBS" LIBS="$LIBS -lasound" -@@ -697,7 +691,7 @@ +@@ -725,7 +717,7 @@ ], , have_alsa=false, have_alsa=false ) AC_LANG_RESTORE @@ -109,7 +101,7 @@ LIBS="$ac_save_LIBS" if test "$have_alsa" = "false"; then AC_MSG_RESULT(no) -@@ -717,6 +711,9 @@ +@@ -745,6 +737,9 @@ AC_MSG_RESULT([compiling alsa pmo plugin]) fi @@ -119,15 +111,15 @@ AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",) AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg) -@@ -727,6 +724,7 @@ - OSDEPPLUGINS="$OSDEPPLUGINS plugins/vorbis.mdf"; +@@ -756,6 +751,7 @@ AC_MSG_RESULT([compiling vorbis codec plugin]) fi -+fi fi ++fi ID3_LIBS="" -@@ -747,7 +745,7 @@ + AC_CHECK_LIB(z, uncompress, +@@ -775,7 +771,7 @@ if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then : # arts isn't installed else @@ -136,7 +128,7 @@ AC_TRY_COMPILE([ #include <artsc.h> ],[ -@@ -814,9 +812,9 @@ +@@ -842,9 +838,9 @@ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_gdk_pixbuftest" = "xyes" ; then @@ -148,7 +140,7 @@ LIBS="$LIBS $GDK_PIXBUF_LIBS" dnl dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity -@@ -878,7 +876,7 @@ +@@ -906,7 +902,7 @@ } ],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) @@ -157,7 +149,7 @@ LIBS="$ac_save_LIBS" fi fi -@@ -897,7 +895,7 @@ +@@ -925,7 +921,7 @@ : else echo "*** Could not run GDK_PIXBUF test program, checking why..." @@ -166,7 +158,7 @@ LIBS="$LIBS $GDK_PIXBUF_LIBS" AC_TRY_LINK([ #include <stdio.h> -@@ -916,7 +914,7 @@ +@@ -944,7 +940,7 @@ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) @@ -175,7 +167,7 @@ LIBS="$ac_save_LIBS" fi fi -@@ -928,8 +926,8 @@ +@@ -956,8 +952,8 @@ AC_SUBST(GDK_PIXBUF_LIBS) rm -f conf.gdk_pixbuftest @@ -186,7 +178,7 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS -@@ -939,7 +937,7 @@ +@@ -967,7 +963,7 @@ echo "*** Download the library from " echo "*** http://www.musicbrainz.org/download.html" echo "***" |