Merge pull request xbmc#23906 from webosbrew/fix-acb-stub

[webOS] Acb: Install empty dummy library
thexai · Oct 11, 2023 · 671c9b9 · 671c9b9
2 parents 8afd788 + e4a4b8e
commit 671c9b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmake/modules/FindAcbAPI.cmake b/cmake/modules/FindAcbAPI.cmake
@@ -33,5 +33,10 @@ if(NOT TARGET ACBAPI::ACBAPI)
                                                  IMPORTED_LOCATION "${ACBAPI_LIBRARY}"
                                                  INTERFACE_INCLUDE_DIRECTORIES "${ACBAPI_INCLUDE_DIR}")
     set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP ACBAPI::ACBAPI)
+
+    # creates an empty library to install on webOS 5+ devices
+    file(TOUCH dummy.c)
+    add_library(AcbAPI SHARED dummy.c)
+    set_target_properties(AcbAPI PROPERTIES VERSION 1.0.0 SOVERSION 1)
   endif()
 endif()
diff --git a/cmake/scripts/webos/Install.cmake b/cmake/scripts/webos/Install.cmake
@@ -30,7 +30,7 @@ set(APP_INSTALL_DIRS ${CMAKE_BINARY_DIR}/addons
                      ${CMAKE_BINARY_DIR}/userdata)
 set(APP_TOOLCHAIN_FILES ${TOOLCHAIN}/${HOST}/sysroot/lib/libatomic.so.1
                         ${TOOLCHAIN}/${HOST}/sysroot/lib/libcrypt.so.1
-                        ${DEPENDS_PATH}/lib/libAcbAPI.so.1)
+                        ${CMAKE_BINARY_DIR}/libAcbAPI.so.1)
 set(BIN_ADDONS_DIR ${DEPENDS_PATH}/addons)
 
 file(WRITE ${CMAKE_BINARY_DIR}/install.cmake "
@@ -54,7 +54,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/install.cmake "
 
 # Copy files to the location expected by the webOS packaging scripts.
 add_custom_target(bundle
-  DEPENDS ${APP_NAME_LC} ${CMAKE_BINARY_DIR}/missing_libs.txt
+  DEPENDS ${APP_NAME_LC} ${CMAKE_BINARY_DIR}/missing_libs.txt AcbAPI
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/install.cmake
 )