libobs,cmake: Replace vendored SIMD Everywhere by prefix/system install

SIMD Everywhere finder needs to be installed alongside libobs CMake
package since its headers depends on it.

macOS AVX intrinsics is included to make sure that AVX defines are
present.

.github/scripts/utils.zsh/setup_ubuntu

@@ -93,6 +93,7 @@ sudo apt-get install -y --no-install-recommends \
   libgl1-mesa-dev \
   libjansson-dev \
   uthash-dev \
+  libsimde-dev \
   libluajit-5.1-dev python3-dev \
   libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev \
   libxcb-composite0-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev \

build-aux/com.obsproject.Studio.json

@@ -65,6 +65,7 @@
         "modules/50-vpl-gpu-rt.json",
         "modules/90-asio.json",
         "modules/90-nlohmann-json.json",
+        "modules/90-simde.json",
         "modules/90-uthash.json",
         "modules/90-websocketpp.json",
         "modules/99-cef.json",

build-aux/modules/90-simde.json

@@ -0,0 +1,16 @@
+{
+    "name": "simde",
+    "buildsystem": "meson",
+    "builddir": true,
+    "config-opts": [
+        "-Dtests=false"
+    ],
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/simd-everywhere/simde.git",
+            "tag": "v0.8.2",
+            "commit": "71fd833d9666141edcd1d3c109a80e228303d8d7"
+        }
+    ]
+}

cmake/Modules/FindSIMDE.cmake

@@ -0,0 +1,96 @@
+#[=======================================================================[.rst
+FindSIMDE
+---------
+
+FindModule for SIMD Everywhere
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``SIMDE::SIMDE``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``SIMDE_FOUND``
+  True, if headers were found.
+``SIMDE_VERSION``
+  Detected version of found SIMDE Everywhere.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``SIMDE_INCLUDE_DIR``
+  Directory containing ``simde/simde-common.h``.
+
+#]=======================================================================]
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(PC_SIMDE QUIET simde)
+endif()
+
+find_path(
+  SIMDE_INCLUDE_DIR
+  NAMES simde/simde-common.h
+  HINTS ${PC_SIMDE_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include
+  DOC "SIMD Everywhere include directory")
+
+if(EXISTS "${SIMDE_INCLUDE_DIR}/simde/simde-common.h")
+  file(STRINGS "${SIMDE_INCLUDE_DIR}/simde/simde-common.h" _version_string
+       REGEX "^.*VERSION_(MAJOR|MINOR|MICRO)[ \t]+[0-9]+[ \t]*$")
+
+  string(REGEX REPLACE ".*VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_MINOR[ \t]+([0-9]+).*" "\\1" _version_minor "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_MICRO[ \t]+([0-9]+).*" "\\1" _version_release "${_version_string}")
+
+  set(SIMDE_VERSION "${_version_major}.${_version_minor}.${_version_release}")
+  unset(_version_major)
+  unset(_version_minor)
+  unset(_version_release)
+else()
+  if(NOT SIMDE_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find SIMD Everywhere version.")
+  endif()
+  set(SIMDE_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(SIMDE_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(SIMDE_ERROR_REASON "Ensure SIMD Everywhere is available in local library paths.")
+endif()
+
+find_package_handle_standard_args(
+  SIMDE
+  REQUIRED_VARS SIMDE_INCLUDE_DIR
+  VERSION_VAR SIMDE_VERSION REASON_FAILURE_MESSAGE "${SIMDE_ERROR_REASON}")
+mark_as_advanced(SIMDE_INCLUDE_DIR)
+unset(SIMDE_ERROR_REASON)
+
+if(SIMDE_FOUND)
+  if(NOT TARGET SIMDE::SIMDE)
+    add_library(SIMDE::SIMDE INTERFACE IMPORTED)
+    set_target_properties(SIMDE::SIMDE PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${SIMDE_INCLUDE_DIR}")
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  SIMDE PROPERTIES
+  URL "https://github.com/simd-everywhere/simde"
+  DESCRIPTION "Implementations of SIMD instruction sets for systems which don't natively support them. ")

cmake/Modules/ObsHelpers.cmake

@@ -291,6 +291,14 @@ function(export_target target)
     DESTINATION ${OBS_CMAKE_DESTINATION}/${target}
     COMPONENT obs_libraries
     ${_EXCLUDE})
+
+  if (target STREQUAL libobs)
+    install (
+      FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/FindSIMDE.cmake"
+      DESTINATION ${OBS_CMAKE_DESTINATION}/${target}/finders
+      COMPONENT obs_libraries
+      ${_EXCLUDE})
+  endif()
 endfunction()
 
 # Helper function to define available graphics modules for targets

cmake/Modules/ObsHelpers_Windows.cmake

@@ -281,6 +281,14 @@ function(export_target target)
     DESTINATION ${OBS_CMAKE_DESTINATION}
     COMPONENT obs_libraries
     EXCLUDE_FROM_ALL)
+
+  if (target STREQUAL libobs)
+    install (
+      FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/FindSIMDE.cmake"
+      DESTINATION ${OBS_CMAKE_DESTINATION}/finders
+      COMPONENT obs_libraries
+      EXCLUDE_FROM_ALL)
+  endif()
 endfunction()
 
 # Helper function to do additional setup for browser source plugin

cmake/Modules/ObsHelpers_macOS.cmake

@@ -415,6 +415,14 @@ function(export_framework_target)
     DESTINATION Frameworks/$<TARGET_FILE_BASE_NAME:${target}>.framework/Resources/cmake
     COMPONENT obs_libraries
     EXCLUDE_FROM_ALL)
+
+  if (target STREQUAL libobs)
+    install (
+      FILES "${CMAKE_SOURCE_DIR}/cmake/Modules/FindSIMDE.cmake"
+      DESTINATION Frameworks/${target}.framework/Resources/cmake/finders
+      COMPONENT obs_libraries
+      EXCLUDE_FROM_ALL)
+  endif()
 endfunction()
 
 # Helper function to install header files

cmake/common/helpers_common.cmake

@@ -394,6 +394,15 @@ function(target_export target)
     COMPONENT Development
     ${exclude_variant}
   )
