]> git.pld-linux.org Git - packages/mediastreamer.git/blob - mediastreamer-gsm.patch
Merge branch 'DEVEL-cmake'
[packages/mediastreamer.git] / mediastreamer-gsm.patch
1 --- mediastreamer2-4.5.22/src/audiofilters/gsm.c.orig   2021-06-24 23:55:04.000000000 +0200
2 +++ mediastreamer2-4.5.22/src/audiofilters/gsm.c        2021-07-09 20:30:36.320023832 +0200
3 @@ -18,7 +18,7 @@
4   */
5  
6  #include "mediastreamer2/msfilter.h"
7 -#include <gsm/gsm.h>
8 +#include <gsm.h>
9  
10  #ifdef _MSC_VER
11  #include <malloc.h>
12 #--- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig     2021-06-24 23:55:04.000000000 +0200
13 #+++ mediastreamer2-4.5.22/cmake/FindGSM.cmake  2021-07-09 20:32:19.826129758 +0200
14 #@@ -37,6 +37,15 @@ find_path(GSM_INCLUDE_DIRS
15 # )
16 # if(GSM_INCLUDE_DIRS)
17 #       set(HAVE_GSM_GSM_H 1)
18 #+else()
19 #+      find_path(GSM_INCLUDE_DIRS
20 #+              NAMES gsm.h
21 #+              HINTS _GSM_ROOT_PATHS
22 #+              PATH_SUFFIXES include
23 #+      )
24 #+      if(GSM_INCLUDE_DIRS)
25 #+              set(HAVE_GSM_H 1)
26 #+      endif()
27 # endif()
28
29 # find_library(GSM_LIBRARIES
30 --- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig      2021-06-24 23:55:04.000000000 +0200
31 +++ mediastreamer2-4.5.22/cmake/FindGSM.cmake   2021-07-09 20:42:12.959583145 +0200
32 @@ -31,12 +31,12 @@ set(_GSM_ROOT_PATHS
33  )
34  
35  find_path(GSM_INCLUDE_DIRS
36 -       NAMES gsm/gsm.h
37 +       NAMES gsm.h
38         HINTS _GSM_ROOT_PATHS
39 -       PATH_SUFFIXES include
40 +       PATH_SUFFIXES include/gsm include
41  )
42  if(GSM_INCLUDE_DIRS)
43 -       set(HAVE_GSM_GSM_H 1)
44 +       set(HAVE_GSM_H 1)
45  endif()
46  
47  find_library(GSM_LIBRARIES
48 @@ -48,7 +48,7 @@ find_library(GSM_LIBRARIES
49  include(FindPackageHandleStandardArgs)
50  find_package_handle_standard_args(GSM
51         DEFAULT_MSG
52 -       GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H
53 +       GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H
54  )
55  
56 -mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H)
57 +mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H)
This page took 0.047722 seconds and 3 git commands to generate.