commit a96bf8e84cc4976308fb75ad20e2ef463cb7f6b7
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 31 16:13:38 2015 +0200
- updated to 1.0.1
- updated system-silk patch
mediastreamer-plugin-mssilk-system-silk.patch | 79 +++++++++++----------------
mediastreamer-plugin-mssilk.spec | 8 +--
2 files changed, 35 insertions(+), 52 deletions(-)
---
diff --git a/mediastreamer-plugin-mssilk.spec b/mediastreamer-plugin-mssilk.spec
index 50950d4..0f58098 100644
--- a/mediastreamer-plugin-mssilk.spec
+++ b/mediastreamer-plugin-mssilk.spec
@@ -1,12 +1,12 @@
Summary: SILK audio codec for mediastreamer
Summary(pl.UTF-8): Kodek dźwięku SILK dla mediastreamera
Name: mediastreamer-plugin-mssilk
-Version: 1.0.0
-Release: 2
+Version: 1.0.1
+Release: 1
License: GPL v2+
Group: Libraries
-Source0:
http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/mssilk-%{version}.tar.gz
-# Source0-md5: e60bf01fa0ec86afa80f5eafd318f420
+Source0:
http://linphone.org/releases/sources/plugins/mssilk/mssilk-%{version}.tar.gz
+# Source0-md5: 1f88d4da652e8b262b0328b698c542ed
Patch0: %{name}-system-silk.patch
URL: https://github.com/Distrotech/mssilk
BuildRequires: SILK_SDK-devel >= 1.0.9
diff --git a/mediastreamer-plugin-mssilk-system-silk.patch
b/mediastreamer-plugin-mssilk-system-silk.patch
index 75d4b62..6a529b5 100644
--- a/mediastreamer-plugin-mssilk-system-silk.patch
+++ b/mediastreamer-plugin-mssilk-system-silk.patch
@@ -1,20 +1,27 @@
---- mssilk-1.0.0/configure.ac.orig 2013-06-12 16:41:28.000000000 +0200
-+++ mssilk-1.0.0/configure.ac 2013-07-07 14:05:26.418714300 +0200
+--- mssilk-1.0.1/configure.ac.orig 2015-07-30 22:24:28.056188806 +0200
++++ mssilk-1.0.1/configure.ac 2015-07-31 15:33:33.943597578 +0200
@@ -3,7 +3,6 @@
- AC_INIT([mssilk],[1.0.0])
+ AC_INIT([mssilk],[1.0.1])
AC_PREREQ(2.63)
-AC_CONFIG_SRCDIR([sdk/known_checksums/SILK_SDK_SRC_v1.0.8.zip.md5])
- AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability])
-@@ -25,59 +25,6 @@
+
+@@ -26,42 +25,6 @@
AC_SUBST(STRICT_CFLAGS)
-case $host in
- arm*)
-- SILK_FLAVOUR=ARM
+- case $CC in
+- *clang*) # clang doesn't like the old ARM assembly
+- SILK_FLAVOUR=FIX
+- ;;
+- *)
+- SILK_FLAVOUR=ARM
+- ;;
+- esac
- ;;
- *)
- SILK_FLAVOUR=FIX
@@ -22,65 +29,41 @@
-esac
-
-case $host in
-- armv6-apple*)
-- SILK_MAKE_OPTIONS="ADDED_DEFINES+=IPHONE
TOOLCHAIN_PREFIX=XXXX"
+- 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"
+- ;;
+- 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"
+- ;;
+-*)
+- ;;
-esac
-
--AC_SUBST([SILK_FLAVOUR])
--AC_SUBST([SILK_MAKE_OPTIONS])
-
--# Checks for programs.
--AC_PATH_PROG([WGET],[wget])
--if test -z "$WGET"; then
-- AC_MSG_ERROR(['wget' is required to build this package])
--fi
--
--AC_PATH_PROG([MD5SUM],[md5sum])
--if test -z "$MD5SUM"; then
-- AC_PATH_PROG([MD5SUM],[openssl])
-- if test -n "$MD5SUM"; then
-- MD5SUM="$MD5SUM md5"
-- fi
--fi
--
--if test -z "$MD5SUM"; then
-- AC_MSG_ERROR(['md5sum' is required to build this package])
--fi
--
--AC_PATH_PROG([UNZIP],[unzip])
--if test -z "$UNZIP"; then
-- AC_MSG_ERROR(['unzip' is required to build this package])
--fi
--
--AC_PATH_PROG([PATCH],[patch])
--if test -z "$PATCH"; then
-- AC_MSG_ERROR(['patch' is required to build this package])
--fi
-
+-AC_SUBST([SILK_FLAVOUR])
+-AC_SUBST([SILK_MAKE_OPTIONS])
LT_INIT([disable-static])
---- mssilk-1.0.0/Makefile.am.orig 2013-06-12 16:41:28.000000000 +0200
-+++ mssilk-1.0.0/Makefile.am 2013-07-07 14:06:19.492045409 +0200
+--- mssilk-1.0.1/Makefile.am.orig 2015-02-17 14:17:43.000000000 +0100
++++ mssilk-1.0.1/Makefile.am 2015-07-31 15:34:38.080261553 +0200
@@ -1,9 +1,4 @@
EXTRA_DIST=autogen.sh mssilk.iss.in
-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=$(CURDIR)/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
+@@ -13,7 +8,7 @@
libmssilk_la_SOURCES=silk_dec.c silk_enc.c
@@ -89,7 +72,7 @@
libmssilk_la_LIBADD=\
$(ORTP_LIBS) \
$(MEDIASTREAMER_LIBS) \
-@@ -21,7 +16,7 @@ libmssilk_la_LIBADD=\
+@@ -21,7 +16,7 @@
libmssilk_la_LDFLAGS=-module -no-undefined
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer-plugin-mssilk.git/commitdiff/a96bf8e84cc4976308fb75ad20e2ef463cb7f6b7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
