From 23cac314a13826437a944686ca400b7f5c644864 Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bmiklautz@thinstuff.at>
Date: Fri, 29 Mar 2013 13:17:12 +0100
Subject: [PATCH 1/2] channel/tsmf: fixed gstreamer plugin build

Gstreamer wasn't build because it requires xrandr which wasn't
detected.

Fixes #1146
---
 channels/tsmf/client/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt
index e4560ab5c..a5c982415 100644
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@@ -57,10 +57,12 @@ if(WITH_FFMPEG)
 	add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "ffmpeg" "decoder")
 endif()
 
-if(WITH_XRANDR)
-	if(GSTREAMER_FOUND)
-		add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
-	endif()
+if(GSTREAMER_FOUND)
+	set(XRANDR_FEATURE_TYPE "REQUIRED")
+	set(XRANDR_FEATURE_PURPOSE "X11 randr")
+	set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension")
+	find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
+	add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
 endif()
 
 if(WITH_ALSA)

From 81a97144f1901745a3e1843f82e723f31dfd469e Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bmiklautz@thinstuff.at>
Date: Fri, 29 Mar 2013 16:17:03 +0100
Subject: [PATCH 2/2] channel/tsmf: fix for gstreamer detection

Print warning if gstreamer is there but xrandr is missing.
---
 channels/tsmf/client/CMakeLists.txt | 8 ++++++--
 cmake/FindGstreamer.cmake           | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt
index a5c982415..6624ec24a 100644
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@@ -57,12 +57,16 @@ if(WITH_FFMPEG)
 	add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "ffmpeg" "decoder")
 endif()
 
-if(GSTREAMER_FOUND)
+if(WITH_GSTREAMER)
 	set(XRANDR_FEATURE_TYPE "REQUIRED")
 	set(XRANDR_FEATURE_PURPOSE "X11 randr")
 	set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension")
 	find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
-	add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
+	if (WITH_XRANDR)
+		add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
+	else()
+		message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found")
+	endif()
 endif()
 
 if(WITH_ALSA)
diff --git a/cmake/FindGstreamer.cmake b/cmake/FindGstreamer.cmake
index 4a290227c..0d7065e1b 100644
--- a/cmake/FindGstreamer.cmake
+++ b/cmake/FindGstreamer.cmake
@@ -8,13 +8,9 @@ if(PC_GSTREAMER_0_10_FOUND AND PC_GSTREAMER_PLUGINS_BASE_0_10_FOUND)
 	set(GSTREAMER_FOUND TRUE)
 endif()
 
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSTREAMER DEFAULT_MSG GSTREAMER_FOUND)
-
 if(GSTREAMER_FOUND)
 	set(GSTREAMER_INCLUDE_DIRS ${PC_GSTREAMER_0_10_INCLUDE_DIRS} ${PC_GSTREAMER_PLUGINS_BASE_0_10_INCLUDE_DIRS})
 	set(GSTREAMER_LIBRARIES ${PC_GSTREAMER_0_10_LIBRARIES} ${PC_GSTREAMER_PLUGINS_BASE_0_10_LIBRARIES})
 endif()
 
 mark_as_advanced(GSTREAMER_FOUND GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES)
-