Attachment 2537 Details for Bug 791 – akode 14.0.0: update for build issues

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.

[patch] akode 14.0.0: update for build issues

akode-14.0.0.patch (text/plain), 6.66 KB, created by Francois Andriot on 2015-07-26 11:23:09 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2015-07-26 11:23:09 CDT

Size: 6.66 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index f8e2d94..df5b7ea 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -49,7 +49,7 @@ OPTION( WITH_LIBLTDL "Build with libltdl" ${WITH_ALL_OPTIONS} )
> 
> OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_JACK_SINK "Build with jack sink" ${WITH_ALL_OPTIONS} )
>-OPTION( WITH_POLYP_SINK "Build with polyp sink" OFF )
>+OPTION( WITH_PULSE_SINK "Build with pulseaudio sink" OFF )
> OPTION( WITH_OSS_SINK "Build with oss sink" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_SUN_SINK "Build with sun sink" OFF )
> 
>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
>index 1fa37d7..259a804 100644
>--- a/ConfigureChecks.cmake
>+++ b/ConfigureChecks.cmake
>@@ -118,15 +118,15 @@ endif( WITH_OSS_SINK )
> 
> ##### check polyp support #######################
> 
>-if( WITH_POLYP_SINK )
>+if( WITH_PULSE_SINK )
> 
>-    pkg_search_module( POLYP polyplib-simple>=0.70 )
>+    pkg_search_module( PULSE libpulse-simple>=0.9.2 )
> 
>-    if( NOT POLYP_FOUND )
>-        tde_message_fatal( "polyplib-simple >= 0.70 are required, but not found on your system" )
>-    endif( NOT POLYP_FOUND )
>+    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_POLYP_SINK )
>+endif( WITH_PULSE_SINK )
> 
> 
> ##### check sun support #########################
>@@ -210,11 +210,11 @@ if( WITH_XIPH_DECODER )
>             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_exits( OggFLAC OggFLAC__seekable_stream_decoder_process_single "" HAVE_LIBOGGFLAC )
>+                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_LIBFLAC )
>+                endif( HAVE_LIBOGGFLAC )
>             endif( HAVE_OGGFLAC_H )
>         endif( NOT HAVE_LIBFLAC113 )
>     endif( FLAC_FOUND )
>@@ -267,6 +267,11 @@ endif( WITH_XIPH_DECODER )
> 
> 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" )
>diff --git a/akode/configure.in.in b/akode/configure.in.in
>index f18e6c5..80338d5 100644
>--- a/akode/configure.in.in
>+++ b/akode/configure.in.in
>@@ -1,7 +1,7 @@
> dnl don't remove the below
> dnl AC_OUTPUT(akode/akode-config)
> 
>-AM_CONFIG_HEADER(akode/lib/akode_export.h)
>+AC_CONFIG_HEADER(akode/lib/akode_export.h)
> 
> AC_DEFUN([AC_CHECK_LIBFLAC],
> [
>diff --git a/akode/plugins/CMakeLists.txt b/akode/plugins/CMakeLists.txt
>index ce0f3a4..6e11f1a 100644
>--- a/akode/plugins/CMakeLists.txt
>+++ b/akode/plugins/CMakeLists.txt
>@@ -15,7 +15,7 @@
> tde_conditional_add_subdirectory( WITH_ALSA_SINK alsa_sink )
> tde_conditional_add_subdirectory( WITH_JACK_SINK jack_sink )
> tde_conditional_add_subdirectory( WITH_OSS_SINK oss_sink )
>-tde_conditional_add_subdirectory( WITH_POLYP_SINK polyp_sink )
>+tde_conditional_add_subdirectory( WITH_PULSE_SINK polyp_sink )
> tde_conditional_add_subdirectory( WITH_SUN_SINK sun_sink )
> 
> tde_conditional_add_subdirectory( WITH_FFMPEG_DECODER ffmpeg_decoder )
>diff --git a/akode/plugins/polyp_sink/CMakeLists.txt b/akode/plugins/polyp_sink/CMakeLists.txt
>index 90c4f3c..28a940e 100644
>--- a/akode/plugins/polyp_sink/CMakeLists.txt
>+++ b/akode/plugins/polyp_sink/CMakeLists.txt
>@@ -15,7 +15,7 @@ include_directories(
>   ${CMAKE_SOURCE_DIR}/akode/lib
>   ${CMAKE_CURRENT_BINARY_DIR}
>   ${CMAKE_CURRENT_SOURCE_DIR}
>-  ${POLYP_INCLUDE_DIRS}
>+  ${PULSE_INCLUDE_DIRS}
> )
> 
> 
>@@ -26,7 +26,7 @@ set( target libakode_polyp_sink )
> tde_add_library(
>   ${target} MODULE
>   SOURCES polyp_sink.cpp
>-  LINK akode-shared ${POLYP_LIBRARIES}
>+  LINK akode-shared ${PULSE_LIBRARIES}
>   DESTINATION ${LIB_INSTALL_DIR}
> )
> 
>diff --git a/akode/plugins/polyp_sink/Makefile.am b/akode/plugins/polyp_sink/Makefile.am
>index b67602a..a58b04c 100644
>--- a/akode/plugins/polyp_sink/Makefile.am
>+++ b/akode/plugins/polyp_sink/Makefile.am
>@@ -1,7 +1,7 @@
>-INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes)
>+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 $(POLYP_LDFLAGS)
>-libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD)
>+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS)
>+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD)
>diff --git a/akode/plugins/polyp_sink/polyp_sink.cpp b/akode/plugins/polyp_sink/polyp_sink.cpp
>index 9376dac..75eee67 100644
>--- a/akode/plugins/polyp_sink/polyp_sink.cpp
>+++ b/akode/plugins/polyp_sink/polyp_sink.cpp
>@@ -25,7 +25,7 @@
> #elif defined(HAVE_INTTYPES_H)
> #include <inttypes.h>
> #endif
>-#include <polyp/polyplib-simple.h>
>+#include <pulse/simple.h>
> 
> #include "audioframe.h"
> #include "audiobuffer.h"
>diff --git a/akode/plugins/xiph_decoder/CMakeLists.txt b/akode/plugins/xiph_decoder/CMakeLists.txt
>index a0d1f28..4e6693b 100644
>--- a/akode/plugins/xiph_decoder/CMakeLists.txt
>+++ b/akode/plugins/xiph_decoder/CMakeLists.txt
>@@ -38,7 +38,7 @@ tde_add_library(
>     akode-shared
>     ${FLAC_LIBRARIES} ${OGGFLAC_LIBRARIES}
>     ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES}
>-    ${SPEEX_LIBRARIES}
>+    ${SPEEX_LIBRARIES} ${OGG_LIBRARIES}
>   DESTINATION ${LIB_INSTALL_DIR}
> )
> 
>diff --git a/config.h.in b/config.h.in
>index 7fe6faf..eed77f8 100644
>--- a/config.h.in
>+++ b/config.h.in
>@@ -43,9 +43,9 @@
> /* Define if you have libOggFLAC (required for loading OggFLAC files) */
> #undef HAVE_LIBOGGFLAC
> 
>-/* Define if you have polyplib (required if you want Polypaudio server
>+/* Define if you have libpulse (required if you want PulseAudio server
>    support) */
>-#undef HAVE_LIBPOLYP
>+#undef HAVE_LIBPULSE
> 
> /* defined if you have libsamplerate library and header */
> #undef HAVE_LIBSAMPLERATE
>diff --git a/configure.in.in b/configure.in.in
>index a6fae9f..0eaed3d 100644
>--- a/configure.in.in
>+++ b/configure.in.in
>@@ -55,7 +55,7 @@ KDE_CONF_FILES
> 
> dnl without this order in this file, automake will be confused!
> dnl
>-AM_CONFIG_HEADER(config.h)
>+AC_CONFIG_HEADER(config.h)
> 
> dnl checks for programs.
> dnl first check for c/c++ compilers

Actions: View | Diff

Attachments on bug 791: 734 | 735 | 736 | 737 | 738 | 1415 | 2537