From 47202acc24ab8e41d6f757abf782de5c8bd3aced Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 25 Feb 2015 19:25:34 +0000 Subject: [PATCH] From Dmitry Marakasov, "While packaging osg-3.3.3 I've discovered that gstreamer detection is broken: -- Could NOT find GStreamer (missing: GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS GSTREAMER_GSTREAMER-APP_LIBRARIES GSTREAMER_GSTREAMER-PBUTILS_INCLUDE_DIRS GSTREAMER_GSTREAMER-PBUTILS_LIBRARIES) (found version "1.4.5") though all required modules are installed. There are two problems: first, module names are spelled incorrectly in root CMakeLists.txt (e.g. gstreamer-app instead of app), so variables expected for them are e.g. GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS instead of GSTREAMER_APP_INCLUDE_DIRS. Second, gstreamer base component is detected as GSTREAMER while checked later as GSTREAMER_BASE. I've uncommented the detection as GSTREAMER_BASE, but obviously that should be revisited and only one detection left. With this patch, gstreamer is detected properly and the plugins is successfully built and installed." git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14719 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeLists.txt | 2 +- CMakeModules/FindGStreamer.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f39fc323d..3abae905d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -634,7 +634,7 @@ ELSE() FIND_PACKAGE(LibVNCServer) FIND_PACKAGE(OurDCMTK) FIND_PACKAGE(FFmpeg) - FIND_PACKAGE(GStreamer COMPONENTS gstreamer-app gstreamer-pbutils) + FIND_PACKAGE(GStreamer COMPONENTS app pbutils) FIND_PACKAGE(GLIB COMPONENTS gobject) FIND_PACKAGE(DirectShow) FIND_PACKAGE(SDL2) diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake index 1270fe489..248da94f5 100644 --- a/CMakeModules/FindGStreamer.cmake +++ b/CMakeModules/FindGStreamer.cmake @@ -104,7 +104,7 @@ endif () # 1.1. Find headers and libraries FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-1.0 gst/gst.h gstreamer-1.0) -#FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) +FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0) # 1.2. Check GStreamer version