Projects
home:manfred-h
kodi.binary-addons
cmake-binary-addons.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File cmake-binary-addons.patch of Package kodi.binary-addons
diff -rup a/cmake/addons/CMakeLists.txt b/cmake/addons/CMakeLists.txt --- a/cmake/addons/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100 +++ b/cmake/addons/CMakeLists.txt 2023-12-20 12:05:45.238089514 +0100 @@ -177,16 +177,19 @@ endif() include(${CORE_SOURCE_DIR}/cmake/scripts/common/CheckTargetPlatform.cmake) set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) -if(NOT WIN32) - # check install permissions - check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write) - if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(NEED_SUDO TRUE) - set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install) - list(APPEND BUILD_ARGS -DOVERRIDE_PATHS=ON) - message(STATUS "NEED_SUDO: ${NEED_SUDO} (no write permission for ${CMAKE_INSTALL_PREFIX})") - endif() -endif() +message(STATUS "ADDON_INSTALL_DIR: ${ADDON_INSTALL_DIR}") +message(STATUS "NEED_SUDO: ${NEED_SUDO}") +list(APPEND BUILD_ARGS -DOVERRIDE_PATHS=ON) +#if(NOT WIN32) +# # check install permissions +# check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write) +# if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux") +# set(NEED_SUDO TRUE) +# set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install) +# list(APPEND BUILD_ARGS -DOVERRIDE_PATHS=ON) +# message(STATUS "NEED_SUDO: ${NEED_SUDO} (no write permission for ${CMAKE_INSTALL_PREFIX})") +# endif() +#endif() ### prepare the build environment for the binary addons # copy the PrepareEnv.cmake script to the depends path so that we can include it @@ -281,6 +284,7 @@ if(NOT ADDONS_TO_BUILD STREQUAL "all") endif() foreach(addon ${addons}) + message(STATUS "Building addon: ${addon}") if(NOT (addon MATCHES platforms.txt)) file(STRINGS ${addon} def) string(REPLACE " " ";" def ${def}) @@ -351,10 +355,12 @@ foreach(addon ${addons}) list(GET def 2 revision) # we need access to a git executable - find_package(Git REQUIRED) + find_package(Git) # resolve revision to git hash - execute_process(COMMAND ${GIT_EXECUTABLE} ls-remote ${url} ${revision} OUTPUT_VARIABLE revision_hash) + if(Git_FOUND) + execute_process(COMMAND ${GIT_EXECUTABLE} ls-remote ${url} ${revision} OUTPUT_VARIABLE revision_hash) + endif() # git ls-remote only works on branches and tag names but not on revisions if(NOT "${revision_hash}" STREQUAL "") string(REPLACE "\t" ";" revision_list ${revision_hash}) @@ -414,9 +420,11 @@ foreach(addon ${addons}) endif() endif() + message(STATUS " REMOVING ${BUILD_DIR}/${id}") # remove any previously extracted version of the addon file(REMOVE_RECURSE "${BUILD_DIR}/${id}") + message(STATUS " EXTRACT ${BUILD_DIR}/download/${archive_name}.tar.gz") # extract the addon from the archive execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzvf ${BUILD_DIR}/download/${archive_name}.tar.gz WORKING_DIRECTORY ${BUILD_DIR}) @@ -448,14 +456,19 @@ foreach(addon ${addons}) DEPENDERS build ALWAYS 1) + # add "rapidxml" as a dependency to pvr.iptvsimple + if(${id} STREQUAL "pvr.iptvsimple") + add_dependencies(${id} rapidxml) + endif() + set(${id}_DEPENDS_DIR ${SOURCE_DIR}/depends) if(EXISTS ${${id}_DEPENDS_DIR}) - include(${CORE_SOURCE_DIR}/cmake/scripts/common/HandleDepends.cmake) - add_addon_depends(${id} ${${id}_DEPENDS_DIR}) + # include(${CORE_SOURCE_DIR}/cmake/scripts/common/HandleDepends.cmake) + # add_addon_depends(${id} ${${id}_DEPENDS_DIR}) if(${id}_DEPS AND NOT "${${id}_DEPS}" STREQUAL "") message(STATUS "${id} DEPENDENCIES: ${${id}_DEPS}") - add_dependencies(${id} ${${id}_DEPS}) + # add_dependencies(${id} ${${id}_DEPS}) endif() endif() diff -rup a/cmake/addons/bootstrap/CMakeLists.txt b/cmake/addons/bootstrap/CMakeLists.txt --- a/cmake/addons/bootstrap/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100 +++ b/cmake/addons/bootstrap/CMakeLists.txt 2023-12-20 12:05:45.238089514 +0100 @@ -41,8 +41,8 @@ include(ExternalProject) function(bootstrap_repo repo_id repo_url repo_revision) message(STATUS "Bootstrapping addons from ${repo_id} (${repo_url} ${repo_revision})...") externalproject_add(${repo_id} - GIT_REPOSITORY ${repo_url} - GIT_TAG ${repo_revision} + URL ${repo_url} + # GIT_TAG ${repo_revision} PREFIX ${BUILD_DIR}/${repo_id} CONFIGURE_COMMAND "" BUILD_COMMAND "" diff -rup a/cmake/addons/bootstrap/repositories/binary-addons.txt b/cmake/addons/bootstrap/repositories/binary-addons.txt --- a/cmake/addons/bootstrap/repositories/binary-addons.txt 2023-12-20 14:41:36.915664723 +0100 +++ b/cmake/addons/bootstrap/repositories/binary-addons.txt 2023-12-20 14:43:17.505655890 +0100 @@ -1 +1 @@ -binary-addons https://github.com/xbmc/repo-binary-addons.git Omega +binary-addons file://repo-binary-addons.Omega.tar.bz2 Omega
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.