telepathy-qt: Kill the last bits of Farsight
Dario Freddi
drf at kemper.freedesktop.org
Sun Jul 14 16:52:00 PDT 2013
Module: telepathy-qt
Branch: master
Commit: 0f20582acc1dd952cde1bff9a1a2c093c1da9f2a
URL: http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=0f20582acc1dd952cde1bff9a1a2c093c1da9f2a
Author: Dario Freddi <dario.freddi at ispirata.com>
Date: Mon Jul 15 01:24:44 2013 +0200
Kill the last bits of Farsight
---
CMakeLists.txt | 25 ++-------------
TelepathyQt/main.dox | 4 +-
cmake/modules/FindTelepathyFarsight.cmake | 49 -----------------------------
cmake/modules/TelepathyDist.cmake | 20 ++++++------
4 files changed, 15 insertions(+), 83 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e52f27..e72f559 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,6 @@ endif (${TP_QT_NANO_VERSION} EQUAL 0)
option(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT "Enable compilation of experimental and unstable service side bindings for Telepathy-Qt" FALSE)
# Add an option for compiling examples
option(ENABLE_EXAMPLES "Enable compilation of examples for Telepathy-Qt" TRUE)
-# Add an option for compiling Farsight (disabled by default)
-option(ENABLE_FARSIGHT "Enable compilation of Farsight bindings (deprecated)" FALSE)
# Add an option for compiling Farstream
option(ENABLE_FARSTREAM "Enable compilation of Farstream bindings" TRUE)
# Add an option for building tests
@@ -183,7 +181,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
"http://www.python.org/" FALSE ""
"Needed to build some additional unit tests")
-if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
+if(ENABLE_TESTS OR ENABLE_FARSTREAM)
# Find telepathy-glib
set(TELEPATHY_GLIB_MIN_VERSION 0.18.0)
find_package(TelepathyGlib)
@@ -205,16 +203,6 @@ if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
find_package(LibXml2)
endif()
-if(ENABLE_FARSIGHT)
- # Find tp-farsight
- set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
- find_package(TelepathyFarsight)
- macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
- "A Framework for dealing with audio/video conferencing protocols"
- "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
- "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
-endif()
-
if(ENABLE_FARSTREAM)
# Find tp-farstream
set(FARSTREAM_MIN_VERSION "0.1.0")
@@ -233,22 +221,15 @@ if(ENABLE_FARSTREAM)
"Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
endif()
-if(ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
+if(ENABLE_FARSTREAM)
# Find GStreamer
find_package(GStreamer)
macro_log_feature(GSTREAMER_FOUND "GStreamer"
"An open source multimedia framework"
- "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
+ "Needed, together with Tp-Farstream, to build telepathy-qt-farstream and some additional examples"
"http://www.gstreamer.net/" FALSE)
endif()
-# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
- set (FARSIGHT_COMPONENTS_FOUND 1)
-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
- set (FARSIGHT_COMPONENTS_FOUND 0)
-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
-
# Build TelepathyQt-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found
if (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM)
set (FARSTREAM_COMPONENTS_FOUND 1)
diff --git a/TelepathyQt/main.dox b/TelepathyQt/main.dox
index 3d5e0aa..faf4a9e 100644
--- a/TelepathyQt/main.dox
+++ b/TelepathyQt/main.dox
@@ -80,8 +80,8 @@
*
* and to build the example VoIP call UI (examples/call), you'll need:
* \li telepathy-glib <http://telepathy.freedesktop.org/releases/telepathy-glib/>
- * \li telepathy-farsight
- * <http://telepathy.freedesktop.org/releases/telepathy-farsight/>
+ * \li telepathy-farstream
+ * <http://telepathy.freedesktop.org/releases/telepathy-farstream/>
* \li GStreamer <http://gstreamer.freedesktop.org/>\n
*
* Building also requires the cmake build system.
diff --git a/cmake/modules/FindTelepathyFarsight.cmake b/cmake/modules/FindTelepathyFarsight.cmake
deleted file mode 100644
index 65215d6..0000000
--- a/cmake/modules/FindTelepathyFarsight.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# - Try to find Telepathy-Farsight
-# Once done this will define
-#
-# TELEPATHY_FARSIGHT_FOUND - system has TelepathyFarsight
-# TELEPATHY_FARSIGHT_INCLUDE_DIR - the TelepathyFarsight include directory
-# TELEPATHY_FARSIGHT_LIBRARIES - the libraries needed to use TelepathyFarsight
-# TELEPATHY_FARSIGHT_DEFINITIONS - Compiler switches required for using TelepathyFarsight
-
-# Copyright (c) 2010, Dario Freddi <dario.freddi at collabora.co.uk>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-if (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES)
- # in cache already
- set(TelepathyFarsight_FIND_QUIETLY TRUE)
-else (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES)
- set(TelepathyFarsight_FIND_QUIETLY FALSE)
-endif (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES)
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the find_path() and find_library() calls
- find_package(PkgConfig)
- if (TELEPATHY_FARSIGHT_MIN_VERSION)
- PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight>=${TELEPATHY_FARSIGHT_MIN_VERSION})
- else (TELEPATHY_FARSIGHT_MIN_VERSION)
- PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight)
- endif (TELEPATHY_FARSIGHT_MIN_VERSION)
- set(TELEPATHY_FARSIGHT_DEFINITIONS ${PC_TELEPATHY_FARSIGHT_CFLAGS_OTHER})
-endif (NOT WIN32)
-
-find_path(TELEPATHY_FARSIGHT_INCLUDE_DIR telepathy-farsight/channel.h
- PATHS
- ${PC_TELEPATHY_FARSIGHT_INCLUDEDIR}
- ${PC_TELEPATHY_FARSIGHT_INCLUDE_DIRS}
- PATH_SUFFIXES telepathy-1.0
- )
-
-find_library(TELEPATHY_FARSIGHT_LIBRARIES NAMES telepathy-farsight
- PATHS
- ${PC_TELEPATHY_FARSIGHT_LIBDIR}
- ${PC_TELEPATHY_FARSIGHT_LIBRARY_DIRS}
- )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TelepathyFarsight DEFAULT_MSG TELEPATHY_FARSIGHT_LIBRARIES
- TELEPATHY_FARSIGHT_INCLUDE_DIR)
-
-mark_as_advanced(TELEPATHY_FARSIGHT_INCLUDE_DIR TELEPATHY_FARSIGHT_LIBRARIES)
diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake
index 89d7071..7c179fd 100644
--- a/cmake/modules/TelepathyDist.cmake
+++ b/cmake/modules/TelepathyDist.cmake
@@ -78,31 +78,31 @@ if (ENABLE_CPACK)
#name components
set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt main components")
- set(CPACK_COMPONENT_FARSIGHT_DISPLAY_NAME "TelepathyQt Farsight support")
+ set(CPACK_COMPONENT_FARSTREAM_DISPLAY_NAME "TelepathyQt Farstream support")
set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt")
- set(CPACK_COMPONENT_FARSIGHT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farsight")
+ set(CPACK_COMPONENT_FARSTREAM_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farstream")
#components description
set(CPACK_COMPONENT_MAINLIBRARY_DESCRIPTION
"The main TelepathyQt library")
- set(CPACK_COMPONENT_FARSIGHT_DESCRIPTION
- "The TelepathyQt-Farsight library")
+ set(CPACK_COMPONENT_FARSTREAM_DESCRIPTION
+ "The TelepathyQt-Farstream library")
set(CPACK_COMPONENT_HEADERS_DESCRIPTION
"Development files for TelepathyQt")
- set(CPACK_COMPONENT_FARSIGHT_HEADERS_DESCRIPTION
- "Development files for TelepathyQt-Farsight")
+ set(CPACK_COMPONENT_FARSTREAM_HEADERS_DESCRIPTION
+ "Development files for TelepathyQt-Farstream")
set(CPACK_COMPONENT_HEADERS_DEPENDS mainlibrary)
- set(CPACK_COMPONENT_FARSIGHT_DEPENDS mainlibrary)
- set(CPACK_COMPONENT_FARSIGHT_HEADERS_DEPENDS mainlibrary farsight)
+ set(CPACK_COMPONENT_FARSTREAM_DEPENDS mainlibrary)
+ set(CPACK_COMPONENT_FARSTREAM_HEADERS_DEPENDS mainlibrary farstream)
#installation types
set(CPACK_ALL_INSTALL_TYPES User Developer Minimal)
set(CPACK_COMPONENT_MAINLIBRARY_INSTALL_TYPES User Developer Minimal)
- set(CPACK_COMPONENT_FARSIGHT_INSTALL_TYPES User Developer)
+ set(CPACK_COMPONENT_FARSTREAM_INSTALL_TYPES User Developer)
set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer)
- set(CPACK_COMPONENT_FARSIGHT_HEADERS_INSTALL_TYPES Developer)
+ set(CPACK_COMPONENT_FARSTREAM_HEADERS_INSTALL_TYPES Developer)
# Leave this as the last declaration, always!!!
include(CPack)
More information about the telepathy-commits
mailing list