Attachment #734 for bug #791

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 791
Collapse All | Expand All

Lines 169-177 Link Here

(-)akode-2.0.1.orig/Makefile.in (-3 / +3 lines)
169	PACKAGE_VERSION = @PACKAGE_VERSION@	169	PACKAGE_VERSION = @PACKAGE_VERSION@
170	PATH_SEPARATOR = @PATH_SEPARATOR@	170	PATH_SEPARATOR = @PATH_SEPARATOR@
171	PKG_CONFIG = @PKG_CONFIG@	171	PKG_CONFIG = @PKG_CONFIG@
172	POLYP_CFLAGS = @POLYP_CFLAGS@	172	PULSE_CFLAGS = @PULSE_CFLAGS@
173	POLYP_LDFLAGS = @POLYP_LDFLAGS@	173	PULSE_LDFLAGS = @PULSE_LDFLAGS@
174	POLYP_LIBADD = @POLYP_LIBADD@	174	PULSE_LIBADD = @PULSE_LIBADD@
175	RANLIB = @RANLIB@	175	RANLIB = @RANLIB@
176	SET_MAKE = @SET_MAKE@	176	SET_MAKE = @SET_MAKE@
177	SHELL = @SHELL@	177	SHELL = @SHELL@

Lines 158-166 Link Here

(-)akode-2.0.1.orig/akode/Makefile.in (-3 / +3 lines)
158	PACKAGE_VERSION = @PACKAGE_VERSION@	158	PACKAGE_VERSION = @PACKAGE_VERSION@
159	PATH_SEPARATOR = @PATH_SEPARATOR@	159	PATH_SEPARATOR = @PATH_SEPARATOR@
160	PKG_CONFIG = @PKG_CONFIG@	160	PKG_CONFIG = @PKG_CONFIG@
161	POLYP_CFLAGS = @POLYP_CFLAGS@	161	PULSE_CFLAGS = @PULSE_CFLAGS@
162	POLYP_LDFLAGS = @POLYP_LDFLAGS@	162	PULSE_LDFLAGS = @PULSE_LDFLAGS@
163	POLYP_LIBADD = @POLYP_LIBADD@	163	PULSE_LIBADD = @PULSE_LIBADD@
164	RANLIB = @RANLIB@	164	RANLIB = @RANLIB@
165	SET_MAKE = @SET_MAKE@	165	SET_MAKE = @SET_MAKE@
166	SHELL = @SHELL@	166	SHELL = @SHELL@

Lines 170-178 Link Here

(-)akode-2.0.1.orig/akode/akodeplay/Makefile.in (-3 / +3 lines)
170	PACKAGE_VERSION = @PACKAGE_VERSION@	170	PACKAGE_VERSION = @PACKAGE_VERSION@
171	PATH_SEPARATOR = @PATH_SEPARATOR@	171	PATH_SEPARATOR = @PATH_SEPARATOR@
172	PKG_CONFIG = @PKG_CONFIG@	172	PKG_CONFIG = @PKG_CONFIG@
173	POLYP_CFLAGS = @POLYP_CFLAGS@	173	PULSE_CFLAGS = @PULSE_CFLAGS@
174	POLYP_LDFLAGS = @POLYP_LDFLAGS@	174	PULSE_LDFLAGS = @PULSE_LDFLAGS@
175	POLYP_LIBADD = @POLYP_LIBADD@	175	PULSE_LIBADD = @PULSE_LIBADD@
176	RANLIB = @RANLIB@	176	RANLIB = @RANLIB@
177	SET_MAKE = @SET_MAKE@	177	SET_MAKE = @SET_MAKE@
178	SHELL = @SHELL@	178	SHELL = @SHELL@




AC_SUBST(JACK_LDFLAGS)
fi

AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])

if test "x$pulseaudio_test" = "xyes" ; then
AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
  PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
  PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
  PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
  have_pulse=yes
  AC_MSG_RESULT(yes)
  AC_DEFINE(HAVE_LIBPULSE, 1,
        [Define if you have libpulse (required if you want PulseAudio server support)])
else
  AC_MSG_RESULT(not installed)
fi
AC_SUBST(PULSE_CFLAGS)
AC_SUBST(PULSE_LIBADD)
AC_SUBST(PULSE_LDFLAGS)
fi

AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])

AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)

AC_MSG_CHECKING(for compilable aKode)

Lines 194-202 Link Here

