Packman Build Service PMBS

kodi.binary-addons-noX-raspberry-pi.spec Changed

@@ -54,6 +54,7 @@
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
 Source5:        kodi-platform-e8574b8.tar.gz
 Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
+Source21:       rapidxml.cmake
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
 # PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
@@ -167,13 +168,13 @@
 # Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-#mkdir depends/common/rapidxml
-#echo "rapidxml http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
-#echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" >  depends/common/rapidxml/rapidxml.sha256
-#echo "rapidxml" >> depends/common/kodi-platform/deps.txt
-#cp -v %{SOURCE20} build/download/
 cp -v %{SOURCE5} depends/common/kodi-platform
 echo "kodi-platform file://../../../../../cmake/addons/depends/common/kodi-platform/kodi-platform-e8574b8.tar.gz" > depends/common/kodi-platform/kodi-platform.txt
+mkdir -pv depends/common/rapidxml
+cp -v %{SOURCE20} depends/common/rapidxml
+cp -v %{SOURCE21} depends/common/rapidxml/CMakeLists.txt
+echo "rapidxml file://../../../../../cmake/addons/depends/common/rapidxml/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
+echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" > depends/common/rapidxml/rapidxml.sha256
 popd
 
 %build
@@ -221,6 +222,7 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
     -DADDONS_TO_BUILD="all" 
+#    -DADDONS_TO_BUILD="pvr.iptvsimple"
 
 popd

kodi.binary-addons-noX-raspberry-pi2.spec Changed

@@ -54,6 +54,7 @@
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
 Source5:        kodi-platform-e8574b8.tar.gz
 Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
+Source21:       rapidxml.cmake
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
 # PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
@@ -167,13 +168,13 @@
 # Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-#mkdir depends/common/rapidxml
-#echo "rapidxml http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
-#echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" >  depends/common/rapidxml/rapidxml.sha256
-#echo "rapidxml" >> depends/common/kodi-platform/deps.txt
-#cp -v %{SOURCE20} build/download/
 cp -v %{SOURCE5} depends/common/kodi-platform
 echo "kodi-platform file://../../../../../cmake/addons/depends/common/kodi-platform/kodi-platform-e8574b8.tar.gz" > depends/common/kodi-platform/kodi-platform.txt
+mkdir -pv depends/common/rapidxml
+cp -v %{SOURCE20} depends/common/rapidxml
+cp -v %{SOURCE21} depends/common/rapidxml/CMakeLists.txt
+echo "rapidxml file://../../../../../cmake/addons/depends/common/rapidxml/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
+echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" > depends/common/rapidxml/rapidxml.sha256
 popd
 
 %build
@@ -221,6 +222,7 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
     -DADDONS_TO_BUILD="all" 
+#    -DADDONS_TO_BUILD="pvr.iptvsimple"
 
 popd

kodi.binary-addons-noX.spec Changed

@@ -54,6 +54,7 @@
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
 Source5:        kodi-platform-e8574b8.tar.gz
 Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
+Source21:       rapidxml.cmake
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
 # PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
@@ -167,13 +168,13 @@
 # Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-#mkdir depends/common/rapidxml
-#echo "rapidxml http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
-#echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" >  depends/common/rapidxml/rapidxml.sha256
-#echo "rapidxml" >> depends/common/kodi-platform/deps.txt
-#cp -v %{SOURCE20} build/download/
 cp -v %{SOURCE5} depends/common/kodi-platform
 echo "kodi-platform file://../../../../../cmake/addons/depends/common/kodi-platform/kodi-platform-e8574b8.tar.gz" > depends/common/kodi-platform/kodi-platform.txt
+mkdir -pv depends/common/rapidxml
+cp -v %{SOURCE20} depends/common/rapidxml
+cp -v %{SOURCE21} depends/common/rapidxml/CMakeLists.txt
+echo "rapidxml file://../../../../../cmake/addons/depends/common/rapidxml/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
+echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" > depends/common/rapidxml/rapidxml.sha256
 popd
 
 %build
@@ -221,6 +222,7 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
     -DADDONS_TO_BUILD="all" 
+#    -DADDONS_TO_BUILD="pvr.iptvsimple"
 
 popd

kodi.binary-addons.spec Changed

@@ -54,6 +54,7 @@
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
 Source5:        kodi-platform-e8574b8.tar.gz
 Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
+Source21:       rapidxml.cmake
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
 # PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
@@ -167,13 +168,13 @@
 # Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-#mkdir depends/common/rapidxml
-#echo "rapidxml http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
-#echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" >  depends/common/rapidxml/rapidxml.sha256
-#echo "rapidxml" >> depends/common/kodi-platform/deps.txt
-#cp -v %{SOURCE20} build/download/
 cp -v %{SOURCE5} depends/common/kodi-platform
 echo "kodi-platform file://../../../../../cmake/addons/depends/common/kodi-platform/kodi-platform-e8574b8.tar.gz" > depends/common/kodi-platform/kodi-platform.txt
