Request 4535 (accepted)

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

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

kodi.binary-addons-noX.changes Changed

kodi.binary-addons.changes Changed

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
@@ -112,6 +113,7 @@
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  rapidjson-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -167,13 +169,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
@@ -232,7 +234,7 @@
 popd
 
 pushd tools/depends/target/binary-addons/build
-make -O -j1 VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
 #%{?_smp_mflags}
 %install

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
@@ -112,6 +113,7 @@
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  rapidjson-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -167,13 +169,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
@@ -232,7 +234,7 @@
 popd
 
 pushd tools/depends/target/binary-addons/build
-make -O -j1 VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
 #%{?_smp_mflags}
 %install

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
@@ -112,6 +113,7 @@
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  rapidjson-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -167,13 +169,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
@@ -232,7 +234,7 @@
 popd
 
 pushd tools/depends/target/binary-addons/build
-make -O -j1 VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
 #%{?_smp_mflags}
 %install

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
@@ -112,6 +113,7 @@
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  rapidjson-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -167,13 +169,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
@@ -232,7 +234,7 @@
 popd
 
 pushd tools/depends/target/binary-addons/build
-make -O -j1 VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
 #%{?_smp_mflags}
 %install

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}")

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

@@ -262,6 +262,14 @@
 %{_libdir}/kodi/addons/pvr.hts/*
 %{_kodi_addons_dir}/pvr.hts/*
 
+%files pvr.iptvsimple
+%defattr(-,root,root)
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/pvr.iptvsimple
+%dir %{_kodi_addons_dir}/pvr.iptvsimple
+%{_libdir}/kodi/addons/pvr.iptvsimple/*
+%{_kodi_addons_dir}/pvr.iptvsimple/*
+
 %files pvr.mediaportal.tvserver
 %defattr(-,root,root)
 %dir %{_libdir}/kodi/addons
@@ -326,6 +334,14 @@
 %{_libdir}/kodi/addons/pvr.stalker/*
 %{_kodi_addons_dir}/pvr.stalker/*
 
+%files pvr.teleboy
+%defattr(-,root,root)
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/pvr.teleboy
+%dir %{_kodi_addons_dir}/pvr.teleboy
+%{_libdir}/kodi/addons/pvr.teleboy/*
+%{_kodi_addons_dir}/pvr.teleboy/*
+
 %files pvr.vbox
 %defattr(-,root,root)
 %dir %{_libdir}/kodi/addons
@@ -358,6 +374,14 @@
 %{_libdir}/kodi/addons/pvr.wmc/*
 %{_kodi_addons_dir}/pvr.wmc/*
 
+%files pvr.zattoo
+%defattr(-,root,root)
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/pvr.zattoo
+%dir %{_kodi_addons_dir}/pvr.zattoo
+%{_libdir}/kodi/addons/pvr.zattoo/*
+%{_kodi_addons_dir}/pvr.zattoo/*
+
 %files screensaver.asteroids
 %defattr(-,root,root)
 %dir %{_libdir}/kodi/addons

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

@@ -262,6 +262,14 @@
 %description pvr.hts
 Kodi pvr.hts binary addon
 
+%package pvr.iptvsimple
+Summary:        Kodi pvr.iptvsimple binary addon
+Group:          Productivity/Multimedia/Video/Players
+Requires:       kodi = %{version}
+
+%description pvr.iptvsimple
+Kodi pvr.iptvsimple binary addon
+
 %package pvr.mediaportal.tvserver
 Summary:        Kodi pvr.mediaportal.tvserver binary addon
 Group:          Productivity/Multimedia/Video/Players
@@ -326,6 +334,14 @@
 %description pvr.stalker
 Kodi pvr.stalker binary addon
 
+%package pvr.teleboy
+Summary:        Kodi pvr.teleboy binary addon
+Group:          Productivity/Multimedia/Video/Players
+Requires:       kodi = %{version}
+
+%description pvr.teleboy
+Kodi pvr.teleboy binary addon
+
 %package pvr.vbox
 Summary:        Kodi pvr.vbox binary addon
 Group:          Productivity/Multimedia/Video/Players
@@ -358,6 +374,14 @@
 %description pvr.wmc
 Kodi pvr.wmc binary addon
 
+%package pvr.zattoo
+Summary:        Kodi pvr.zattoo binary addon
+Group:          Productivity/Multimedia/Video/Players
+Requires:       kodi = %{version}
+
+%description pvr.zattoo
+Kodi pvr.zattoo binary addon
+
 %package screensaver.asteroids
 Summary:        Kodi screensaver.asteroids binary addon
 Group:          Productivity/Multimedia/Video/Players

Overview

Request 4535 (accepted)

Request History