summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2021-02-14 18:39:19 (GMT)
committerJan Rękorajski2021-02-14 18:39:19 (GMT)
commit6e0a5621cc37a6fbc18e14c69b97430f5f5fb317 (patch)
tree93faaf5a855385a8b95db37a236bbaeb88eedcb0
parentf390d5ce5fa57ef1922f5becf3272c74a5256b87 (diff)
downloadtwinkle-master.zip
twinkle-master.tar.gz
- fix building with webrtc-libilbc 3.xHEADauto/th/twinkle-1.10.2-2master
- rel 2
-rw-r--r--twinkle.spec4
-rw-r--r--webrtc-libilbc3.patch26
2 files changed, 29 insertions, 1 deletions
diff --git a/twinkle.spec b/twinkle.spec
index 35511f7..57b5b53 100644
--- a/twinkle.spec
+++ b/twinkle.spec
@@ -5,12 +5,13 @@ Summary: twinkle - SIP Soft Phone
Summary(pl.UTF-8): twinkle - telefon programowy SIP
Name: twinkle
Version: 1.10.2
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/Communications
Source0: https://github.com/LubosD/twinkle/archive/v%{version}.tar.gz
# Source0-md5: ca6884f9834a25e89fc945b48a91c7a2
Patch0: ilbc.patch
+Patch1: webrtc-libilbc3.patch
URL: http://twinkle.dolezel.info/
BuildRequires: Qt5Quick-devel
BuildRequires: Qt5Widgets-devel
@@ -45,6 +46,7 @@ telefonicznych po sieciach IP.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/webrtc-libilbc3.patch b/webrtc-libilbc3.patch
new file mode 100644
index 0000000..073862d
--- /dev/null
+++ b/webrtc-libilbc3.patch
@@ -0,0 +1,26 @@
+--- twinkle-1.10.2/src/audio/audio_decoder.h~ 2021-02-14 19:33:32.000000000 +0100
++++ twinkle-1.10.2/src/audio/audio_decoder.h 2021-02-14 19:35:59.634214690 +0100
+@@ -48,6 +48,10 @@
+ extern "C" {
+ #endif
+ #include <ilbc.h>
++#define initDecode WebRtcIlbcfix_InitDecode
++#define initEncode WebRtcIlbcfix_InitEncode
++#define iLBC_decode WebRtcIlbcfix_DecodeImpl
++#define iLBC_encode WebRtcIlbcfix_EncodeImpl
+ #ifndef HAVE_ILBC_CPP
+ }
+ #endif
+--- twinkle-1.10.2/src/audio/audio_encoder.h~ 2021-02-14 19:33:32.000000000 +0100
++++ twinkle-1.10.2/src/audio/audio_encoder.h 2021-02-14 19:36:51.594446403 +0100
+@@ -47,6 +47,10 @@
+ extern "C" {
+ #endif
+ #include <ilbc.h>
++#define initDecode WebRtcIlbcfix_InitDecode
++#define initEncode WebRtcIlbcfix_InitEncode
++#define iLBC_decode WebRtcIlbcfix_DecodeImpl
++#define iLBC_encode WebRtcIlbcfix_EncodeImpl
+ #ifndef HAVE_ILBC_CPP
+ }
+ #endif