File cmake-binary-addons.patch of Package kodi.binary-addons

File cmake-binary-addons.patch of Package kodi.binary-addons (Revision eaf6695a8a00ad70687623942c5d8432)

Currently displaying revision eaf6695a8a00ad70687623942c5d8432 , Show latest

diff -ru xbmc-19.0-Matrix.orig/cmake/addons/CMakeLists.txt xbmc-19.0-Matrix/cmake/addons/CMakeLists.txt
--- xbmc-19.0-Matrix.orig/cmake/addons/CMakeLists.txt	2021-02-18 23:17:59.000000000 +0100
+++ xbmc-19.0-Matrix/cmake/addons/CMakeLists.txt	2021-03-10 19:05:35.042272246 +0100
@@ -177,16 +177,19 @@
 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 @@
 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 @@
           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 @@
             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 @@
                                    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 -ru xbmc-19.0-Matrix.orig/cmake/addons/bootstrap/CMakeLists.txt xbmc-19.0-Matrix/cmake/addons/bootstrap/CMakeLists.txt
--- xbmc-19.0-Matrix.orig/cmake/addons/bootstrap/CMakeLists.txt	2021-02-18 23:17:59.000000000 +0100
+++ xbmc-19.0-Matrix/cmake/addons/bootstrap/CMakeLists.txt	2021-03-10 19:03:50.617792584 +0100
@@ -41,8 +41,8 @@
 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 -ru xbmc-19.0-Matrix.orig/cmake/addons/bootstrap/repositories/binary-addons.txt xbmc-19.0-Matrix/cmake/addons/bootstrap/repositories/binary-addons.txt
--- xbmc-19.0-Matrix.orig/cmake/addons/bootstrap/repositories/binary-addons.txt	2021-02-18 23:17:59.000000000 +0100
+++ xbmc-19.0-Matrix/cmake/addons/bootstrap/repositories/binary-addons.txt	2021-03-10 19:04:38.106010726 +0100
@@ -1 +1 @@
-binary-addons https://github.com/xbmc/repo-binary-addons.git Nexus
+binary-addons file://repo-binary-addons.Nexus.tar.bz2 Nexus
diff -ru xbmc-19.0-Matrix.orig/cmake/scripts/common/HandleDepends.cmake xbmc-19.0-Matrix/cmake/scripts/common/HandleDepends.cmake
--- xbmc-19.0-Matrix.orig/cmake/scripts/common/HandleDepends.cmake	2021-02-18 23:17:59.000000000 +0100
+++ xbmc-19.0-Matrix/cmake/scripts/common/HandleDepends.cmake	2021-03-10 19:04:56.294094282 +0100
@@ -246,7 +246,7 @@
 
             externalproject_add(${id}
                                 URL ${url}
-                                "${URL_HASH_COMMAND}"
+                                ${URL_HASH_COMMAND}
                                 DOWNLOAD_DIR ${DOWNLOAD_DIR}
                                 CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
                                 ${EXTERNALPROJECT_SETUP})