(-)akode-2.0.1.orig/akode/lib/Makefile.in (-3 / +3 lines)
194	PACKAGE_VERSION = @PACKAGE_VERSION@	194	PACKAGE_VERSION = @PACKAGE_VERSION@
195	PATH_SEPARATOR = @PATH_SEPARATOR@	195	PATH_SEPARATOR = @PATH_SEPARATOR@
196	PKG_CONFIG = @PKG_CONFIG@	196	PKG_CONFIG = @PKG_CONFIG@
197	POLYP_CFLAGS = @POLYP_CFLAGS@	197	PULSE_CFLAGS = @PULSE_CFLAGS@
198	POLYP_LDFLAGS = @POLYP_LDFLAGS@	198	PULSE_LDFLAGS = @PULSE_LDFLAGS@
199	POLYP_LIBADD = @POLYP_LIBADD@	199	PULSE_LIBADD = @PULSE_LIBADD@
200	RANLIB = @RANLIB@	200	RANLIB = @RANLIB@
201	SET_MAKE = @SET_MAKE@	201	SET_MAKE = @SET_MAKE@
202	SHELL = @SHELL@	202	SHELL = @SHELL@




PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PULSE_CFLAGS = @PULSE_CFLAGS@
PULSE_LDFLAGS = @PULSE_LDFLAGS@
PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@

@include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
@include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink
@include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
         $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
         $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
         $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
         $(AKODE_SRC_RESAMPLER)

#>- all: all-recursive

Lines 177-185 Link Here

(-)akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in (-3 / +3 lines)
177	PACKAGE_VERSION = @PACKAGE_VERSION@	177	PACKAGE_VERSION = @PACKAGE_VERSION@
178	PATH_SEPARATOR = @PATH_SEPARATOR@	178	PATH_SEPARATOR = @PATH_SEPARATOR@
179	PKG_CONFIG = @PKG_CONFIG@	179	PKG_CONFIG = @PKG_CONFIG@
180	POLYP_CFLAGS = @POLYP_CFLAGS@	180	PULSE_CFLAGS = @PULSE_CFLAGS@
181	POLYP_LDFLAGS = @POLYP_LDFLAGS@	181	PULSE_LDFLAGS = @PULSE_LDFLAGS@
182	POLYP_LIBADD = @POLYP_LIBADD@	182	PULSE_LIBADD = @PULSE_LIBADD@
183	RANLIB = @RANLIB@	183	RANLIB = @RANLIB@
184	SET_MAKE = @SET_MAKE@	184	SET_MAKE = @SET_MAKE@
185	SHELL = @SHELL@	185	SHELL = @SHELL@

Lines 178-186 Link Here

(-)akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in (-3 / +3 lines)
178	PACKAGE_VERSION = @PACKAGE_VERSION@	178	PACKAGE_VERSION = @PACKAGE_VERSION@
179	PATH_SEPARATOR = @PATH_SEPARATOR@	179	PATH_SEPARATOR = @PATH_SEPARATOR@
180	PKG_CONFIG = @PKG_CONFIG@	180	PKG_CONFIG = @PKG_CONFIG@
181	POLYP_CFLAGS = @POLYP_CFLAGS@	181	PULSE_CFLAGS = @PULSE_CFLAGS@
182	POLYP_LDFLAGS = @POLYP_LDFLAGS@	182	PULSE_LDFLAGS = @PULSE_LDFLAGS@
183	POLYP_LIBADD = @POLYP_LIBADD@	183	PULSE_LIBADD = @PULSE_LIBADD@
184	RANLIB = @RANLIB@	184	RANLIB = @RANLIB@
185	SET_MAKE = @SET_MAKE@	185	SET_MAKE = @SET_MAKE@
186	SHELL = @SHELL@	186	SHELL = @SHELL@

Lines 177-185 Link Here

(-)akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in (-3 / +3 lines)
177	PACKAGE_VERSION = @PACKAGE_VERSION@	177	PACKAGE_VERSION = @PACKAGE_VERSION@
178	PATH_SEPARATOR = @PATH_SEPARATOR@	178	PATH_SEPARATOR = @PATH_SEPARATOR@
179	PKG_CONFIG = @PKG_CONFIG@	179	PKG_CONFIG = @PKG_CONFIG@
180	POLYP_CFLAGS = @POLYP_CFLAGS@	180	PULSE_CFLAGS = @PULSE_CFLAGS@
181	POLYP_LDFLAGS = @POLYP_LDFLAGS@	181	PULSE_LDFLAGS = @PULSE_LDFLAGS@
182	POLYP_LIBADD = @POLYP_LIBADD@	182	PULSE_LIBADD = @PULSE_LIBADD@
183	RANLIB = @RANLIB@	183	RANLIB = @RANLIB@
184	SET_MAKE = @SET_MAKE@	184	SET_MAKE = @SET_MAKE@
185	SHELL = @SHELL@	185	SHELL = @SHELL@

