[packages/mediastreamer-plugin-mssilk.git] / mediastreamer-plugin-mssilk-system-silk.patch

diff -urNp -x '*.orig' mssilk-1.1.1.org/Makefile.am mssilk-1.1.1/Makefile.am
--- mssilk-1.1.1.org/Makefile.am	2016-03-17 15:03:40.000000000 +0100
+++ mssilk-1.1.1/Makefile.am	2021-07-06 00:26:34.986591109 +0200
@@ -1,9 +1,4 @@
 EXTRA_DIST=autogen.sh mssilk.iss.in CMakeLists.txt
-SILK_VERSION = 1.0.9
-#SILK_DIR=$(srcdir)/sdk/SILK_SDK_SRC_v$(SILK_VERSION)/SILK_SDK_SRC_$(SILK_FLAVOUR)_v$(SILK_VERSION)
-SILK_DIR=$(top_builddir)/sdk/SILK_SDK_SRC_v$(SILK_VERSION)/SILK_SDK_SRC_$(SILK_FLAVOUR)_v$(SILK_VERSION)
-
-SUBDIRS = sdk
 
 
 pluginsdir = $(libdir)/mediastreamer/plugins
@@ -13,7 +8,7 @@ plugins_LTLIBRARIES=libmssilk.la
 libmssilk_la_SOURCES=silk_dec.c silk_enc.c
 
 
-SILK_LIBS = -L${SILK_DIR} -lSKP_SILK_SDK
+SILK_LIBS = -lSKP_SILK_SDK
 libmssilk_la_LIBADD=\
 	$(ORTP_LIBS) \
         $(MEDIASTREAMER_LIBS) \
@@ -21,7 +16,7 @@ libmssilk_la_LIBADD=\
 
 libmssilk_la_LDFLAGS=-module -no-undefined
 
-SILK_CFLAGS = -I$(SILK_DIR)/interface 
+SILK_CFLAGS =
 AM_CFLAGS=      $(SILK_CFLAGS) \
                 $(MEDIASTREAMER_CFLAGS) \
 				$(STRICT_CFLAGS)
diff -urNp -x '*.orig' mssilk-1.1.1.org/configure.ac mssilk-1.1.1/configure.ac
--- mssilk-1.1.1.org/configure.ac	2017-07-20 10:47:56.000000000 +0200
+++ mssilk-1.1.1/configure.ac	2021-07-06 00:26:34.986591109 +0200
@@ -3,7 +3,6 @@
 
 AC_INIT([mssilk],[1.1.0])
 AC_PREREQ(2.63)
-AC_CONFIG_SRCDIR([sdk/known_checksums/SILK_SDK_SRC_v1.0.8.zip.md5])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability])
 
@@ -26,48 +25,6 @@ fi
 
 AC_SUBST(STRICT_CFLAGS)
 
-case $host in
-	arm*)
-		case $CC in
-			*clang*) # clang doesn't like the old ARM assembly
-				SILK_FLAVOUR=FIX
-			;;
-			*)
-				SILK_FLAVOUR=ARM
-			;;
-		esac
-	;;
-	*)
-		SILK_FLAVOUR=FIX
-	;;
-esac
-
-case $host in
-	armv6-apple*)
-		SILK_MAKE_OPTIONS="ADDED_DEFINES+=IPHONE TOOLCHAIN_PREFIX=XXXX"
-		CFLAGS="$CFLAGS -mno-thumb"
-	;;
-	armv7-apple*)
-		SILK_MAKE_OPTIONS="USE_NEON=yes ADDED_DEFINES+=IPHONE TOOLCHAIN_PREFIX=XXXX"
-		CFLAGS="$CFLAGS -mno-thumb"
-	;;
-	armv7*)
-		SILK_MAKE_OPTIONS="USE_NEON=yes TOOLCHAIN_PREFIX=XXXX"
-	;;
-	arm*)
-		dnl override flavour for case of old arm, as a workaround of a bug in the Skype's Makefile resulting in neon functions not being compiled while requested,
-		dnl because the compiler says it supports armv7 and neon.
-		SILK_FLAVOUR=FIX
-	;;
-	*)
-	;;
-esac
-
-
-
-AC_SUBST([SILK_FLAVOUR])
-AC_SUBST([SILK_MAKE_OPTIONS])
-
 LT_INIT([disable-static])
 
 AC_ARG_WITH([mediastreamer], AS_HELP_STRING([--without-mediastreamer], [Permits to deactivate mediastreamer check for download of SILK code only]))
