libobs: Add changes for CMake build framework 3.0

New code path only taken if OBS_CMAKE_VERSION is set to 3.0.0 or
greater, old functionality remains unchanged.

cmake/Modules/ObsDefaults_Linux.cmake

@@ -73,7 +73,7 @@ macro(setup_obs_project)
     set(OBS_DATA_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/obs")
     set(OBS_CMAKE_DESTINATION "${OBS_LIBRARY_DESTINATION}/cmake")
 
-    set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+    set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
     set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
 
     set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")

libobs/CMakeLists.txt

@@ -329,7 +329,6 @@ set(public_headers
     obs-source.h
     obs.h
     obs.hpp
-    util/apple/cfstring-utils.h
     util/array-serializer.h
     util/base.h
     util/bitstream.h
@@ -369,12 +368,17 @@ set(public_headers
     util/task.h
     util/text-lookup.h
     util/threading-posix.h
-    util/threading-windows.h
     util/threading.h
     util/uthash.h
     util/util.hpp
     util/util_uint128.h
-    util/util_uint64.h
+    util/util_uint64.h)
+
+if(OS_WINDOWS)
+  list(
+    APPEND
+    public_headers
+    util/threading-windows.h
     util/windows/ComPtr.hpp
     util/windows/CoTaskMemPtr.hpp
     util/windows/device-enum.h
@@ -383,6 +387,9 @@ set(public_headers
     util/windows/win-version.h
     util/windows/window-helpers.h
     util/windows/WinHandle.hpp)
+elseif(OS_MACOS)
+  list(APPEND public_headers util/apple/cfstring-utils.h)
+endif()
 
 if(ENABLE_HEVC)
   list(APPEND public_headers obs-hevc.h)

libobs/cmake/linux/libobs.pc.in

@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libobs
+Description: OBS Studio core compositor library
+Version: @OBS_VERSION_CANONICAL@
+
+Requires:
+Libs: -L${libdir} -lobs
+Libs.private: -pthread -lm
+Cflags: -I${includedir} -std=gnu@CMAKE_C_STANDARD@ -fPIC -fvisibility=hidden -fopenmp-simd -Werror

libobs/cmake/os-freebsd.cmake

@@ -1,11 +1,25 @@
+find_package(LibUUID REQUIRED)
 find_package(X11 REQUIRED)
-find_package(x11-xcb REQUIRED)
+find_package(X11-xcb REQUIRED)
 # cmake-format: off
-find_package(xcb REQUIRED xcb OPTIONAL_COMPONENTS xcb-xinput)
+find_package(Xcb REQUIRED xcb OPTIONAL_COMPONENTS xcb-xinput)
 # cmake-format: on
-find_package(gio)
+find_package(Gio)
 find_package(Sysinfo REQUIRED)
 
+set(CMAKE_M_LIBS "")
+include(CheckCSourceCompiles)
+set(LIBM_TEST_SOURCE "#include<math.h>\nfloat f; int main(){sqrt(f);return 0;}")
+check_c_source_compiles("${LIBM_TEST_SOURCE}" HAVE_MATH_IN_STD_LIB)
+
+set(CMAKE_REQUIRED_INCLUDES "/usr/local/include")
+set(UUID_TEST_SOURCE "#include<uuid/uuid.h>\nint main(){return 0;}")
+check_c_source_compiles("${UUID_TEST_SOURCE}" HAVE_UUID_HEADER)
+
+if(NOT HAVE_UUID_HEADER)
+  message(FATAL_ERROR "Required system header <uuid/uuid.h> not found.")
+endif()
+
 target_sources(
   libobs
   PRIVATE # cmake-format: sortable
@@ -18,14 +32,19 @@ target_sources(
           util/threading-posix.c
           util/threading-posix.h)
 
-target_compile_definitions(libobs PRIVATE $<$<COMPILE_LANG_AND_ID:C,GNU>:ENABLE_DARRAY_TYPE_TEST>
-                                          $<$<COMPILE_LANG_AND_ID:CXX,GNU>:ENABLE_DARRAY_TYPE_TEST>)
+target_compile_definitions(
+  libobs PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}" $<$<COMPILE_LANG_AND_ID:C,GNU>:ENABLE_DARRAY_TYPE_TEST>
+                 $<$<COMPILE_LANG_AND_ID:CXX,GNU>:ENABLE_DARRAY_TYPE_TEST>)
 
-target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb Sysinfo::Sysinfo)
-
-if(TARGET xcb::xcb-xinput)
-  target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
-endif()
+target_link_libraries(
+  libobs
+  PRIVATE X11::x11-xcb
+          xcb::xcb
+          LibUUID::LibUUID
+          Sysinfo::Sysinfo
+          ${CMAKE_DL_LIBS}
+          $<$<NOT:$<BOOL:${HAVE_MATH_IN_STD_LIB}>>:m>
+          $<$<TARGET_EXISTS:xcb::xcb-input>:xcb::xcb-input>)
 
 if(ENABLE_PULSEAUDIO)
   find_package(PulseAudio REQUIRED)
@@ -40,10 +59,10 @@ if(ENABLE_PULSEAUDIO)
             audio-monitoring/pulse/pulseaudio-wrapper.h)
 
   target_link_libraries(libobs PRIVATE PulseAudio::PulseAudio)
-  target_enable_feature(libobs "PulseAudio audio monitoring (Linux)")
+  target_enable_feature(libobs "PulseAudio audio monitoring (FreeBSD)")
 else()
   target_sources(libobs PRIVATE audio-monitoring/null/null-audio-monitoring.c)
-  target_disable_feature(libobs "PulseAudio audio monitoring (Linux)")
+  target_disable_feature(libobs "PulseAudio audio monitoring (FreeBSD)")
 endif()
 
 if(TARGET gio::gio)
@@ -52,16 +71,14 @@ if(TARGET gio::gio)
 endif()
 
 if(ENABLE_WAYLAND)
-  # cmake-format: off
-  find_package(Wayland COMPONENTS Client REQUIRED)
-  # cmake-format: on
-  find_package(xkbcommon REQUIRED)
+  find_package(Wayland REQUIRED Client)
+  find_package(Xkbcommon REQUIRED)
 
   target_sources(libobs PRIVATE obs-nix-wayland.c)
   target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)
