Fix CMake and build errors on Gentoo Linux

* Fix finding and linking of Qt components in CMake files
* Use `CMAKE_INSTALL_LIBDIR` instead of hardcoded `lib` in built library paths to handle systems that build into `lib64`
* Fix definition names in libobs version check to resolve error about redefinition of `struct encoder_packet_time`
* Pass `CMAKE_INSTALL_LIBDIR` into the external projects so that they use the same value. Needed to keep Ubuntu build working

Author: Tabby

CMakeLists.txt

@@ -23,8 +23,8 @@ if(ENABLE_FRONTEND_API)
 endif()
 
 if(ENABLE_QT)
-  find_qt(COMPONENTS Widgets Core)
-  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
+  find_package(Qt6 COMPONENTS Widgets Core)
+  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Core Qt6::Widgets)
   target_compile_options(
     ${CMAKE_PROJECT_NAME} PRIVATE $<$<C_COMPILER_ID:Clang,AppleClang>:-Wno-quoted-include-in-framework-header
                                   -Wno-comma>)

cmake/BuildCTranslate2.cmake

@@ -70,9 +70,11 @@ else()
     BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
     CMAKE_GENERATOR ${CMAKE_GENERATOR}
     INSTALL_COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
+    BUILD_BYPRODUCTS
+      <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX}
     CMAKE_ARGS -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CPU_FEATURES_CMAKE_ARGS}
+               -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+               ${CPU_FEATURES_CMAKE_ARGS}
     LOG_CONFIGURE ON
     LOG_BUILD ON
     LOG_INSTALL ON)
@@ -81,8 +83,10 @@ else()
   add_library(cpu_features STATIC IMPORTED GLOBAL)
   add_dependencies(cpu_features cpu_features_build)
   set_target_properties(
-    cpu_features PROPERTIES IMPORTED_LOCATION
-                            ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX})
+    cpu_features
+    PROPERTIES
+      IMPORTED_LOCATION
+      ${INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX})
   set_target_properties(cpu_features PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
 
   # build CTranslate2 from source
@@ -91,7 +95,8 @@ else()
   set(CT2_OPENBLAS_CMAKE_ARGS -DWITH_OPENBLAS=OFF)
 
   set(CT2_CMAKE_PLATFORM_OPTIONS -DBUILD_SHARED_LIBS=OFF -DOPENMP_RUNTIME=NONE -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
-  set(CT2_LIB_INSTALL_LOCATION lib/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(CT2_LIB_INSTALL_LOCATION
+      ${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_STATIC_LIBRARY_SUFFIX})
 
   ExternalProject_Add(
     ct2_build
@@ -104,6 +109,7 @@ else()
     BUILD_BYPRODUCTS <INSTALL_DIR>/${CT2_LIB_INSTALL_LOCATION}
     CMAKE_ARGS -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
                -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+               -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                -DWITH_CUDA=OFF
                -DWITH_MKL=OFF

cmake/BuildSentencepiece.cmake

@@ -40,7 +40,8 @@ else()
       CACHE STRING "URL of sentencepiece repository")
 
   set(SP_CMAKE_OPTIONS -DSPM_ENABLE_SHARED=OFF)
-  set(SENTENCEPIECE_INSTALL_LIB_LOCATION lib/${CMAKE_STATIC_LIBRARY_PREFIX}sentencepiece${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(SENTENCEPIECE_INSTALL_LIB_LOCATION
+      ${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}sentencepiece${CMAKE_STATIC_LIBRARY_SUFFIX})
 
   include(ExternalProject)
 
@@ -53,7 +54,8 @@ else()
     INSTALL_COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
     BUILD_BYPRODUCTS <INSTALL_DIR>/${SENTENCEPIECE_INSTALL_LIB_LOCATION}
     CMAKE_ARGS -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${SP_CMAKE_OPTIONS})
+               -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+               ${SP_CMAKE_OPTIONS})
   ExternalProject_Get_Property(sentencepiece_build INSTALL_DIR)
 
   add_library(libsentencepiece STATIC IMPORTED GLOBAL)

src/transcription-filter-data.h

@@ -29,7 +29,7 @@
 #define MAX_PREPROC_CHANNELS 10
 #define MAX_WEBVTT_TRACKS 5
 
-#if !defined(LIBOBS_MAJOR_VERSION) || LIBOBS_MAJOR_VERSION < 31
+#if !defined(LIBOBS_API_MAJOR_VER) || LIBOBS_API_MAJOR_VER < 31
 struct encoder_packet_time {
 	/* PTS used to associate uncompressed frames with encoded packets. */
 	int64_t pts;