Updated sndfile

externals/libsndfile/cmake/SndFileConfig.cmake

@@ -1,7 +1,7 @@
-set(SndFile_VERSION 1.2.0)
+set(SndFile_VERSION 1.2.2)
 set(SndFile_VERSION_MAJOR 1)
 set(SndFile_VERSION_MINOR 2)
-set(SndFile_VERSION_PATCH 0)
+set(SndFile_VERSION_PATCH 2)
 
 set (SndFile_WITH_EXTERNAL_LIBS 1)
 set (SndFile_WITH_MPEG 1)
@@ -34,6 +34,10 @@ endmacro()
 
 include (CMakeFindDependencyMacro)
 
+if (NOT TRUE)
+	list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+endif ()
+
 if (SndFile_WITH_EXTERNAL_LIBS AND NOT TRUE)
 	find_dependency (Ogg 1.3)
 	find_dependency (Vorbis)
@@ -43,7 +47,11 @@ endif ()
 
 if (SndFile_WITH_MPEG AND NOT TRUE)
 	find_dependency (mp3lame)
-	find_dependency (MPG123)
+	find_dependency (mpg123)
+endif ()
+
+if (NOT TRUE)
+	list (REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 endif ()
 
 include (${CMAKE_CURRENT_LIST_DIR}/SndFileTargets.cmake)

externals/libsndfile/cmake/SndFileConfigVersion.cmake

@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "1.2.0")
+set(PACKAGE_VERSION "1.2.2")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("1.2.0" MATCHES "^([0-9]+)\\.")
+  if("1.2.2" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "1.2.0")
+    set(CVF_VERSION_MAJOR "1.2.2")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)
@@ -52,11 +52,6 @@ else()
 endif()
 
 
-# if the installed project requested no architecture check, don't perform the check
-if("FALSE")
-  return()
-endif()
-
 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "4" STREQUAL "")
   return()

externals/libsndfile/cmake/SndFileTargets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.22)
+cmake_policy(VERSION 2.8.3...3.24)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------

externals/libsndfile/include/sndfile.hh

@@ -100,6 +100,11 @@ class SndfileHandle
 			SndfileHandle (const SndfileHandle &orig) ;
 			SndfileHandle & operator = (const SndfileHandle &rhs) ;
 
+#if (__cplusplus >= 201100L)
+			SndfileHandle (SndfileHandle &&orig) noexcept ;
+			SndfileHandle & operator = (SndfileHandle &&rhs) noexcept ;
+#endif
+
 		/* Mainly for debugging/testing. */
 		int refCount (void) const { return (p == SF_NULL) ? 0 : p->ref ; }
 
@@ -288,7 +293,32 @@ SndfileHandle::operator = (const SndfileHandle &rhs)
 		++ p->ref ;
 
 	return *this ;
-} /* SndfileHandle assignment operator */
+} /* SndfileHandle copy assignment */
+
+#if (__cplusplus >= 201100L)
+
+inline
+SndfileHandle::SndfileHandle (SndfileHandle &&orig) noexcept
+: p (orig.p)
+{
+	orig.p = SF_NULL ;
+} /* SndfileHandle move constructor */
+
+inline SndfileHandle &
+SndfileHandle::operator = (SndfileHandle &&rhs) noexcept
+{
+	if (&rhs == this)
+		return *this ;
+	if (p != SF_NULL && -- p->ref == 0)
+		delete p ;
+
+	p = rhs.p ;
+	rhs.p = SF_NULL ;
+
+	return *this ;
+} /* SndfileHandle move assignment */
+
+#endif
 
 inline int
 SndfileHandle::error (void) const