openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File ms2-14.patch of Package kopete (Revision b4081e66b22e201b0e72c856430b7862)

Currently displaying revision b4081e66b22e201b0e72c856430b7862 , Show latest

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" )

Places

File ms2-14.patch of Package kopete (Revision b4081e66b22e201b0e72c856430b7862)

Places