RED-560: Imprudence doesn't compile when configured with --standalone

See http://redmine.imprudenceviewer.org/issues/560

4 files changed, 37 insertions, 107 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index f5f9c03..9c5e9f7 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,12 +1,22 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-  # Maybe libxml and glib should have their own .cmake files
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
+  pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
+  pkg_check_modules(GSTREAMER_VIDEO REQUIRED gstreamer-video-0.10)
+
+else (STANDALONE)
+
+  # libxml and glib should have their own .cmake files
   use_prebuilt_binary(libxml)
   use_prebuilt_binary(glib)
 
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  set(GSTREAMER_VIDEO_FOUND ON FORCE BOOL)
 
   use_prebuilt_binary(gstreamer)
   use_prebuilt_binary(gstreamer-plugins)
@@ -105,9 +115,11 @@ else (WINDOWS)
 
 endif (WINDOWS)
 
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+endif (STANDALONE)
+
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND AND GSTREAMER_VIDEO_FOUND)
   set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND AND GSTREAMER_VIDEO_FOUND)
 
 if (GSTREAMER)
   add_definitions(-DLL_GSTREAMER_ENABLED=1)
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index 8a36a69..e7769db 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -10,4 +10,5 @@ set(LLMEDIA_LIBRARIES
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${GSTREAMER_VIDEO_LIBRARIES}
     )
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 4f0e0cc..98c7ddc 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,113 +1,28 @@
 # -*- cmake -*-
-
-include(Variables)
 include(Linking)
+include(Prebuilt)
 
-set(OPENAL ON CACHE BOOL "Enable OpenAL")
-
+if (LINUX)
+  set(OPENAL ON CACHE BOOL "Enable OpenAL")
+else (LINUX)
+  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
+endif (LINUX)
 
 if (OPENAL)
-
-  # message(STATUS "Building with OpenAL audio support")
-
-  # OPENAL_LIB
-  use_prebuilt_binary(openal)
-  
-  if (WINDOWS)
-    set(OPENAL_LIB
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libOpenAL32.dll.a.lib
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libOpenAL32.dll.a.lib
-      )
-  
-  elseif (DARWIN)
-    # Look for for system's OpenAL.framework
-    # Nemu: This code has never looked for the system's OpenAL.framework
-    # Nemu: should it?
-    set(OPENAL_LIB ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.1.dylib)
-  else (WINDOWS)
-    set(OPENAL_LIB openal)
-  endif (WINDOWS)
-  
-  if (NOT OPENAL_LIB)
-    message(FATAL_ERROR "OpenAL not found!")
-  else (NOT OPENAL_LIB)
-    # message(STATUS "OpenAL found: ${OPENAL_LIB}")
-  endif (NOT OPENAL_LIB)
-
-
-
-  # OPENAL_INCLUDE_DIR
-
-  if (DARWIN)
-    set(OPENAL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/AL)
-  else (DARWIN)
-    find_path(OPENAL_INCLUDE_DIR
-      NAMES al.h
-      PATHS ${LIBS_PREBUILT_DIR}/include/AL
-      )
-  endif (DARWIN)
-
-  if (NOT OPENAL_INCLUDE_DIR)
-    message(FATAL_ERROR "al.h not found!")
-  else (NOT OPENAL_INCLUDE_DIR)
-    # message(STATUS "al.h found in: ${OPENAL_INCLUDE_DIR}")
-  endif (NOT OPENAL_INCLUDE_DIR)
-
-
-
-  # ALUT_LIB
-
-  if (WINDOWS)
-   set(ALUT_LIB
-         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib
-         debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
-     )
-  elseif (DARWIN)
-    find_library( ALUT_LIB
-      NAMES alut.0
-      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-      NO_DEFAULT_PATH
-      )
-  else (WINDOWS)
-    set(ALUT_LIB alut)
-  endif (WINDOWS)
-
-  if (NOT ALUT_LIB)
-    message(FATAL_ERROR "ALUT not found!")
-  else (NOT ALUT_LIB)
-    # message(STATUS "ALUT found: ${ALUT_LIB}")
-  endif (NOT ALUT_LIB)
-
-
-
-  # ALUT_INCLUDE_DIR
-
-  find_path(ALUT_INCLUDE_DIR
-    NAMES alut.h
-    PATHS ${OPENAL_INCLUDE_DIR}
-    )
-
-  if (NOT ALUT_INCLUDE_DIR)
-    message(FATAL_ERROR "alut.h not found!")
-  else (NOT ALUT_INCLUDE_DIR)
-    # message(STATUS "alut.h found in: ${ALUT_INCLUDE_DIR}")
-  endif (NOT ALUT_INCLUDE_DIR)
-
-
-
+  if (STANDALONE)
+    include(FindPkgConfig)
+    include(FindOpenAL)
+    pkg_check_modules(OPENAL_LIB REQUIRED openal)
+    pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
+  else (STANDALONE)
+    use_prebuilt_binary(openal-soft)
+  endif (STANDALONE)
   set(OPENAL_LIBRARIES
-    ${OPENAL_LIB}
-    ${ALUT_LIB}
-    )
-
-  set(OPENAL_INCLUDE_DIRS
-    ${OPENAL_INCLUDE_DIR}
-    ${ALUT_INCLUDE_DIR}
-    )
-  
-
-  set(OPENAL_FOUND TRUE CACHE BOOL
-    "Found OpenAL and ALUT libraries successfully"
+    openal
+    alut
     )
+endif (OPENAL)
 
+if (OPENAL)
+  message(STATUS "Building with OpenAL audio support")
 endif (OPENAL)
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index c7b5cd1..f3c8e30 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -15,6 +15,7 @@ include(Mozlib)
 include_directories(
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}
+    ${GSTREAMER_VIDEO_INCLUDE_DIRS}
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLIMAGE_INCLUDE_DIRS}
@@ -75,5 +76,6 @@ target_link_libraries(
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${GSTREAMER_VIDEO_LIBRARIES}
     ${QUICKTIME_LIBRARY}
     )