+
+  if(target STREQUAL libobs)
+    install(
+      FILES "${CMAKE_SOURCE_DIR}/cmake/finders/FindSIMDE.cmake"
+      DESTINATION "${package_destination}/finders"
+      COMPONENT Development
+      ${exclude_variant}
+    )
+  endif()
 endfunction()
 
 # check_uuid: Helper function to check for valid UUID

libobs/CMakeLists.txt

@@ -4,6 +4,7 @@ legacy_check()
 
 include(cmake/obs-version.cmake)
 
+find_package(SIMDE REQUIRED)
 find_package(Threads REQUIRED)
 
 if(OS_WINDOWS OR OS_MACOS)
@@ -138,25 +139,6 @@ target_sources(
     util/util_uint64.h
 )
 
-target_sources(
-  libobs
-  PRIVATE
-    util/simde/check.h
-    util/simde/debug-trap.h
-    util/simde/hedley.h
-    util/simde/simde-align.h
-    util/simde/simde-arch.h
-    util/simde/simde-common.h
-    util/simde/simde-constify.h
-    util/simde/simde-detect-clang.h
-    util/simde/simde-diagnostic.h
-    util/simde/simde-features.h
-    util/simde/simde-math.h
-    util/simde/x86/mmx.h
-    util/simde/x86/sse.h
-    util/simde/x86/sse2.h
-)
-
 target_sources(
   libobs
   PRIVATE
@@ -263,7 +245,7 @@ target_link_libraries(
     jansson::jansson
     Uthash::Uthash
     ZLIB::ZLIB
-  PUBLIC Threads::Threads
+  PUBLIC SIMDE::SIMDE Threads::Threads
 )
 
 if(OS_WINDOWS)
@@ -360,20 +342,6 @@ set(
   util/profiler.h
   util/profiler.hpp
   util/serializer.h
-  util/simde/check.h
-  util/simde/debug-trap.h
-  util/simde/hedley.h
-  util/simde/simde-align.h
-  util/simde/simde-arch.h
-  util/simde/simde-common.h
-  util/simde/simde-constify.h
-  util/simde/simde-detect-clang.h
-  util/simde/simde-diagnostic.h
-  util/simde/simde-features.h
-  util/simde/simde-math.h
-  util/simde/x86/mmx.h
-  util/simde/x86/sse.h
-  util/simde/x86/sse2.h
   util/sse-intrin.h
   util/task.h
   util/text-lookup.h

libobs/cmake/legacy.cmake

@@ -12,6 +12,7 @@ target_include_directories(libobs-version PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 set_property(TARGET libobs-version PROPERTY FOLDER core)
 
 find_package(Jansson 2.5 REQUIRED)
+find_package(SIMDE REQUIRED)
 find_package(Threads REQUIRED)
 find_package(FFmpeg REQUIRED COMPONENTS avformat avutil swscale swresample OPTIONAL_COMPONENTS avcodec)
 find_package(ZLIB REQUIRED)
@@ -71,25 +72,6 @@ target_sources(
     obs-config.h
 )
 
-target_sources(
-  libobs
-  PRIVATE
-    util/simde/check.h
-    util/simde/debug-trap.h
-    util/simde/hedley.h
-    util/simde/simde-align.h
-    util/simde/simde-arch.h
-    util/simde/simde-common.h
-    util/simde/simde-constify.h
-    util/simde/simde-detect-clang.h
-    util/simde/simde-diagnostic.h
-    util/simde/simde-features.h
-    util/simde/simde-math.h
-    util/simde/x86/mmx.h
-    util/simde/x86/sse2.h
-    util/simde/x86/sse.h
-)
-
 target_sources(
   libobs
   PRIVATE
@@ -271,8 +253,7 @@ target_link_libraries(
     OBS::libobs-version
     Uthash::Uthash
     ZLIB::ZLIB
-  PUBLIC Threads::Threads
-)
+  PUBLIC SIMDE::SIMDE Threads::Threads)
 
 set_target_properties(
   libobs

libobs/cmake/libobsConfig.cmake.in

@@ -2,9 +2,12 @@
 
 include(CMakeFindDependencyMacro)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/finders")
+
 if(MSVC)
   find_dependency(w32-pthreads REQUIRED)
 endif()
+find_dependency(SIMDE REQUIRED)
 find_dependency(Threads REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")