diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-11-01 16:59:57 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-11-01 17:01:10 +0100 |
commit | db52dc7b398c4615d87a9435a291742660f15c98 (patch) | |
tree | 1eca7ae2d12db3f9f525b1c6789191f261f29e87 /freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff | |
parent | 538764c31cd84749170a8510f95556912c3811f6 (diff) | |
download | tde-packaging-16217054cb7f307ec1eb96d50cfb91dfc87ffe9c.tar.gz tde-packaging-16217054cb7f307ec1eb96d50cfb91dfc87ffe9c.zip |
FreeBSD: Update for final release R14.0.2r14.0.2
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff')
-rw-r--r-- | freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff b/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff new file mode 100644 index 000000000..3ff08a2ec --- /dev/null +++ b/freebsd/dependencies/akode/files/patch-b00-fix-ogg-on-suse.diff @@ -0,0 +1,86 @@ +commit 386d5647da414c477f7f045c2850bfb1854e2302 +Author: François Andriot <francois.andriot@free.fr> +Date: Thu Oct 15 04:40:52 2015 +0200 + + Fix OGG detection on openSUSE + + Signed-off-by: François Andriot <francois.andriot@free.fr> + +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index 1fa37d7..df4d86a 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -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 ) +@@ -237,7 +237,7 @@ if( WITH_XIPH_DECODER ) + pkg_search_module( SPEEX speex>=1.1 ) + if( SPEEX_FOUND ) + set( HAVE_SPEEX11 1 ) +- check_library_exits( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT ) ++ check_library_exists( speex speex_decode_int "" HAVE_SPEEX_DECODE_INT ) + if( NOT HAVE_SPEEX_DECODE_INT ) + set( BROKEN_SPEEX11 1 ) + endif( ) +@@ -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/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/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 |