diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-02 06:21:32 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-02 06:21:32 +0000 |
commit | 0c7345a551feec6fc5b1e156612ab43382734cf7 (patch) | |
tree | 1f709a513a1a13a0e77d49a7d765a0a83d179167 /main/sems/sems-0010-Move-CMake-defines.patch | |
parent | df747d4c71238ae72b98ae3e46fd64098a049836 (diff) | |
download | aports-0c7345a551feec6fc5b1e156612ab43382734cf7.tar.bz2 aports-0c7345a551feec6fc5b1e156612ab43382734cf7.tar.xz |
main/sems: upgrade to 1.4.0 (moved from testing)
Diffstat (limited to 'main/sems/sems-0010-Move-CMake-defines.patch')
-rw-r--r-- | main/sems/sems-0010-Move-CMake-defines.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/main/sems/sems-0010-Move-CMake-defines.patch b/main/sems/sems-0010-Move-CMake-defines.patch new file mode 100644 index 0000000000..be1b8be7a8 --- /dev/null +++ b/main/sems/sems-0010-Move-CMake-defines.patch @@ -0,0 +1,66 @@ +From c6fe28de4a05e33c317019261711f2babe98b95d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Mon, 3 Jan 2011 22:16:24 +0300 +Subject: [PATCH 10/11] Move CMake defines + +Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> +--- + CMakeLists.txt | 3 +++ + core/CMakeLists.txt | 6 ------ + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78a6dfb..fdc88f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,6 +80,7 @@ SET(CMAKE_VERBOSE_MAKEFILE ON) + # (which means that current debian and gentoo packages don't work) + IF(SEMS_USE_SPANDSP) + FIND_PACKAGE(Spandsp REQUIRED) ++ ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS) + MESSAGE(STATUS "Using spandsp: YES") + ELSE(SEMS_USE_SPANDSP) + MESSAGE(STATUS "Using spandsp: NO (default)") +@@ -89,6 +90,7 @@ ENDIF(SEMS_USE_SPANDSP) + # (see http://www.mega-nerd.com/SRC/) + IF(SEMS_USE_LIBSAMPLERATE) + FIND_PACKAGE(Libsamplerate REQUIRED) ++ ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE) + MESSAGE(STATUS "Using libsamplerate: YES") + ELSE(SEMS_USE_LIBSAMPLERATE) + MESSAGE(STATUS "Using libsamplerate: NO (default)") +@@ -128,6 +130,7 @@ ELSE(SEMS_USE_MONITORING) + ENDIF(SEMS_USE_MONITORING) + + IF(SEMS_USE_IPV6) ++ ADD_DEFINITIONS(-DSUPPORT_IPV6) + MESSAGE(STATUS "Enable IPv6 support: YES") + ELSE(SEMS_USE_IPV6) + MESSAGE(STATUS "Enable IPv6 support: NO (default)") +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 7bd1341..5f0fb3f 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -18,19 +18,13 @@ ENDIF(NOT MAX_RTP_SESSIONS) + ADD_DEFINITIONS(-DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS}) + + IF(SPANDSP_FOUND) +- ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS) + TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp) + ENDIF(SPANDSP_FOUND) + + IF(LIBSAMPLERATE_FOUND) +- ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE) + TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate) + ENDIF(LIBSAMPLERATE_FOUND) + +-IF(SEMS_USE_IPV6) +- ADD_DEFINITIONS(-DSUPPORT_IPV6) +-ENDIF(SEMS_USE_IPV6) +- + ADD_SUBDIRECTORY(plug-in) + + # Create config-file from template +-- +1.7.3.4 + |