[packages/mediastreamer/DEVEL-cmake] - added gsm patch (adjust for PLD libgsm layout); restored gsm support

[qboosh]

commit fc50abc34e4d4ea115688bb06526faa95e333d55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 9 21:03:54 2021 +0200

    - added gsm patch (adjust for PLD libgsm layout); restored gsm support

 mediastreamer-gsm.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 mediastreamer.spec      |  4 ++--
 2 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index 9169888..26056e1 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -41,6 +41,7 @@ Patch3:		%{name}-cmake-datadir.patch
 Patch4:		%{name}-cmake-install-pkgconfig.patch
 Patch5:		%{name}-cmake-SDL.patch
 Patch6:		%{name}-types.patch
+Patch7:		%{name}-gsm.patch
 URL:		http://www.linphone.org/technical-corner/mediastreamer2/overview
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.0}
@@ -161,8 +162,7 @@ Statyczne biblioteki mediastreamer.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-
-#[ ! -e gitversion.h ] && echo '#define MS2_GIT_VERSION "%{version}"' > src/gitversion.h
+%patch7 -p1
 
 # cmake checks for python3, so don't require python 2 as well
 %{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' tools/xxd.py
diff --git a/mediastreamer-gsm.patch b/mediastreamer-gsm.patch
new file mode 100644
index 0000000..2c4844a
--- /dev/null
+++ b/mediastreamer-gsm.patch
@@ -0,0 +1,57 @@
+--- mediastreamer2-4.5.22/src/audiofilters/gsm.c.orig	2021-06-24 23:55:04.000000000 +0200
++++ mediastreamer2-4.5.22/src/audiofilters/gsm.c	2021-07-09 20:30:36.320023832 +0200
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include "mediastreamer2/msfilter.h"
+-#include <gsm/gsm.h>
++#include <gsm.h>
+ 
+ #ifdef _MSC_VER
+ #include <malloc.h>
+#--- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig	2021-06-24 23:55:04.000000000 +0200
+#+++ mediastreamer2-4.5.22/cmake/FindGSM.cmake	2021-07-09 20:32:19.826129758 +0200
+#@@ -37,6 +37,15 @@ find_path(GSM_INCLUDE_DIRS
+# )
+# if(GSM_INCLUDE_DIRS)
+# 	set(HAVE_GSM_GSM_H 1)
+#+else()
+#+	find_path(GSM_INCLUDE_DIRS
+#+		NAMES gsm.h
+#+		HINTS _GSM_ROOT_PATHS
+#+		PATH_SUFFIXES include
+#+	)
+#+	if(GSM_INCLUDE_DIRS)
+#+		set(HAVE_GSM_H 1)
+#+	endif()
+# endif()
+# 
+# find_library(GSM_LIBRARIES
+--- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig	2021-06-24 23:55:04.000000000 +0200
++++ mediastreamer2-4.5.22/cmake/FindGSM.cmake	2021-07-09 20:42:12.959583145 +0200
+@@ -31,12 +31,12 @@ set(_GSM_ROOT_PATHS
+ )
+ 
+ find_path(GSM_INCLUDE_DIRS
+-	NAMES gsm/gsm.h
++	NAMES gsm.h
+ 	HINTS _GSM_ROOT_PATHS
+-	PATH_SUFFIXES include
++	PATH_SUFFIXES include/gsm include
+ )
+ if(GSM_INCLUDE_DIRS)
+-	set(HAVE_GSM_GSM_H 1)
++	set(HAVE_GSM_H 1)
+ endif()
+ 
+ find_library(GSM_LIBRARIES
+@@ -48,7 +48,7 @@ find_library(GSM_LIBRARIES
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(GSM
+ 	DEFAULT_MSG
+-	GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H
++	GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H
+ )
+ 
+-mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H)
++mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/fc50abc34e4d4ea115688bb06526faa95e333d55