diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index c3c9898bf..bfc8ee904 100644 --- a/channels/tsmf/client/CMakeLists.txt +++ b/channels/tsmf/client/CMakeLists.txt @@ -20,37 +20,26 @@ define_channel_client("tsmf") message(DEPRECATION "TSMF channel is no longer maintained. Use [MS-RDPEVOR] (/video) instead.") -set(GSTREAMER_0_10_FEATURE_TYPE "OPTIONAL") -set(GSTREAMER_0_10_FEATURE_PURPOSE "multimedia") -set(GSTREAMER_0_10_FEATURE_DESCRIPTION "multimedia redirection, audio and video playback, gstreamer 0.10 version") - set(GSTREAMER_1_0_FEATURE_TYPE "RECOMMENDED") set(GSTREAMER_1_0_FEATURE_PURPOSE "multimedia") set(GSTREAMER_1_0_FEATURE_DESCRIPTION "multimedia redirection, audio and video playback") if (WIN32) set(GSTREAMER_1_0_FEATURE_TYPE "DISABLED") - set(GSTREAMER_0_10_FEATURE_TYPE "OPTIONAL") endif() if (APPLE) set(GSTREAMER_1_0_FEATURE_TYPE "OPTIONAL") if (IOS) set(GSTREAMER_1_0_FEATURE_TYPE "DISABLED") - set(GSTREAMER_0_10_FEATURE_TYPE "DISABLED") endif() endif() if (ANDROID) set(GSTREAMER_1_0_FEATURE_TYPE "DISABLED") - set(GSTREAMER_0_10_FEATURE_TYPE "DISABLED") endif() -find_feature(GStreamer_0_10 ${GSTREAMER_0_10_FEATURE_TYPE} ${GSTREAMER_0_10_FEATURE_PURPOSE} ${GSTREAMER_0_10_FEATURE_DESCRIPTION}) find_feature(GStreamer_1_0 ${GSTREAMER_1_0_FEATURE_TYPE} ${GSTREAMER_1_0_FEATURE_PURPOSE} ${GSTREAMER_1_0_FEATURE_DESCRIPTION}) -if (WITH_GSTREAMER_0_10 AND GSTREAMER_0_10_FOUND) - add_definitions(-DWITH_GSTREAMER_0_10) -endif() if (WITH_GSTREAMER_1_0 AND GSTREAMER_1_0_FOUND) add_definitions(-DWITH_GSTREAMER_1_0) endif() @@ -83,7 +72,7 @@ if(WITH_VIDEO_FFMPEG) add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "ffmpeg" "decoder") endif() -if(WITH_GSTREAMER_0_10 OR WITH_GSTREAMER_1_0) +if(WITH_GSTREAMER_1_0) set(XRANDR_FEATURE_TYPE "REQUIRED") set(XRANDR_FEATURE_PURPOSE "X11 randr") set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension") diff --git a/channels/tsmf/client/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt index f5d380cfa..01d73b280 100644 --- a/channels/tsmf/client/gstreamer/CMakeLists.txt +++ b/channels/tsmf/client/gstreamer/CMakeLists.txt @@ -17,10 +17,8 @@ define_channel_client_subsystem("tsmf" "gstreamer" "decoder") -if(NOT GSTREAMER_0_10_FOUND AND NOT GSTREAMER_1_0_FOUND) +if(NOT GSTREAMER_1_0_FOUND) message(FATAL_ERROR "GStreamer library not found, but required for TSMF module.") -elseif (GSTREAMER_0_10_FOUND AND GSTREAMER_1_0_FOUND) - message(FATAL_ERROR "GStreamer 0.10 and GStreamer 1.0 support are mutually exclusive!") endif() set(SRC "tsmf_gstreamer.c") @@ -28,9 +26,6 @@ set(SRC "tsmf_gstreamer.c") if (GSTREAMER_1_0_FOUND) set(LIBS ${GSTREAMER_1_0_LIBRARIES}) include_directories(${GSTREAMER_1_0_INCLUDE_DIRS}) -elseif (GSTREAMER_0_10_FOUND) - set(LIBS ${GSTREAMER_0_10_LIBRARIES}) - include_directories(${GSTREAMER_0_10_INCLUDE_DIRS}) endif() if(ANDROID) diff --git a/channels/tsmf/client/tsmf_decoder.c b/channels/tsmf/client/tsmf_decoder.c index b85359e43..63492318c 100644 --- a/channels/tsmf/client/tsmf_decoder.c +++ b/channels/tsmf/client/tsmf_decoder.c @@ -68,7 +68,7 @@ ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type) decoder = tsmf_load_decoder_by_name(name); } -#if defined(WITH_GSTREAMER_1_0) || defined(WITH_GSTREAMER_0_10) +#if defined(WITH_GSTREAMER_1_0) if (!decoder) decoder = tsmf_load_decoder_by_name("gstreamer"); #endif @@ -99,7 +99,7 @@ BOOL tsmf_check_decoder_available(const char* name) { decoder = tsmf_load_decoder_by_name(name); } -#if defined(WITH_GSTREAMER_1_0) || defined(WITH_GSTREAMER_0_10) +#if defined(WITH_GSTREAMER_1_0) if (!decoder) decoder = tsmf_load_decoder_by_name("gstreamer"); #endif diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index 35bc144df..4eba0ffb4 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -10,7 +10,6 @@ set (WITH_WAYLAND ON CACHE BOOL "wayland") set (WITH_KRB5 ON CACHE BOOL "Kerberos support") set (WITH_PCSC ON CACHE BOOL "PCSC") set (WITH_JPEG ON CACHE BOOL "jpeg") -set (WITH_GSTREAMER_0_10 ON CACHE BOOL "gstreamer") set (WITH_GSM ON CACHE BOOL "gsm") set (CHANNEL_URBDRC ON CACHE BOOL "urbdrc") set (CHANNEL_URBDRC_CLIENT ON CACHE BOOL "urbdrc client") diff --git a/cmake/FindGStreamer_0_10.cmake b/cmake/FindGStreamer_0_10.cmake deleted file mode 100644 index 0342f4c64..000000000 --- a/cmake/FindGStreamer_0_10.cmake +++ /dev/null @@ -1,118 +0,0 @@ -# - Try to find GStreamer -# Once done this will define -# -# GSTREAMER_0_10_FOUND - system has GStreamer -# GSTREAMER_0_10_INCLUDE_DIRS - the GStreamer include directory -# GSTREAMER_0_10_LIBRARIES - the libraries needed to use GStreamer -# GSTREAMER_0_10_DEFINITIONS - Compiler switches required for using GStreamer - -# Copyright (c) 2006, Tim Beaulen -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) - -IF (GSTREAMER_0_10_INCLUDE_DIRS AND GSTREAMER_0_10_LIBRARIES AND GSTREAMER_0_10_BASE_LIBRARY AND GSTREAMER_0_10_INTERFACE_LIBRARY) - # in cache already - SET(GSTREAMER_0_10_FIND_QUIETLY TRUE) -ELSE (GSTREAMER_0_10_INCLUDE_DIRS AND GSTREAMER_0_10_LIBRARIES AND GSTREAMER_0_10_BASE_LIBRARY AND GSTREAMER_0_10_INTERFACE_LIBRARY) - SET(GSTREAMER_0_10_FIND_QUIETLY FALSE) -ENDIF (GSTREAMER_0_10_INCLUDE_DIRS AND GSTREAMER_0_10_LIBRARIES AND GSTREAMER_0_10_BASE_LIBRARY AND GSTREAMER_0_10_INTERFACE_LIBRARY) - -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) - PKG_CHECK_MODULES(PC_GSTREAMER_0_10 QUIET gstreamer-0.10) - #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_0_10_INCLUDE_DIRSS}") - #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_0_10_LIBRARY_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_0_10_CFLAGS_OTHER}") - SET(GSTREAMER_0_10_DEFINITIONS ${PC_GSTREAMER_0_10_CFLAGS_OTHER}) -ENDIF (NOT WIN32) - -FIND_PATH(GSTREAMER_0_10_INCLUDE_DIRS gst/gst.h - PATHS - ${PC_GSTREAMER_0_10_INCLUDEDIR} - ${PC_GSTREAMER_0_10_INCLUDE_DIRSS} - #PATH_SUFFIXES gst - ) - -FIND_LIBRARY(GSTREAMER_0_10_LIBRARIES NAMES gstreamer-0.10 - PATHS - ${PC_GSTREAMER_0_10_LIBDIR} - ${PC_GSTREAMER_0_10_LIBRARY_DIRS} - ) - -FIND_LIBRARY(GSTREAMER_0_10_BASE_LIBRARY NAMES gstbase-0.10 - PATHS - ${PC_GSTREAMER_0_10_LIBDIR} - ${PC_GSTREAMER_0_10_LIBRARY_DIRS} - ) - -FIND_LIBRARY(GSTREAMER_0_10_APP_LIBRARY NAMES gstapp-0.10 - PATHS - ${PC_GSTREAMER_0_10_LIBDIR} - ${PC_GSTREAMER_0_10_LIBRARY_DIRS} - ) - -FIND_LIBRARY(GSTREAMER_0_10_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 - PATHS - ${PC_GSTREAMER_0_10_LIBDIR} - ${PC_GSTREAMER_0_10_LIBRARY_DIRS} - ) - -FIND_PACKAGE(Glib REQUIRED) -FIND_PACKAGE(LibXml2 REQUIRED) - -IF (GSTREAMER_0_10_INCLUDE_DIRS) - #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_0_10_INCLUDE_DIRS}") -ELSE (GSTREAMER_0_10_INCLUDE_DIRS) - MESSAGE(STATUS "GStreamer: WARNING: include dir not found") -ENDIF (GSTREAMER_0_10_INCLUDE_DIRS) - -IF (GSTREAMER_0_10_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_0_10_LIBRARIES}") -ELSE (GSTREAMER_0_10_LIBRARIES) - MESSAGE(STATUS "GStreamer: WARNING: library not found") -ENDIF (GSTREAMER_0_10_LIBRARIES) - -IF (GSTREAMER_0_10_INTERFACE_LIBRARY) - #MESSAGE(STATUS "DEBUG: Found GStreamer interface library: ${GSTREAMER_0_10_INTERFACE_LIBRARY}") -ELSE (GSTREAMER_0_10_INTERFACE_LIBRARY) - MESSAGE(STATUS "GStreamer: WARNING: interface library not found") -ENDIF (GSTREAMER_0_10_INTERFACE_LIBRARY) - -set(_GSTREAMER_0_10_REQUIRED_VARS - Glib_INCLUDE_DIRS - Glib_LIBRARIES - LIBXML2_INCLUDE_DIR - LIBXML2_LIBRARIES - GSTREAMER_0_10_INCLUDE_DIRS - GSTREAMER_0_10_LIBRARIES - VERSION_OK - GSTREAMER_0_10_BASE_INCLUDE_DIRS - GSTREAMER_0_10_BASE_LIBRARY - GSTREAMER_0_10_INTERFACE_INCLUDE_DIRS - GSTREAMER_0_10_INTERFACE_LIBRARY) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSTREAMER_0_10 DEFAULT_MSG - GSTREAMER_0_10_LIBRARIES - GSTREAMER_0_10_INCLUDE_DIRS - GSTREAMER_0_10_BASE_LIBRARY - GSTREAMER_0_10_INTERFACE_LIBRARY) - -list(APPEND GSTREAMER_0_10_INCLUDE_DIRS ${Glib_INCLUDE_DIRS}) -list(APPEND GSTREAMER_0_10_LIBRARIES ${Glib_LIBRARIES}) -list(APPEND GSTREAMER_0_10_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) -list(APPEND GSTREAMER_0_10_LIBRARIES ${LIBXML2_LIBRARIES}) -list(APPEND GSTREAMER_0_10_INCLUDE_DIRS ${GSTREAMER_0_10_BASE_INCLUDE_DIR}) -list(APPEND GSTREAMER_0_10_LIBRARIES ${GSTREAMER_0_10_BASE_LIBRARY}) -list(APPEND GSTREAMER_0_10_INCLUDE_DIRS ${GSTREAMER_0_10_APP_INCLUDE_DIR}) -list(APPEND GSTREAMER_0_10_LIBRARIES ${GSTREAMER_0_10_APP_LIBRARY}) -list(APPEND GSTREAMER_0_10_INCLUDE_DIRS ${GSTREAMER_0_10_INTERFACE_INCLUDE_DIR}) -list(APPEND GSTREAMER_0_10_LIBRARIES ${GSTREAMER_0_10_INTERFACE_LIBRARY}) - -MARK_AS_ADVANCED(GSTREAMER_0_10_INCLUDE_DIRS GSTREAMER_0_10_LIBRARIES GSTREAMER_0_10_BASE_LIBRARY GSTREAMER_0_10_INTERFACE_LIBRARY) -