Sync with upstream, misc cleanup

cmake/modules/CheckSubmodule.cmake

@@ -1,5 +1,4 @@
-# Utility for validating and -- if needed -- cloning a git submodule
-# This project depends on "CheckCommand", which is part of the LMMS project.
+# Utility for validating and, if needed, cloning a git submodule
 #
 # Looks for a relative file inside source directory of current target
 # - Attempts to clone with git if it's missing
@@ -16,8 +15,6 @@
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-INCLUDE(CheckCommand)
-
 MACRO(CHECK_SUBMODULE)
 	SET(ARG_LIST "${ARGN}")
 	LIST(LENGTH ARG_LIST ARG_LEN)
@@ -38,11 +35,11 @@ MACRO(CHECK_SUBMODULE)
 
 	# Attempt to do lazy clone
 	IF(NOT EXISTS "${ABSOLUTE_FILE}")
+		FIND_PACKAGE(Git REQUIRED)
 		MESSAGE("-- Submodule '${SUBMODULE_NAME}' missing")
 		MESSAGE("--   Cloning '${SUBMODULE_NAME}' using git")
-		CHECK_COMMAND(git)
 		EXECUTE_PROCESS(
-			COMMAND git submodule update --init --recursive
+			COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
 			WORKING_DIRECTORY "${SUBMODULE_PATH}"
 			ERROR_VARIABLE GIT_STDERR
 		)

plugins/LadspaEffect/swh/CMakeLists.txt

@@ -1,25 +1,12 @@
-INCLUDE(CheckCommand)
 INCLUDE(CheckSubmodule)
 
 CHECK_SUBMODULE(swh/configure.ac)
-CHECK_COMMAND(perl)
-CHECK_COMMAND(patch)
-
-MESSAGE("\nPreparing SWH LADSPA submodule\n--------------------------")
-
-# FIXME:  Fixes should be moved upstream to github.com/swh/ladspa
-SET(PLUGIN_BLACKLIST
-	${CMAKE_CURRENT_SOURCE_DIR}/swh/lookahead_limiter_1435.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/swh/lookahead_limiter_const_1906.xml
-)
 
 # Patch swh to compile with various enviroments
 # FIXME: Fixes should be moved upstream to github.com/swh/ladspa
 MESSAGE("* Patching source")
 EXECUTE_PROCESS(
-	COMMAND patch -N makestub.pl ../makestub.pl.patch
 	COMMAND patch -N util/blo.c ../blo.c.patch
-	COMMAND rm -f *.orig *.rej
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/swh
 	ERROR_VARIABLE PATCH_ERROR
 )
@@ -53,12 +40,7 @@ SET(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}")
 
 # Loop over every XML file
 FILE(GLOB XML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/swh/*.xml")
-LIST(LENGTH XML_SOURCES XML_COUNT)
-LIST(REMOVE_ITEM XML_SOURCES ${PLUGIN_BLACKLIST})
 LIST(SORT XML_SOURCES)
-LIST(LENGTH XML_SOURCES XML_WHITELIST)
-LIST(LENGTH PLUGIN_BLACKLIST BLACKLIST_COUNT)
-MESSAGE("* ${XML_WHITELIST} of ${XML_COUNT} XML files (${BLACKLIST_COUNT} blacklisted)")
 FOREACH(_item ${XML_SOURCES})
 	# Get library name and (soon to be) C file
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)