From 1a9a94c291446a3543ba0cf52afe43ce615ef8d1 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 28 Feb 2021 07:28:29 +0100 Subject: [PATCH] Remove VLC --- indra/media_plugins/CMakeLists.txt | 4 +++- indra/newview/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 10560cb8ba..f1b617baa4 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -8,8 +8,10 @@ if (LINUX) #add_subdirectory(example) if( GLIB_FOUND ) add_subdirectory(gstreamer10) + else() + MESSAGE( "Building without gstreamer (missing GLIB)" ) endif() - add_subdirectory(libvlc) + #add_subdirectory(libvlc) add_subdirectory(cef) endif (LINUX) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 26d1a4492c..d8e99560c1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2554,8 +2554,8 @@ else (NOT ENABLE_MEDIA_PLUGINS) linux-crash-logger SLPlugin media_plugin_cef - #media_plugin_gstreamer10 - media_plugin_libvlc + media_plugin_gstreamer10 + #media_plugin_libvlc llcommon ) endif (NOT ENABLE_MEDIA_PLUGINS)