-  target_enable_feature(libobs "Wayland compositor support (Linux)")
+  target_enable_feature(libobs "Wayland compositor support (FreeBSD)")
 else()
-  target_disable_feature(libobs "Wayland compositor support (Linux)")
+  target_disable_feature(libobs "Wayland compositor support (FreebSD)")
 endif()
 
 set_target_properties(libobs PROPERTIES OUTPUT_NAME obs)

libobs/cmake/os-linux.cmake

@@ -1,10 +1,10 @@
 find_package(LibUUID REQUIRED)
 find_package(X11 REQUIRED)
-find_package(x11-xcb REQUIRED)
+find_package(X11-xcb REQUIRED)
 # cmake-format: off
-find_package(xcb REQUIRED xcb OPTIONAL_COMPONENTS xcb-xinput)
+find_package(Xcb REQUIRED xcb OPTIONAL_COMPONENTS xcb-xinput)
 # cmake-format: on
-find_package(gio)
+find_package(Gio)
 
 target_sources(
   libobs
@@ -18,15 +18,34 @@ target_sources(
           util/threading-posix.c
           util/threading-posix.h)
 
-target_compile_definitions(libobs PRIVATE USE_XDG $<$<COMPILE_LANG_AND_ID:C,GNU>:ENABLE_DARRAY_TYPE_TEST>
-                                          $<$<COMPILE_LANG_AND_ID:CXX,GNU>:ENABLE_DARRAY_TYPE_TEST>)
+target_compile_definitions(
+  libobs
+  PRIVATE USE_XDG OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}" $<$<COMPILE_LANG_AND_ID:C,GNU>:ENABLE_DARRAY_TYPE_TEST>
+          $<$<COMPILE_LANG_AND_ID:CXX,GNU>:ENABLE_DARRAY_TYPE_TEST>)
+
+if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+  # * Silence type-limits warning in line 292 of libobs/utils/utf8.c
+  if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.3.0)
+    target_compile_options(libobs PRIVATE -Wno-error=type-limits)
+  endif()
+endif()
 
-target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb LibUUID::LibUUID ${CMAKE_DL_LIBS})
+set(CMAKE_M_LIBS "")
+include(CheckCSourceCompiles)
+set(LIBM_TEST_SOURCE "#include<math.h>\nfloat f; int main(){sqrt(f);return 0;}")
+check_c_source_compiles("${LIBM_TEST_SOURCE}" HAVE_MATH_IN_STD_LIB)
 
