From 0da9ee2e4c0f2ddc3714c819c19961fb0d5f95e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 11 Mar 2021 08:07:45 -0500
Subject: [PATCH] Remove live555 detection

---
 CMakeLists.txt                  | 14 +-----
 cmake/Modules/FindLive555.cmake | 75 ---------------------------------
 2 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 cmake/Modules/FindLive555.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9acaedc9b..76c48f530 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,7 +169,7 @@ set(ZM_ONVIF "ON" CACHE BOOL
   "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not
     work with all cameras claiming to be ONVIF compliant. default: ON")
 set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
-  "Set to ON to skip live555 checks and force building ZM without rtsp server support. default: OFF")
+  "Set to ON to skip building ZM with rtsp server support. default: OFF")
 set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING
   "By default, ZoneMinder's Perl modules are installed into the Vendor folders,
 	as defined by your installation of Perl. You can change that here. Consult Perl's 
@@ -629,17 +629,7 @@ endif()
 #endif()
 
 if(NOT ZM_NO_RTSPSERVER)
-  find_package(Live555)
-  if(Live555_FOUND)
-    include_directories(${Live555_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_INCLUDES "${Live555_INCLUDE_DIRS}")
-    list(APPEND ZM_BIN_LIBS "${Live555_LIBRARIES}")
-    set(HAVE_RTSP_SERVER 1)
-    set(optlibsfound "${optlibsfound} libLive555")
-  else()
-    set(HAVE_RTSP_SERVER 0)
-    set(optlibsnotfound "${optlibsnotfound} libLive555")
-  endif()
+  set(HAVE_RTSP_SERVER 1)
 else()
   set(HAVE_RTSP_SERVER 0)
 endif()
diff --git a/cmake/Modules/FindLive555.cmake b/cmake/Modules/FindLive555.cmake
deleted file mode 100644
index c0f8550d1..000000000
--- a/cmake/Modules/FindLive555.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-# Try to find Live555 libraries
-# Once done this will define
-#  Live555_FOUND
-#  Live555_INCLUDE_DIRS
-#  Live555_LIBRARIES
-
-if (NOT Live555_FOUND)
-	set(_Live555_FOUND ON)
-	
-	foreach (library liveMedia BasicUsageEnvironment Groupsock UsageEnvironment)
-
-    string(TOLOWER ${library} lowercase_library)
-    
-		find_path(Live555_${library}_INCLUDE_DIR
-			NAMES
-			${library}.hh
-			${lowercase_library}.hh
-			PATHS
-			${Live555_ROOT}/${library}/include
-			${Live555_ROOT}/live/${library}/include
-			/usr/include/${library}
-			/usr/local/include/${library}
-			/usr/include/${lowercase_library}
-			/usr/local/include/${lowercase_library}
-		)
-		
-		if (Live555_${library}_INCLUDE_DIR)
-			list(APPEND _Live555_INCLUDE_DIRS ${Live555_${library}_INCLUDE_DIR})
-		else()
-			set(_Live555_FOUND OFF)
-		endif ()
-
-		foreach (mode DEBUG RELEASE)
-			find_library(Live555_${library}_LIBRARY_${mode}
-				NAMES
-				${library}
-				${lowercase_library}
-				PATHS
-				${Live555_ROOT}/lib/${mode}
-				${Live555_ROOT}/${library}
-			)
-			if (Live555_${library}_LIBRARY_${mode})
-				if (${mode} STREQUAL RELEASE) 
-					list(APPEND _Live555_LIBRARIES optimized ${Live555_${library}_LIBRARY_${mode}})
-				elseif (${mode} STREQUAL DEBUG) 
-					list(APPEND _Live555_LIBRARIES debug ${Live555_${library}_LIBRARY_${mode}})
-				else ()
-					MESSAGE(STATUS no)
-					list(APPEND _Live555_LIBRARIES ${Live555_${library}_LIBRARY_${mode}})
-				endif()
-			else()
-				set(_Live555_FOUND OFF)
-			endif ()
-		endforeach ()
-
-	endforeach ()
-
-	if (_Live555_FOUND)
-		set(Live555_INCLUDE_DIRS ${_Live555_INCLUDE_DIRS} CACHE INTERNAL "")
-		set(Live555_LIBRARIES ${_Live555_LIBRARIES} CACHE INTERNAL "")
-		set(Live555_FOUND ${_Live555_FOUND} CACHE BOOL "" FORCE)
-	endif()
-
-	include(FindPackageHandleStandardArgs)
-	# handle the QUIETLY and REQUIRED arguments and set LOGGING_FOUND to TRUE
-	# if all listed variables are TRUE
-	find_package_handle_standard_args(Live555 DEFAULT_MSG Live555_INCLUDE_DIRS Live555_LIBRARIES Live555_FOUND)
-
-	# Tell cmake GUIs to ignore the "local" variables.
-	mark_as_advanced(Live555_INCLUDE_DIRS Live555_LIBRARIES Live555_FOUND)
-endif (NOT Live555_FOUND)
-
-if (Live555_FOUND)
-	message(STATUS "Found live555")
-endif()