Commit	Line	Data
0dc5cde8 JR	1	diff -urNp -x '*.orig' mssilk-1.1.1.org/Makefile.am mssilk-1.1.1/Makefile.am
	2	--- mssilk-1.1.1.org/Makefile.am 2016-03-17 15:03:40.000000000 +0100
	3	+++ mssilk-1.1.1/Makefile.am 2021-07-06 00:26:34.986591109 +0200
	4	@@ -1,9 +1,4 @@
	5	EXTRA_DIST=autogen.sh mssilk.iss.in CMakeLists.txt
	6	-SILK_VERSION = 1.0.9
	7	-#SILK_DIR=$(srcdir)/sdk/SILK_SDK_SRC_v$(SILK_VERSION)/SILK_SDK_SRC_$(SILK_FLAVOUR)_v$(SILK_VERSION)
	8	-SILK_DIR=$(top_builddir)/sdk/SILK_SDK_SRC_v$(SILK_VERSION)/SILK_SDK_SRC_$(SILK_FLAVOUR)_v$(SILK_VERSION)
	9	-
	10	-SUBDIRS = sdk
	11
	12
	13	pluginsdir = $(libdir)/mediastreamer/plugins
	14	@@ -13,7 +8,7 @@ plugins_LTLIBRARIES=libmssilk.la
	15	libmssilk_la_SOURCES=silk_dec.c silk_enc.c
	16
	17
	18	-SILK_LIBS = -L${SILK_DIR} -lSKP_SILK_SDK
	19	+SILK_LIBS = -lSKP_SILK_SDK
	20	libmssilk_la_LIBADD=\
	21	$(ORTP_LIBS) \
	22	$(MEDIASTREAMER_LIBS) \
	23	@@ -21,7 +16,7 @@ libmssilk_la_LIBADD=\
	24
	25	libmssilk_la_LDFLAGS=-module -no-undefined
	26
	27	-SILK_CFLAGS = -I$(SILK_DIR)/interface
	28	+SILK_CFLAGS =
	29	AM_CFLAGS= $(SILK_CFLAGS) \
	30	$(MEDIASTREAMER_CFLAGS) \
	31	$(STRICT_CFLAGS)
	32	diff -urNp -x '*.orig' mssilk-1.1.1.org/configure.ac mssilk-1.1.1/configure.ac
	33	--- mssilk-1.1.1.org/configure.ac 2017-07-20 10:47:56.000000000 +0200
	34	+++ mssilk-1.1.1/configure.ac 2021-07-06 00:26:34.986591109 +0200
d85a7686 JB	35	@@ -3,7 +3,6 @@
d85a7686 JB	36
0dc5cde8	37	AC_INIT([mssilk],[1.1.0])
d85a7686 JB	38	AC_PREREQ(2.63)
d85a7686 JB	39	-AC_CONFIG_SRCDIR([sdk/known_checksums/SILK_SDK_SRC_v1.0.8.zip.md5])
d85a7686 JB	40	AC_CONFIG_MACRO_DIR([m4])
d85a7686 JB	41	AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability])
a96bf8e8	42
0dc5cde8	43	@@ -26,48 +25,6 @@ fi
d85a7686 JB	44
	45	AC_SUBST(STRICT_CFLAGS)
	46
	47	-case $host in
	48	- arm*)
a96bf8e8 JB	49	- case $CC in
	50	- clang) # clang doesn't like the old ARM assembly
	51	- SILK_FLAVOUR=FIX
	52	- ;;
	53	- *)
	54	- SILK_FLAVOUR=ARM
	55	- ;;
	56	- esac
d85a7686 JB	57	- ;;
	58	- *)
	59	- SILK_FLAVOUR=FIX
	60	- ;;
	61	-esac
	62	-
	63	-case $host in
a96bf8e8 JB	64	- armv6-apple*)
a96bf8e8 JB	65	- SILK_MAKE_OPTIONS="ADDED_DEFINES+=IPHONE TOOLCHAIN_PREFIX=XXXX"
d85a7686	66	- CFLAGS="$CFLAGS -mno-thumb"
a96bf8e8 JB	67	- ;;
	68	- armv7-apple*)
	69	- SILK_MAKE_OPTIONS="USE_NEON=yes ADDED_DEFINES+=IPHONE TOOLCHAIN_PREFIX=XXXX"
d85a7686	70	- CFLAGS="$CFLAGS -mno-thumb"
a96bf8e8 JB	71	- ;;
	72	- armv7*)
	73	- SILK_MAKE_OPTIONS="USE_NEON=yes TOOLCHAIN_PREFIX=XXXX"
	74	- ;;
f7237d88 JB	75	- arm*)
	76	- dnl override flavour for case of old arm, as a workaround of a bug in the Skype's Makefile resulting in neon functions not being compiled while requested,
	77	- dnl because the compiler says it supports armv7 and neon.
	78	- SILK_FLAVOUR=FIX
	79	- ;;
	80	- *)
a96bf8e8	81	- ;;
d85a7686 JB	82	-esac
d85a7686 JB	83	-
d85a7686	84	-
d85a7686	85	-
a96bf8e8 JB	86	-AC_SUBST([SILK_FLAVOUR])
a96bf8e8 JB	87	-AC_SUBST([SILK_MAKE_OPTIONS])
f7237d88	88	-
d85a7686 JB	89	LT_INIT([disable-static])
d85a7686 JB	90
f7237d88	91	AC_ARG_WITH([mediastreamer], AS_HELP_STRING([--without-mediastreamer], [Permits to deactivate mediastreamer check for download of SILK code only]))