qtwrapper: Enable direct builds on Linux

Refs #69938

CMakeLists.txt

@@ -134,6 +134,11 @@ IF(${ENABLE_LIBWRAP} MATCHES true)
    MESSAGE("Compiling for OS X: LibWrap enabled, Qt5 enabled.")
 
    INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/qtwrapper/)
+
+   IF(${VERBOSE_IPC} MATCHES true)
+      MESSAGE("Adding more debug output")
+      ADD_DEFINITIONS(-DVERBOSE_IPC=true)
+   ENDIF()
 ENDIF()
 
 IF (${RING_FOUND} MATCHES "true")
@@ -150,7 +155,7 @@ FIND_PACKAGE(Qt5Core REQUIRED)
 FIND_PACKAGE(Qt5DBus)
 # ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=1)
 
-SET(GENERIC_LIB_VERSION "0.1.0")
+SET(GENERIC_LIB_VERSION "0.2.0")
 
 INCLUDE_DIRECTORIES(SYSTEM ${QT_INCLUDES} )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

cmake/FindRing.cmake

@@ -15,9 +15,26 @@ ELSE()
 ENDIF()
 
 SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
+
+FIND_LIBRARY(ring_BIN NAMES ring
+   PATHS ${RING_BUILD_DIR}/.libs
+   PATHS ${CMAKE_INSTALL_PREFIX}/lib
+   PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+)
+
+# Try a static version too
+IF(${ring_BIN} MATCHES "")
+   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib")
+
    FIND_LIBRARY(ring_BIN NAMES ring
       PATHS ${RING_BUILD_DIR}/.libs
-             PATHS ${CMAKE_INSTALL_PREFIX}/libexec )
+      PATHS ${CMAKE_INSTALL_PREFIX}/lib
+      PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+   )
+
+   ADD_DEFINITIONS(-fPIC)
+
+ENDIF()
 
 MESSAGE("Ring daemon header is in " ${ring_INCLUDE_DIRS})
 MESSAGE("Ring library path is " ${ring_BIN})

xml/callmanager-introspec.xml

@@ -507,8 +507,9 @@
             </arg>
             <arg type="i" name="code">
               <tp:docstring>
-                The SIP or IAX2 message code
+                The optional account-type specific message code. 0 if not set.
               </tp:docstring>
+              <tp:added version="2.0.0" />
             </arg>
         </signal>
 

xml/videomanager-introspec.xml

@@ -60,7 +60,7 @@
                     A media resource locator (MRL).
                     Currently, the following are supported:
                     <ul>
-                        <li>v4l2://DEVICE</li>
+                        <li>camera://DEVICE</li>
                         <li>display://DISPLAY_NAME[ WIDTHxHEIGHT]</li>
                         <li>file://IMAGE_PATH</li>
                     </ul>