Attachment #2537 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 49-55 OPTION( WITH_LIBLTDL "Build with libltdl" ${WITH_ALL_OPTIONS} ) Link Here

(-)a/CMakeLists.txt (-1 / +1 lines)
49		49
50	OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} )	50	OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} )
51	OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} )	51	OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} )
52	OPTION( WITH_POLYP_SINK "Build with polyp sink" OFF )	52	OPTION( WITH_PULSE_SINK "Build with pulseaudio sink" OFF )
53	OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} )	53	OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} )
54	OPTION( WITH_SUN_SINK "Build with sun sink" OFF )	54	OPTION( WITH_SUN_SINK "Build with sun sink" OFF )
55		55





##### check polyp support #######################

if( WITH_PULSE_SINK )

    pkg_search_module( PULSE libpulse-simple>=0.9.2 )

    if( NOT PULSE_FOUND )
        tde_message_fatal( "libpulse-simple >= 0.9.2 are required, but not found on your system" )
    endif( NOT PULSE_FOUND )

endif( WITH_PULSE_SINK )


##### check sun support #########################

            check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )
            if( HAVE_OGGFLAC_H )
                tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC )
                check_library_exists( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
                tde_restore( CMAKE_REQUIRED_LIBRARIES )
                if( HAVE_LIBOGGFLAC )
                    set( OGGFLAC_LIBRARIES "-lOggFLAC" )
                endif( HAVE_LIBOGGFLAC )
            endif( HAVE_OGGFLAC_H )
        endif( NOT HAVE_LIBFLAC113 )
    endif( FLAC_FOUND )


if( WITH_XIPH_DECODER )

    pkg_search_module( OGG ogg )
    if( NOT OGG_FOUND )
        tde_message_fatal( "ogg are required, but not found on your system" )
    endif( NOT OGG_FOUND )

    pkg_search_module( VORBIS vorbis )
    if( NOT VORBIS_FOUND )
        tde_message_fatal( "ogg/vorbis are required, but not found on your system" )

Lines 1-7 Link Here

(-)a/akode/configure.in.in (-1 / +1 lines)
1	dnl don't remove the below	1	dnl don't remove the below
2	dnl AC_OUTPUT(akode/akode-config)	2	dnl AC_OUTPUT(akode/akode-config)
3		3
4	AM_CONFIG_HEADER(akode/lib/akode_export.h)	4	AC_CONFIG_HEADER(akode/lib/akode_export.h)
5		5
6	AC_DEFUN([AC_CHECK_LIBFLAC],	6	AC_DEFUN([AC_CHECK_LIBFLAC],
7	[	7	[

Lines 15-21 Link Here

(-)a/akode/plugins/CMakeLists.txt (-1 / +1 lines)
15	tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )	15	tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )
16	tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )	16	tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )
17	tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )	17	tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )
18	tde_conditional_add_subdirectory( WITH_POLYP_SINK polyp_sink )	18	tde_conditional_add_subdirectory( WITH_PULSE_SINK polyp_sink )
19	tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )	19	tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )
20		20
21	tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )	21	tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )

Lines 15-21 include_directories( Link Here

(-)a/akode/plugins/polyp_sink/CMakeLists.txt (-2 / +2 lines)
15	${CMAKE_SOURCE_DIR}/akode/lib	15	${CMAKE_SOURCE_DIR}/akode/lib
16	${CMAKE_CURRENT_BINARY_DIR}	16	${CMAKE_CURRENT_BINARY_DIR}
17	${CMAKE_CURRENT_SOURCE_DIR}	17	${CMAKE_CURRENT_SOURCE_DIR}
18	${POLYP_INCLUDE_DIRS}	18	${PULSE_INCLUDE_DIRS}
19	)	19	)
20		20
21		21
Lines 26-32 set( target libakode_polyp_sink ) Link Here
26	tde_add_library(	26	tde_add_library(
27	${target} MODULE	27	${target} MODULE
28	SOURCES polyp_sink.cpp	28	SOURCES polyp_sink.cpp
29	LINK akode-shared ${POLYP_LIBRARIES}	29	LINK akode-shared ${PULSE_LIBRARIES}
30	DESTINATION ${LIB_INSTALL_DIR}	30	DESTINATION ${LIB_INSTALL_DIR}
31	)	31	)
32		32

Lines 1-7 Link Here

(-)a/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)

Lines 25-31 Link Here