-if(TARGET xcb::xcb-xinput)
-  target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
+set(UUID_TEST_SOURCE "#include<uuid/uuid.h>\nint main(){return 0;}")
+check_c_source_compiles("${UUID_TEST_SOURCE}" HAVE_UUID_HEADER)
+
+if(NOT HAVE_UUID_HEADER)
+  message(FATAL_ERROR "Required system header <uuid/uuid.h> not found.")
 endif()
 
+target_link_libraries(
+  libobs PRIVATE X11::x11-xcb xcb::xcb LibUUID::LibUUID ${CMAKE_DL_LIBS} $<$<NOT:$<BOOL:${HAVE_MATH_IN_STD_LIB}>>:m>
+                 $<$<TARGET_EXISTS:xcb::xcb-input>:xcb::xcb-input>)
+
 if(ENABLE_PULSEAUDIO)
   find_package(PulseAudio REQUIRED)
 
@@ -52,10 +71,8 @@ if(TARGET gio::gio)
 endif()
 
 if(ENABLE_WAYLAND)
-  # cmake-format: off
-  find_package(Wayland COMPONENTS Client REQUIRED)
-  # cmake-format: on
-  find_package(xkbcommon REQUIRED)
+  find_package(Wayland REQUIRED Client)
+  find_package(Xkbcommon REQUIRED)
 
   target_sources(libobs PRIVATE obs-nix-wayland.c)
   target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)

libobs/obs-config.h

@@ -62,4 +62,4 @@
 #define OBS_BETA 0
 #endif
 
-#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH
+#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX "/" OBS_DATA_PATH

libobs/obs-nix.c

@@ -47,24 +47,19 @@ const char *get_module_extension(void)
 	return ".so";
 }
 
-#ifdef __LP64__
-#define BIT_STRING "64bit"
-#else
-#define BIT_STRING "32bit"
-#endif
-
 #define FLATPAK_PLUGIN_PATH "/app/plugins"
 
 static const char *module_bin[] = {
+	"../../obs-plugins/64bit",
 	OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
-	"../../obs-plugins/" BIT_STRING,
 	FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
 };
 
 static const char *module_data[] = {
+	OBS_DATA_PATH "/%module%",
 	OBS_INSTALL_DATA_PATH "/obs-plugins/%module%",
-	OBS_DATA_PATH "/obs-plugins/%module%",
-	FLATPAK_PLUGIN_PATH "/share/obs/obs-plugins/%module%"};
+	FLATPAK_PLUGIN_PATH "/share/obs/obs-plugins/%module%",
+};
 
 static const int module_patterns_size =
 	sizeof(module_bin) / sizeof(module_bin[0]);
@@ -73,8 +68,27 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
 
 void add_default_module_paths(void)
 {
-	for (int i = 0; i < module_patterns_size; i++)
+	char *module_bin_path =
+		os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
+	char *module_data_path = os_get_executable_path_ptr(
+		"../" OBS_DATA_PATH "/obs-plugins/%module%");
+
+	if (module_bin_path && module_data_path) {
+		char *abs_module_bin_path =
+			os_get_abs_path_ptr(module_bin_path);
+		if (strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX
+			   "/" OBS_PLUGIN_DESTINATION) != 0) {
+			obs_add_module_path(module_bin_path, module_data_path);
+		}
+		bfree(abs_module_bin_path);
+	}
+
+	bfree(module_bin_path);
+	bfree(module_data_path);
+
+	for (int i = 0; i < module_patterns_size; i++) {
 		obs_add_module_path(module_bin[i], module_data[i]);
+	}
 }
 
 /*
@@ -89,6 +103,18 @@ char *find_libobs_data_file(const char *file)
 	if (check_path(file, OBS_DATA_PATH "/libobs/", &output))
 		return output.array;
 
+	char *relative_data_path =
+		os_get_executable_path_ptr("../" OBS_DATA_PATH "/libobs/");
+	if (relative_data_path) {
+		bool found = check_path(file, relative_data_path, &output);
+
+		bfree(relative_data_path);
+
+		if (found) {
+			return output.array;
+		}
+	}
+
 	if (OBS_INSTALL_PREFIX[0] != 0) {
 		if (check_path(file, OBS_INSTALL_DATA_PATH "/libobs/", &output))
 			return output.array;