Lines 191-199 Link Here

(-)akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in (-3 / +3 lines)
191	PACKAGE_VERSION = @PACKAGE_VERSION@	191	PACKAGE_VERSION = @PACKAGE_VERSION@
192	PATH_SEPARATOR = @PATH_SEPARATOR@	192	PATH_SEPARATOR = @PATH_SEPARATOR@
193	PKG_CONFIG = @PKG_CONFIG@	193	PKG_CONFIG = @PKG_CONFIG@
194	POLYP_CFLAGS = @POLYP_CFLAGS@	194	PULSE_CFLAGS = @PULSE_CFLAGS@
195	POLYP_LDFLAGS = @POLYP_LDFLAGS@	195	PULSE_LDFLAGS = @PULSE_LDFLAGS@
196	POLYP_LIBADD = @POLYP_LIBADD@	196	PULSE_LIBADD = @PULSE_LIBADD@
197	RANLIB = @RANLIB@	197	RANLIB = @RANLIB@
198	SET_MAKE = @SET_MAKE@	198	SET_MAKE = @SET_MAKE@
199	SHELL = @SHELL@	199	SHELL = @SHELL@

Lines 169-177 Link Here

(-)akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in (-3 / +3 lines)
169	PACKAGE_VERSION = @PACKAGE_VERSION@	169	PACKAGE_VERSION = @PACKAGE_VERSION@
170	PATH_SEPARATOR = @PATH_SEPARATOR@	170	PATH_SEPARATOR = @PATH_SEPARATOR@
171	PKG_CONFIG = @PKG_CONFIG@	171	PKG_CONFIG = @PKG_CONFIG@
172	POLYP_CFLAGS = @POLYP_CFLAGS@	172	PULSE_CFLAGS = @PULSE_CFLAGS@
173	POLYP_LDFLAGS = @POLYP_LDFLAGS@	173	PULSE_LDFLAGS = @PULSE_LDFLAGS@
174	POLYP_LIBADD = @POLYP_LIBADD@	174	PULSE_LIBADD = @PULSE_LIBADD@
175	RANLIB = @RANLIB@	175	RANLIB = @RANLIB@
176	SET_MAKE = @SET_MAKE@	176	SET_MAKE = @SET_MAKE@
177	SHELL = @SHELL@	177	SHELL = @SHELL@

Lines 178-186 Link Here

(-)akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in (-3 / +3 lines)
178	PACKAGE_VERSION = @PACKAGE_VERSION@	178	PACKAGE_VERSION = @PACKAGE_VERSION@
179	PATH_SEPARATOR = @PATH_SEPARATOR@	179	PATH_SEPARATOR = @PATH_SEPARATOR@
180	PKG_CONFIG = @PKG_CONFIG@	180	PKG_CONFIG = @PKG_CONFIG@
181	POLYP_CFLAGS = @POLYP_CFLAGS@	181	PULSE_CFLAGS = @PULSE_CFLAGS@
182	POLYP_LDFLAGS = @POLYP_LDFLAGS@	182	PULSE_LDFLAGS = @PULSE_LDFLAGS@
183	POLYP_LIBADD = @POLYP_LIBADD@	183	PULSE_LIBADD = @PULSE_LIBADD@
184	RANLIB = @RANLIB@	184	RANLIB = @RANLIB@
185	SET_MAKE = @SET_MAKE@	185	SET_MAKE = @SET_MAKE@
186	SHELL = @SHELL@	186	SHELL = @SHELL@

Lines 177-185 Link Here