(-)a/akode/plugins/polyp_sink/polyp_sink.cpp (-1 / +1 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 38-44 tde_add_library( Link Here

(-)a/akode/plugins/xiph_decoder/CMakeLists.txt (-1 / +1 lines)
38	akode-shared	38	akode-shared
39	${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}	39	${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}
40	${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}	40	${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
41	${SPEEX_LIBRARIES}	41	${SPEEX_LIBRARIES} ${OGG_LIBRARIES}
42	DESTINATION ${LIB_INSTALL_DIR}	42	DESTINATION ${LIB_INSTALL_DIR}
43	)	43	)
44		44

Lines 43-51 Link Here

(-)a/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

Lines 55-61 KDE_CONF_FILES Link Here

(-)a/configure.in.in (-1 / +1 lines)
55		55
56	dnl without this order in this file, automake will be confused!	56	dnl without this order in this file, automake will be confused!
57	dnl	57	dnl
58	AM_CONFIG_HEADER(config.h)	58	AC_CONFIG_HEADER(config.h)
59		59
60	dnl checks for programs.	60	dnl checks for programs.
61	dnl first check for c/c++ compilers	61	dnl first check for c/c++ compilers

Return to bug 791

Lines 118-132 endif( WITH_OSS_SINK ) Link Here

(-)a/ConfigureChecks.cmake (-8 / +13 lines)
118		118
119	##### check polyp support #######################	119	##### check polyp support #######################
120		120
121	if( WITH_POLYP_SINK )	121	if( WITH_PULSE_SINK )
122		122
123	pkg_search_module( POLYP polyplib-simple>=0.70 )	123	pkg_search_module( PULSE libpulse-simple>=0.9.2 )
124		124
125	if( NOT POLYP_FOUND )	125	if( NOT PULSE_FOUND )
126	tde_message_fatal( "polyplib-simple >= 0.70 are required, but not found on your system" )	126	tde_message_fatal( "libpulse-simple >= 0.9.2 are required, but not found on your system" )
127	endif( NOT POLYP_FOUND )	127	endif( NOT PULSE_FOUND )
128		128
129	endif( WITH_POLYP_SINK )	129	endif( WITH_PULSE_SINK )
130		130
131		131
132	##### check sun support #########################	132	##### check sun support #########################
Lines 210-220 if( WITH_XIPH_DECODER ) Link Here
210	check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )	210	check_include_file( "OggFLAC/seekable_stream_decoder.h" HAVE_OGGFLAC_H )
211	if( HAVE_OGGFLAC_H )	211	if( HAVE_OGGFLAC_H )
212	tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC )	212	tde_save_and_set( CMAKE_REQUIRED_LIBRARIES m OggFLAC FLAC )
213	check_library_exits( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )	213	check_library_exists( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
214	tde_restore( CMAKE_REQUIRED_LIBRARIES )	214	tde_restore( CMAKE_REQUIRED_LIBRARIES )
215	if( HAVE_LIBOGGFLAC )	215	if( HAVE_LIBOGGFLAC )
216	set( OGGFLAC_LIBRARIES "-lOggFLAC" )	216	set( OGGFLAC_LIBRARIES "-lOggFLAC" )
217	endif( HAVE_LIBFLAC )	217	endif( HAVE_LIBOGGFLAC )
218	endif( HAVE_OGGFLAC_H )	218	endif( HAVE_OGGFLAC_H )
219	endif( NOT HAVE_LIBFLAC113 )	219	endif( NOT HAVE_LIBFLAC113 )
220	endif( FLAC_FOUND )	220	endif( FLAC_FOUND )
Lines 267-272 endif( WITH_XIPH_DECODER ) Link Here
267		267
268	if( WITH_XIPH_DECODER )	268	if( WITH_XIPH_DECODER )
269		269
		270	pkg_search_module( OGG ogg )
		271	if( NOT OGG_FOUND )
		272	tde_message_fatal( "ogg are required, but not found on your system" )
		273	endif( NOT OGG_FOUND )
		274
270	pkg_search_module( VORBIS vorbis )	275	pkg_search_module( VORBIS vorbis )
271	if( NOT VORBIS_FOUND )	276	if( NOT VORBIS_FOUND )
272	tde_message_fatal( "ogg/vorbis are required, but not found on your system" )	277	tde_message_fatal( "ogg/vorbis are required, but not found on your system" )