Date: Monday, December 9, 2019 @ 22:34:15 Author: arojas Revision: 370566
mediastreamer 4.3 rebuild Added: kopete/trunk/kopete-mediastreamer-4.3.patch Modified: kopete/trunk/PKGBUILD --------------------------------+ PKGBUILD | 11 +++-- kopete-mediastreamer-4.3.patch | 84 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-09 21:59:58 UTC (rev 370565) +++ PKGBUILD 2019-12-09 22:34:15 UTC (rev 370566) @@ -4,7 +4,7 @@ pkgname=kopete pkgver=19.08.3 -pkgrel=1 +pkgrel=2 pkgdesc='Instant Messenger' url='https://kde.org/applications/internet/kopete/' arch=(x86_64) @@ -12,15 +12,16 @@ groups=(kde-applications kdenetwork) depends=(knotifyconfig kcmutils ktexteditor kcontacts kidentitymanagement libkleo qca kdelibs4support khtml libidn libotr) -makedepends=(extra-cmake-modules mediastreamer libgadu jsoncpp kdoctools kdesignerplugin kdnssd libkleo ktexteditor) +makedepends=(extra-cmake-modules mediastreamer libgadu jsoncpp kdoctools kdesignerplugin kdnssd libkleo ktexteditor bcunit) optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol' 'kdnssd: bonjour protocol') source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - kopete-mediastreamer2.14.patch kopete-srtp2.patch kopete-openssl-1.1.patch) + kopete-mediastreamer2.14.patch kopete-srtp2.patch kopete-openssl-1.1.patch kopete-mediastreamer-4.3.patch) sha256sums=('d4e407516754cdf66f447e4439f41080586af2ec30c07bd1c88712b089f21221' 'SKIP' '8b8e7a5d9f17fafdddb402fab22b0b8d9963039ea8ea9fa749cad67aeeb879ac' 'ceed663f7007654d186d918cf7a0742972ed5bd319879021e9ba80e395177700' - 'a12ea422e5162ef11274a98fd53658d6e780cafbe2e0fac70c8bc7d3291fef8b') + 'a12ea422e5162ef11274a98fd53658d6e780cafbe2e0fac70c8bc7d3291fef8b' + '7ff38588f25bc05eae8ba20d9624536b33addf26b74e8c64ac036291f98f2bc2') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> @@ -30,6 +31,8 @@ cd $pkgname-$pkgver # fix build with mediastreamer 2.14 https://phabricator.kde.org/D15956 patch -p1 -i ../kopete-mediastreamer2.14.patch +# Detect mediastreamer 4.3 + patch -p1 -i ../kopete-mediastreamer-4.3.patch # fix build with OpenSSL 1.1 (Fedora patch) patch -p1 -i ../kopete-openssl-1.1.patch # support SRTP2 Added: kopete-mediastreamer-4.3.patch =================================================================== --- kopete-mediastreamer-4.3.patch (rev 0) +++ kopete-mediastreamer-4.3.patch 2019-12-09 22:34:15 UTC (rev 370566) @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55556be4a..8e63c2cee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,8 +92,8 @@ set_package_properties(Libgadu PROPERTIES DESCRIPTION "A library providing suppo + find_package(LibMeanwhile QUIET) + set_package_properties(LibMeanwhile PROPERTIES DESCRIPTION "A library for protocol support for connection to sametime servers" URL "http://meanwhile.sourceforge.net/" TYPE OPTIONAL PURPOSE "Required for the meanwhile protocol") + +-find_package(LiboRTP QUIET) +-set_package_properties(LiboRTP PROPERTIES DESCRIPTION "oRTP provides an API to send rtp packets" URL "http://www.linphone.org/index.php/eng/code_review/ortp/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support") ++find_package(ortp QUIET) ++set_package_properties(ortp PROPERTIES DESCRIPTION "oRTP provides an API to send rtp packets" URL "http://www.linphone.org/index.php/eng/code_review/ortp/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support") + + find_package(LibOTR QUIET) + set_package_properties(LibOTR PROPERTIES DESCRIPTION "Library to encrypt messages with off-the-record encryption" URL "http://www.cypherpunks.ca/otr/" TYPE OPTIONAL PURPOSE "Required for the OTR plugin") +@@ -107,8 +107,8 @@ set_package_properties(LibXml2 PROPERTIES DESCRIPTION "Libraries used to develop + find_package(LibXslt QUIET) + set_package_properties(LibXslt PROPERTIES DESCRIPTION "A library to transform XML files into other XML files" URL "http://www.xmlsoft.org/XSLT/" TYPE OPTIONAL PURPOSE "Required for the Webpresence plugin") + +-find_package(Mediastreamer QUIET) +-set_package_properties(Mediastreamer PROPERTIES DESCRIPTION "A streaming enginer specialized for voice/video telephony applications" URL "http://www.linphone.org/index.php/eng/code_review/mediastreamer2/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support") ++find_package(Mediastreamer2 QUIET) ++set_package_properties(Mediastreamer2 PROPERTIES DESCRIPTION "A streaming enginer specialized for voice/video telephony applications" URL "http://www.linphone.org/index.php/eng/code_review/mediastreamer2/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support") + + find_package(OpenSSL QUIET) + set_package_properties(OpenSSL PROPERTIES DESCRIPTION "OpenSSL implementation of SSL" URL "https://www.openssl.org/" TYPE OPTIONAL PURPOSE "Required for the Jabber protocol with libjingle support") +diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt +index 89d36a4e4..5f13ff9d9 100644 +--- a/protocols/CMakeLists.txt ++++ b/protocols/CMakeLists.txt +@@ -22,7 +22,7 @@ option(WITH_skype "Enable Kopete Skype protocol" ON) + set(BUILD_JINGLE FALSE) + + if(OPENSSL_FOUND OR WIN32) +- if(EXPAT_FOUND AND LIBORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER_FOUND AND WITH_libjingle) ++ if(EXPAT_FOUND AND ORTP_FOUND AND SRTP_FOUND AND JSONCPP_FOUND AND MEDIASTREAMER2_FOUND AND WITH_libjingle) + message(STATUS "Building jabber libjingle support") + set(BUILD_LIBJINGLE TRUE) + else() +diff --git a/protocols/jabber/libjingle/CMakeLists.txt b/protocols/jabber/libjingle/CMakeLists.txt +index af7c1c3af..de7596615 100644 +--- a/protocols/jabber/libjingle/CMakeLists.txt ++++ b/protocols/jabber/libjingle/CMakeLists.txt +@@ -286,8 +286,8 @@ set ( call_LIBS + ${SRTP_LIBRARY} + ${JSONCPP_LIBRARY} + ${EXPAT_LIBRARY} +- ${MEDIASTREAMER_LIBRARIES} +- ${LIBORTP_LIBRARY} ++ ${MEDIASTREAMER2_LIBRARIES} ++ ${ORTP_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} + ) +diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc +index bd11027e0..6f9e05a0a 100644 +--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc ++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc +@@ -34,11 +34,9 @@ + #ifdef HAVE_LINPHONE + + // LinphoneMediaEngine is a Linphone implementation of MediaEngine +-extern "C" { + #include <mediastreamer2/mediastream.h> + #include <mediastreamer2/mssndcard.h> + #include <mediastreamer2/msfilter.h> +-} + + #include "talk/session/phone/linphonemediaengine.h" + +diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h +index 6105ab8cb..f5b5c3b14 100644 +--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h ++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h +@@ -35,9 +35,7 @@ + #include <string> + #include <vector> + +-extern "C" { + #include <mediastreamer2/mediastream.h> +-} + + #include "talk/base/scoped_ptr.h" + #include "talk/session/phone/codec.h"