Hello community,
here is the log from the commit of package kopete for openSUSE:Factory checked
in at 2016-09-30 15:23:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kopete (Old)
and /work/SRC/openSUSE:Factory/.kopete.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopete"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kopete/kopete.changes 2016-09-14
23:14:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kopete.new/kopete.changes 2016-09-30
15:23:19.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 19 07:19:12 UTC 2016 - fab...@ritter-vogt.de
+
+- Add ms2-14.patch to fix build with mediastream >= 2.14 and ortp 0.27
+ - from kde#368340
+
+-------------------------------------------------------------------
New:
----
ms2-14.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kopete.spec ++++++
--- /var/tmp/diff_new_pack.1CnXsL/_old 2016-09-30 15:23:20.000000000 +0200
+++ /var/tmp/diff_new_pack.1CnXsL/_new 2016-09-30 15:23:20.000000000 +0200
@@ -22,6 +22,8 @@
License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger
Source0: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM Fix build with mediastreamer >= 2.14 -
https://bugs.kde.org/show_bug.cgi?id=368340
+Patch1: ms2-14.patch
BuildRequires: alsa-devel
BuildRequires: giflib-devel
BuildRequires: libgadu-devel
@@ -56,12 +58,13 @@
%prep
%setup -q
+%patch1 -p1
%build
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
-export RPM_OPT_FLAGS="%{optflags} -fPIE"
+export RPM_OPT_FLAGS="%{optflags} -fPIE -pthread"
export LDFLAGS="-pie"
%cmake_kde4 -d build -- -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/browser-plugins
%make_jobs
++++++ ms2-14.patch ++++++
Index: kopete-16.08.1/cmake/modules/FindMediastreamer.cmake
===================================================================
--- kopete-16.08.1.orig/cmake/modules/FindMediastreamer.cmake
+++ kopete-16.08.1/cmake/modules/FindMediastreamer.cmake
@@ -24,12 +24,19 @@ IF (MEDIASTREAMER_FOUND)
IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
SET(MEDIASTREAMER_LESS_2_9 TRUE)
SET(MEDIASTREAMER_LESS_2_11 TRUE)
+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
SET(MEDIASTREAMER_LESS_2_9 FALSE)
SET(MEDIASTREAMER_LESS_2_11 TRUE)
+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
+ ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.14)
+ SET(MEDIASTREAMER_LESS_2_9 FALSE)
+ SET(MEDIASTREAMER_LESS_2_11 FALSE)
+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
SET(MEDIASTREAMER_LESS_2_9 FALSE)
SET(MEDIASTREAMER_LESS_2_11 FALSE)
+ SET(MEDIASTREAMER_LESS_2_14 FALSE)
ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
ELSE (MEDIASTREAMER_FOUND)
@@ -38,4 +45,4 @@ ELSE (MEDIASTREAMER_FOUND)
ENDIF (MEDIASTREAMER_FIND_REQUIRED)
ENDIF (MEDIASTREAMER_FOUND)
-MARK_AS_ADVANCED(MEDIASTREAMER_INCLUDE_DIR MEDIASTREAMER_LIBRARIES
MEDIASTREAMER_LESS_2_9 MEDIASTREAMER_LESS_2_11)
+MARK_AS_ADVANCED(MEDIASTREAMER_INCLUDE_DIR MEDIASTREAMER_LIBRARIES
MEDIASTREAMER_LESS_2_9 MEDIASTREAMER_LESS_2_11 MEDIASTREAMER_LESS_2_14)
Index:
kopete-16.08.1/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
===================================================================
---
kopete-16.08.1.orig/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
+++
kopete-16.08.1/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
@@ -151,15 +151,25 @@ LinphoneVoiceChannel::LinphoneVoiceChann
playport2 = PORT_UNUSED;
#ifdef _DEBUG
+#ifdef MEDIASTREAMER_LESS_2_14
ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
#else
+ ortp_set_log_level_mask(NULL,
ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
+#endif
+#else
+#ifdef MEDIASTREAMER_LESS_2_14
ortp_set_log_level_mask(ORTP_FATAL);
+#else
+ ortp_set_log_level_mask(NULL, ORTP_FATAL);
#endif
-
+#endif
+
#ifdef MEDIASTREAMER_LESS_2_9
audio_stream_ = audio_stream_new(-1, 0); /* -1 means that function will
choose some free port */
-#else
+#elif defined(MEDIASTREAMER_LESS_2_14)
audio_stream_ = audio_stream_new(-1, -1, 0); /* -1 means that function will
choose some free port */
+#else
+ audio_stream_ = audio_stream_new(NULL, -1, -1, 0); /* -1 means that function
will choose some free port */
#endif
}
@@ -344,16 +354,24 @@ void LinphoneVoiceChannel::StartRing(boo
if (engine_->GetRingWav().size() > 0)
{
LOG(LS_VERBOSE) << "incoming ring. sound file: " <<
engine_->GetRingWav().c_str() << "\n";
+#ifdef MEDIASTREAMER_LESS_2_14
ring_stream_ = ring_start (engine_->GetRingWav().c_str(), 1, sndcard);
- }
+#else
+ ring_stream_ = ring_start (NULL, engine_->GetRingWav().c_str(), 1,
sndcard);
+#endif
+ }
}
else
{
if (engine_->GetCallWav().size() > 0)
{
LOG(LS_VERBOSE) << "outgoing ring. sound file: " <<
engine_->GetCallWav().c_str() << "\n";
+#ifdef MEDIASTREAMER_LESS_2_14
ring_stream_ = ring_start (engine_->GetCallWav().c_str(), 1, sndcard);
- }
+#else
+ ring_stream_ = ring_start (NULL, engine_->GetCallWav().c_str(), 1,
sndcard);
+#endif
+ }
}
}
}
Index: kopete-16.08.1/protocols/jabber/libjingle/CMakeLists.txt
===================================================================
--- kopete-16.08.1.orig/protocols/jabber/libjingle/CMakeLists.txt
+++ kopete-16.08.1/protocols/jabber/libjingle/CMakeLists.txt
@@ -51,6 +51,10 @@ if ( MEDIASTREAMER_LESS_2_11 )
add_definitions ( -DMEDIASTREAMER_LESS_2_11 )
endif ( MEDIASTREAMER_LESS_2_11 )
+if ( MEDIASTREAMER_LESS_2_14 )
+ add_definitions ( -DMEDIASTREAMER_LESS_2_14 )
+endif ( MEDIASTREAMER_LESS_2_14 )
+
if ( CMAKE_BUILD_TYPE STREQUAL "Debug" )
add_definitions ( -D_DEBUG )
endif ( CMAKE_BUILD_TYPE STREQUAL "Debug" )
