media-sound/gejengel/files/0.1.4-flac_ln.patch

   1 Fixes Bug #542708
   2 The code uses functionality provided by libFLAC and libFLAC++ but only linked against libFLAC++.
   3 Included also is a check for libFLAC availability and added linking against libFLAC
   4 --- a/gejengel-0.1.4/configure.ac
   5 +++ b/gejengel-0.1.4/configure.ac
   6 @@ -129,14 +129,20 @@ AC_ARG_ENABLE(flac,
   7      [ enable_flac=$enableval ] )
   8
   9  if test "$enable_flac" != "no"; then
  10 -    PKG_CHECK_MODULES(FLAC, flac++, HAVE_FLAC=yes, HAVE_FLAC=no)
  11 +    PKG_CHECK_MODULES(FLAC, flac, HAVE_FLAC=yes, HAVE_FLAC=no)
  12      if test $HAVE_FLAC = yes; then
  13 -        AC_DEFINE(HAVE_FLAC, [1], Flac support enabled)
  14 -        AC_SUBST(FLAC_CFLAGS)
  15 -        AC_SUBST(FLAC_LIBS)
  16 +       AC_DEFINE(HAVE_FLAC, [1], Flac found)
  17 +       AC_SUBST(FLAC_CFLAGS)
  18 +       AC_SUBST(FLAC_LIBS)
  19 +        PKG_CHECK_MODULES(FLACPP, flac++, HAVE_FLACPP=yes, HAVE_FLACPP=no)
  20 +        if test $HAVE_FLACPP = yes; then
  21 +            AC_DEFINE(HAVE_FLACPP, [1], Flac support enabled)
  22 +            AC_SUBST(FLACPP_CFLAGS)
  23 +            AC_SUBST(FLACPP_LIBS)
  24 +        fi
  25      fi
  26  fi
  27 -AM_CONDITIONAL(FLAC, test "$HAVE_FLAC" = "yes")
  28 +AM_CONDITIONAL(FLAC, test "$HAVE_FLACPP" = "yes")
  29
  30  ########################################################################
  31  # Mad
  32 --- a/gejengel-0.1.4/Makefile.am
  33 +++ b/gejengel-0.1.4/Makefile.am
  34 @@ -256,7 +256,7 @@ libgejengel_la_LIBADD = libutils.la \
  35                          libmusiclibrary.la \
  36                          libcore.la \
  37                          libplugins.la -lpthread \
  38 -                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
  39 +                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLACPP_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
  40
  41  bin_PROGRAMS = gejengel
  42