+mkdir -pv depends/common/rapidxml
+cp -v %{SOURCE20} depends/common/rapidxml
+cp -v %{SOURCE21} depends/common/rapidxml/CMakeLists.txt
+echo "rapidxml file://../../../../../cmake/addons/depends/common/rapidxml/rapidxml-1.13.zip" > depends/common/rapidxml/rapidxml.txt
+echo "c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571" > depends/common/rapidxml/rapidxml.sha256
 popd
 
 %build
@@ -221,6 +222,7 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
     -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
     -DADDONS_TO_BUILD="all" 
+#    -DADDONS_TO_BUILD="pvr.iptvsimple"
 
 popd

cmake-binary-addons.patch Changed

@@ -11,8 +11,24 @@
                        PREFIX ${BUILD_DIR}/${repo_id}
                        CONFIGURE_COMMAND ""
                        BUILD_COMMAND ""
---- cmake/addons/CMakeLists.txt.orig	2019-01-02 06:35:15.379814359 +0200
-+++ cmake/addons/CMakeLists.txt	2019-01-02 06:40:22.875231039 +0200
+--- cmake/addons/bootstrap/repositories/binary-addons.txt.orig	2019-01-02 06:26:28.785086899 +0200
++++ cmake/addons/bootstrap/repositories/binary-addons.txt	2019-01-02 06:28:44.099306053 +0200
+@@ -1 +1 @@
+-binary-addons https://github.com/xbmc/repo-binary-addons.git Leia
++binary-addons file://repo-binary-addons.Leia.tar.bz2 Leia
+--- cmake/scripts/common/HandleDepends.cmake.orig	2019-01-07 21:13:40.019077286 +0200
++++ cmake/scripts/common/HandleDepends.cmake	2019-01-07 21:13:46.843195249 +0200
+@@ -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}")
+--- cmake/addons/CMakeLists.txt.orig	2019-07-10 20:36:48.837364578 +0300
++++ cmake/addons/CMakeLists.txt	2019-07-10 20:37:25.965756704 +0300
 @@ -164,16 +164,19 @@
  include(${CORE_SOURCE_DIR}/cmake/scripts/common/CheckTargetPlatform.cmake)
  
@@ -78,7 +94,15 @@
            # 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})
-@@ -382,11 +390,11 @@
+@@ -379,14 +387,19 @@
+           # add "kodi-platform" as a dependency to every addon
+           add_dependencies(${id} kodi-platform)
+ 
++	  # 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})
@@ -93,19 +117,3 @@
              endif()
            endif()
  
---- cmake/addons/bootstrap/repositories/binary-addons.txt.orig	2019-01-02 06:26:28.785086899 +0200
-+++ cmake/addons/bootstrap/repositories/binary-addons.txt	2019-01-02 06:28:44.099306053 +0200
-@@ -1 +1 @@
--binary-addons https://github.com/xbmc/repo-binary-addons.git Leia
-+binary-addons file://repo-binary-addons.Leia.tar.bz2 Leia
---- cmake/scripts/common/HandleDepends.cmake.orig	2019-01-07 21:13:40.019077286 +0200
-+++ cmake/scripts/common/HandleDepends.cmake	2019-01-07 21:13:46.843195249 +0200
-@@ -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}")

_service:download_files:rapidxml-1.13.zip Deleted

kodi.binary-addons.spec.files.inc Changed

kodi.binary-addons.spec.packages.inc Changed

kodi.binary-addons.tar/download/audiodecoder.2sf-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.asap-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.gme-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.gsf-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.modplug-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.nosefart-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.organya-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.qsf-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.snesapu-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.ssf-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.stsound-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.upse-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.usf-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.vgmstream-Leia.tar.gz Changed

kodi.binary-addons.tar/download/audiodecoder.wsr-Leia.tar.gz Changed

kodi.binary-addons.tar/download/inputstream.adaptive-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.argustv-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.dvbviewer-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.filmon-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.hdhomerun-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.hts-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.iptvsimple-Leia.tar.gz Added

kodi.binary-addons.tar/download/pvr.mediaportal.tvserver-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.octonet-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.pctv-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.sledovanitv.cz-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.stalker-Leia.tar.gz Changed

kodi.binary-addons.tar/download/pvr.vuplus-Leia.tar.gz Changed

rapidxml-1.13.zip Added

rapidxml.cmake Added

repo-binary-addons-Leia-disabled.txt Changed

repo-binary-addons.Leia.tar.bz2/pvr.iptvsimple Added

repo-binary-addons.Leia.tar.bz2/pvr.iptvsimple/pvr.iptvsimple.txt Added

Changes of Revision 49