(-)akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in (-3 / +3 lines)
177	PACKAGE_VERSION = @PACKAGE_VERSION@	177	PACKAGE_VERSION = @PACKAGE_VERSION@
178	PATH_SEPARATOR = @PATH_SEPARATOR@	178	PATH_SEPARATOR = @PATH_SEPARATOR@
179	PKG_CONFIG = @PKG_CONFIG@	179	PKG_CONFIG = @PKG_CONFIG@
180	POLYP_CFLAGS = @POLYP_CFLAGS@	180	PULSE_CFLAGS = @PULSE_CFLAGS@
181	POLYP_LDFLAGS = @POLYP_LDFLAGS@	181	PULSE_LDFLAGS = @PULSE_LDFLAGS@
182	POLYP_LIBADD = @POLYP_LIBADD@	182	PULSE_LIBADD = @PULSE_LIBADD@
183	RANLIB = @RANLIB@	183	RANLIB = @RANLIB@
184	SET_MAKE = @SET_MAKE@	184	SET_MAKE = @SET_MAKE@
185	SHELL = @SHELL@	185	SHELL = @SHELL@

Lines 1-7 Link Here

(-)akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am (-3 / +3 lines)
1	INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)	1	INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
2		2
3	lib_LTLIBRARIES = libakode_polyp_sink.la	3	lib_LTLIBRARIES = libakode_polyp_sink.la
4		4
5	libakode_polyp_sink_la_SOURCES = polyp_sink.cpp	5	libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
6	libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS)	6	libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
7	libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)	7	libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)




PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PULSE_CFLAGS = @PULSE_CFLAGS@
PULSE_LDFLAGS = @PULSE_LDFLAGS@
PULSE_LIBADD = @PULSE_LIBADD@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@

target_vendor = @target_vendor@
unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes)
lib_LTLIBRARIES = libakode_polyp_sink.la
libakode_polyp_sink_la_SOURCES = polyp_sink.cpp
#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
#>+ 1
libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS)
libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
#>- all: all-am
#>+ 1
all: docs-am  all-am

Lines 25-31 Link Here

(-)akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp (-2 / +2 lines)
25	#elif defined(HAVE_INTTYPES_H)	25	#elif defined(HAVE_INTTYPES_H)
26	#include <inttypes.h>	26	#include <inttypes.h>
27	#endif	27	#endif
28	#include <polyp/polyplib-simple.h>	28	#include <pulse/simple.h>
29		29
30	#include "audioframe.h"	30	#include "audioframe.h"
31	#include "audiobuffer.h"	31	#include "audiobuffer.h"
Lines 59-65 Link Here
59		59
60	bool PolypSink::open() {	60	bool PolypSink::open() {
61	int error = 0;	61	int error = 0;
62	m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error );	62	m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error );
63	if (!m_data->server \|\| error != 0) {	63	if (!m_data->server \|\| error != 0) {
64	m_data->error = true;	64	m_data->error = true;
65	close();	65	close();

Lines 178-186 Link Here

(-)akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in (-3 / +3 lines)
178	PACKAGE_VERSION = @PACKAGE_VERSION@	178	PACKAGE_VERSION = @PACKAGE_VERSION@
179	PATH_SEPARATOR = @PATH_SEPARATOR@	179	PATH_SEPARATOR = @PATH_SEPARATOR@
180	PKG_CONFIG = @PKG_CONFIG@	180	PKG_CONFIG = @PKG_CONFIG@
181	POLYP_CFLAGS = @POLYP_CFLAGS@	181	PULSE_CFLAGS = @PULSE_CFLAGS@
182	POLYP_LDFLAGS = @POLYP_LDFLAGS@	182	PULSE_LDFLAGS = @PULSE_LDFLAGS@
183	POLYP_LIBADD = @POLYP_LIBADD@	183	PULSE_LIBADD = @PULSE_LIBADD@
184	RANLIB = @RANLIB@	184	RANLIB = @RANLIB@
185	SET_MAKE = @SET_MAKE@	185	SET_MAKE = @SET_MAKE@
186	SHELL = @SHELL@	186	SHELL = @SHELL@

Lines 175-183 Link Here

(-)akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in (-3 / +3 lines)
175	PACKAGE_VERSION = @PACKAGE_VERSION@	175	PACKAGE_VERSION = @PACKAGE_VERSION@
176	PATH_SEPARATOR = @PATH_SEPARATOR@	176	PATH_SEPARATOR = @PATH_SEPARATOR@
177	PKG_CONFIG = @PKG_CONFIG@	177	PKG_CONFIG = @PKG_CONFIG@
178	POLYP_CFLAGS = @POLYP_CFLAGS@	178	PULSE_CFLAGS = @PULSE_CFLAGS@
179	POLYP_LDFLAGS = @POLYP_LDFLAGS@	179	PULSE_LDFLAGS = @PULSE_LDFLAGS@
180	POLYP_LIBADD = @POLYP_LIBADD@	180	PULSE_LIBADD = @PULSE_LIBADD@
181	RANLIB = @RANLIB@	181	RANLIB = @RANLIB@
182	SET_MAKE = @SET_MAKE@	182	SET_MAKE = @SET_MAKE@
183	SHELL = @SHELL@	183	SHELL = @SHELL@

Lines 185-193 Link Here

(-)akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in (-3 / +3 lines)
185	PACKAGE_VERSION = @PACKAGE_VERSION@	185	PACKAGE_VERSION = @PACKAGE_VERSION@
186	PATH_SEPARATOR = @PATH_SEPARATOR@	186	PATH_SEPARATOR = @PATH_SEPARATOR@
187	PKG_CONFIG = @PKG_CONFIG@	187	PKG_CONFIG = @PKG_CONFIG@
188	POLYP_CFLAGS = @POLYP_CFLAGS@	188	PULSE_CFLAGS = @PULSE_CFLAGS@
189	POLYP_LDFLAGS = @POLYP_LDFLAGS@	189	PULSE_LDFLAGS = @PULSE_LDFLAGS@
190	POLYP_LIBADD = @POLYP_LIBADD@	190	PULSE_LIBADD = @PULSE_LIBADD@
191	RANLIB = @RANLIB@	191	RANLIB = @RANLIB@
192	SET_MAKE = @SET_MAKE@	192	SET_MAKE = @SET_MAKE@
193	SHELL = @SHELL@	193	SHELL = @SHELL@

Lines 43-51 Link Here

(-)akode-2.0.1.orig/config.h.in (-2 / +2 lines)
43	/* Define if you have libOggFLAC (required for loading OggFLAC files) */	43	/* Define if you have libOggFLAC (required for loading OggFLAC files) */
44	#undef HAVE_LIBOGGFLAC	44	#undef HAVE_LIBOGGFLAC
45		45
46	/* Define if you have polyplib (required if you want Polypaudio server	46	/* Define if you have libpulse (required if you want PulseAudio server
47	support) */	47	support) */
48	#undef HAVE_LIBPOLYP	48	#undef HAVE_LIBPULSE
49		49
50	/* defined if you have libsamplerate library and header */	50	/* defined if you have libsamplerate library and header */
51	#undef HAVE_LIBSAMPLERATE	51	#undef HAVE_LIBSAMPLERATE




AC_SUBST(JACK_LDFLAGS)
fi

AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])

if test "x$pulseaudio_test" = "xyes" ; then
AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
  PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
  PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
  PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
  have_pulse=yes
  AC_MSG_RESULT(yes)
  AC_DEFINE(HAVE_LIBPULSE, 1,
        [Define if you have libpulse (required if you want PulseAudio server support)])
else
  AC_MSG_RESULT(not installed)
fi
AC_SUBST(PULSE_CFLAGS)
AC_SUBST(PULSE_LIBADD)
AC_SUBST(PULSE_LDFLAGS)
fi

AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])

AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)

AC_MSG_CHECKING(for compilable aKode)

Return to bug 791

Lines 270-293 Link Here

(-)akode-2.0.2/akode/configure.in.in.pulseaudio (-14 / +14 lines)
270	AC_SUBST(JACK_LDFLAGS)	270	AC_SUBST(JACK_LDFLAGS)
271	fi	271	fi
272		272
273	AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])	273	AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
274		274
275	if test "x$polypaudio_test" = "xyes" ; then	275	if test "x$pulseaudio_test" = "xyes" ; then
276	AC_MSG_CHECKING(for Polypaudio 0.7 or later)	276	AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
277	if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then	277	if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
278	POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"	278	PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
279	POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"	279	PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
280	POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"	280	PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
281	have_polyp=yes	281	have_pulse=yes
282	AC_MSG_RESULT(yes)	282	AC_MSG_RESULT(yes)
283	AC_DEFINE(HAVE_LIBPOLYP, 1,	283	AC_DEFINE(HAVE_LIBPULSE, 1,
284	[Define if you have polyplib (required if you want Polypaudio server support)])	284	[Define if you have libpulse (required if you want PulseAudio server support)])
285	else	285	else
286	AC_MSG_RESULT(not installed)	286	AC_MSG_RESULT(not installed)
287	fi	287	fi
288	AC_SUBST(POLYP_CFLAGS)	288	AC_SUBST(PULSE_CFLAGS)
289	AC_SUBST(POLYP_LIBADD)	289	AC_SUBST(PULSE_LIBADD)
290	AC_SUBST(POLYP_LDFLAGS)	290	AC_SUBST(PULSE_LDFLAGS)
291	fi	291	fi
292		292
293	AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])	293	AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
Lines 482-488 Link Here
482	AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)	482	AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
483	AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)	483	AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
484	AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)	484	AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
485	AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)	485	AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
486	AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)	486	AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
487		487
488	AC_MSG_CHECKING(for compilable aKode)	488	AC_MSG_CHECKING(for compilable aKode)

Lines 375-398 Link Here

(-)akode-2.0.2/configure.in.pulseaudio (-14 / +14 lines)
375	AC_SUBST(JACK_LDFLAGS)	375	AC_SUBST(JACK_LDFLAGS)
376	fi	376	fi
377		377
378	AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"])	378	AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"])
379		379
380	if test "x$polypaudio_test" = "xyes" ; then	380	if test "x$pulseaudio_test" = "xyes" ; then
381	AC_MSG_CHECKING(for Polypaudio 0.7 or later)	381	AC_MSG_CHECKING(for PulseAudio 0.9.2 or later)
382	if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then	382	if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then
383	POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`"	383	PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`"
384	POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`"	384	PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`"
385	POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`"	385	PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`"
386	have_polyp=yes	386	have_pulse=yes
387	AC_MSG_RESULT(yes)	387	AC_MSG_RESULT(yes)
388	AC_DEFINE(HAVE_LIBPOLYP, 1,	388	AC_DEFINE(HAVE_LIBPULSE, 1,
389	[Define if you have polyplib (required if you want Polypaudio server support)])	389	[Define if you have libpulse (required if you want PulseAudio server support)])
390	else	390	else
391	AC_MSG_RESULT(not installed)	391	AC_MSG_RESULT(not installed)
392	fi	392	fi
393	AC_SUBST(POLYP_CFLAGS)	393	AC_SUBST(PULSE_CFLAGS)
394	AC_SUBST(POLYP_LIBADD)	394	AC_SUBST(PULSE_LIBADD)
395	AC_SUBST(POLYP_LDFLAGS)	395	AC_SUBST(PULSE_LDFLAGS)
396	fi	396	fi
397		397
398	AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])	398	AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"])
Lines 587-593 Link Here
587	AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)	587	AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes)
588	AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)	588	AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes)
589	AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)	589	AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes)
590	AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes)	590	AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes)
591	AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)	591	AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes)
592		592
593	AC_MSG_CHECKING(for compilable aKode)	593	AC_MSG_CHECKING(for compilable aKode)

Lines 154-162 Link Here

(-)akode-2.0.1.orig/akode/plugins/Makefile.in (-5 / +5 lines)
154	PACKAGE_VERSION = @PACKAGE_VERSION@	154	PACKAGE_VERSION = @PACKAGE_VERSION@
155	PATH_SEPARATOR = @PATH_SEPARATOR@	155	PATH_SEPARATOR = @PATH_SEPARATOR@
156	PKG_CONFIG = @PKG_CONFIG@	156	PKG_CONFIG = @PKG_CONFIG@
157	POLYP_CFLAGS = @POLYP_CFLAGS@	157	PULSE_CFLAGS = @PULSE_CFLAGS@
158	POLYP_LDFLAGS = @POLYP_LDFLAGS@	158	PULSE_LDFLAGS = @PULSE_LDFLAGS@
159	POLYP_LIBADD = @POLYP_LIBADD@	159	PULSE_LIBADD = @PULSE_LIBADD@
160	RANLIB = @RANLIB@	160	RANLIB = @RANLIB@
161	SET_MAKE = @SET_MAKE@	161	SET_MAKE = @SET_MAKE@
162	SHELL = @SHELL@	162	SHELL = @SHELL@
Lines 251-261 Link Here
251	@include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink	251	@include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
252	@include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink	252	@include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink
253	@include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink	253	@include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
254	@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink	254	@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink
255	SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \	255	SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \
256	$(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \	256	$(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \
257	$(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \	257	$(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
258	$(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \	258	$(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \
259	$(AKODE_SRC_RESAMPLER)	259	$(AKODE_SRC_RESAMPLER)
260		260
261	#>- all: all-recursive	261	#>- all: all-recursive