Packman Build Service PMBS

Changes of Revision 30

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-noX-raspberry-pi.spec Changed

@@ -14,12 +14,13 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
+#
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
+%define kodi_version Leia
 %define _kodi_addons_dir %{_datadir}/kodi/addons
+%define dev_build 1
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +41,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi.binary-addons-noX-raspberry-pi
-Version:        17.5
+Version:        18.0rc5
 Release:        0
 Summary:        Binary Addons for Kodi
 License:        GPL-2.0+ and GPL-3.0+
@@ -51,7 +52,8 @@
 Source2:        kodi.binary-addons.spec.files.inc
 Source3:        kodi.binary-addons.tar
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
-Source5:        kodi-platform-c8188d8.tar.gz
+Source5:        kodi-platform-e8574b8.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
 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
@@ -60,6 +62,10 @@
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
 Patch5:         lib555-missing-xlocale.patch
 Patch6:         pvr.stalker-gcc7.patch
+# PATCH-PACKMAN kodi.binary.addons-noreturnfromnonvoid.patch - davejplater@gmail.com - Suddenly an rpmlint no return from nonvoid has appeared after taglib was updated.
+Patch7:         kodi.binary.addons-noreturnfromnonvoid.patch
+Patch8:         kodi.binary-addons-screensavers.rsxs-host-toolchain.patch
+Patch9:         kodi.binary-addons-vfs.sacd.no-int-conversion.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -74,22 +80,30 @@
 BuildRequires:  kodi-devel = %{version}
 %endif
 BuildRequires:  tinyxml-devel
+BuildRequires:  liblz4-devel
+BuildRequires:  libnfs-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
 BuildRequires:  libstdc++-devel
+BuildRequires:  libsmbclient-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+BuildRequires:  giflib-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  libhdhomerun-devel
+BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libprojectM)
 BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(lzo2)
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  libraw-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -122,7 +136,7 @@
 %endif
 %endif
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmprath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
@@ -137,56 +151,77 @@
 %patch1
 %patch2
 
-pushd project/cmake/addons
+pushd cmake/addons
 tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires
+# Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
-echo "kodi-platform file://../depends/common/kodi-platform" > depends/common/kodi-platform/kodi-platform.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
 popd
 
 %build
-sed -i~ 's/@@@_libdir@@@/%{_lib}/' project/cmake/scripts/common/AddonHelpers.cmake
-diff -u project/cmake/scripts/common/AddonHelpers.cmake~ project/cmake/scripts/common/AddonHelpers.cmake && exit 0
-pushd project/cmake/addons
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
-%endif
-    -DBUILD_DIR=build \
-    -DBUILD_SHARED_LIBS=1 \
-    -DNEED_SUDO=FALSE \
-    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
+sed -i~ 's/@@@_libdir@@@/%{_lib}/' cmake/scripts/common/AddonHelpers.cmake
+diff -u cmake/scripts/common/AddonHelpers.cmake~ cmake/scripts/common/AddonHelpers.cmake && exit 0
+
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
-%if 0%{?suse_version} > 1320
+#%if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
   #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
-  patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
-  patch -up0 --verbose < %{PATCH5}
-  patch -up4 --verbose < %{PATCH6}
-%endif
+  #patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  #patch -up0 --verbose < %{PATCH5}
+  #patch -up4 --verbose < %{PATCH6}
+#%endif
 
 # fake buildtime in audiodecoder.qsf
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
-            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-
-make VERBOSE=1 %{?_smp_mflags}
+#for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+#            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+#  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+#done
+#patch -p 0 < %{PATCH7}
+#make VERBOSE=1 %{?_smp_mflags}
+
+pushd tools/depends/target/binary-addons
+mkdir -p native
+%cmake \
+    ../../../../../cmake/addons \
+%if %{dev_build}
+    -DVERBOSE=ON \
+%endif
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DBUILD_DIR=build \
+    -DNEED_SUDO=FALSE \
+    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DADDONS_TO_BUILD="all" 
+
+popd
+
+# Patching addons after being unpacked
+pushd cmake/addons
+patch -up0 --verbose -i %{PATCH8}
+patch -up2 --verbose -i %{PATCH9}
 popd
 
+pushd tools/depends/target/binary-addons/build
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7
+#%{?_smp_mflags}
 %install
 #make DESTDIR=%{buildroot} install %{?_smp_mflags}

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

@@ -14,12 +14,13 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
+#
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
+%define kodi_version Leia
 %define _kodi_addons_dir %{_datadir}/kodi/addons
+%define dev_build 1
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +41,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi.binary-addons-noX-raspberry-pi2
-Version:        17.5
+Version:        18.0rc5
 Release:        0
 Summary:        Binary Addons for Kodi
 License:        GPL-2.0+ and GPL-3.0+
@@ -51,7 +52,8 @@
 Source2:        kodi.binary-addons.spec.files.inc
 Source3:        kodi.binary-addons.tar
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
-Source5:        kodi-platform-c8188d8.tar.gz
+Source5:        kodi-platform-e8574b8.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
 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
@@ -60,6 +62,10 @@
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
 Patch5:         lib555-missing-xlocale.patch
 Patch6:         pvr.stalker-gcc7.patch
+# PATCH-PACKMAN kodi.binary.addons-noreturnfromnonvoid.patch - davejplater@gmail.com - Suddenly an rpmlint no return from nonvoid has appeared after taglib was updated.
+Patch7:         kodi.binary.addons-noreturnfromnonvoid.patch
+Patch8:         kodi.binary-addons-screensavers.rsxs-host-toolchain.patch
+Patch9:         kodi.binary-addons-vfs.sacd.no-int-conversion.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -74,22 +80,30 @@
 BuildRequires:  kodi-devel = %{version}
 %endif
 BuildRequires:  tinyxml-devel
+BuildRequires:  liblz4-devel
+BuildRequires:  libnfs-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
 BuildRequires:  libstdc++-devel
+BuildRequires:  libsmbclient-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+BuildRequires:  giflib-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  libhdhomerun-devel
+BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libprojectM)
 BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(lzo2)
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  libraw-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -122,7 +136,7 @@
 %endif
 %endif
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmprath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
@@ -137,56 +151,77 @@
 %patch1
 %patch2
 
-pushd project/cmake/addons
+pushd cmake/addons
 tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires
+# Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
-echo "kodi-platform file://../depends/common/kodi-platform" > depends/common/kodi-platform/kodi-platform.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
 popd
 
 %build
-sed -i~ 's/@@@_libdir@@@/%{_lib}/' project/cmake/scripts/common/AddonHelpers.cmake
-diff -u project/cmake/scripts/common/AddonHelpers.cmake~ project/cmake/scripts/common/AddonHelpers.cmake && exit 0
-pushd project/cmake/addons
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
-%endif
-    -DBUILD_DIR=build \
-    -DBUILD_SHARED_LIBS=1 \
-    -DNEED_SUDO=FALSE \
-    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
+sed -i~ 's/@@@_libdir@@@/%{_lib}/' cmake/scripts/common/AddonHelpers.cmake
+diff -u cmake/scripts/common/AddonHelpers.cmake~ cmake/scripts/common/AddonHelpers.cmake && exit 0
+
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
-%if 0%{?suse_version} > 1320
+#%if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
   #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
-  patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
-  patch -up0 --verbose < %{PATCH5}
-  patch -up4 --verbose < %{PATCH6}
-%endif
+  #patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  #patch -up0 --verbose < %{PATCH5}
+  #patch -up4 --verbose < %{PATCH6}
+#%endif
 
 # fake buildtime in audiodecoder.qsf
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
-            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-
-make VERBOSE=1 %{?_smp_mflags}
+#for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+#            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+#  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+#done
+#patch -p 0 < %{PATCH7}
+#make VERBOSE=1 %{?_smp_mflags}
+
+pushd tools/depends/target/binary-addons
+mkdir -p native
+%cmake \
+    ../../../../../cmake/addons \
+%if %{dev_build}
+    -DVERBOSE=ON \
+%endif
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DBUILD_DIR=build \
+    -DNEED_SUDO=FALSE \
+    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DADDONS_TO_BUILD="all" 
+
+popd
+
+# Patching addons after being unpacked
+pushd cmake/addons
+patch -up0 --verbose -i %{PATCH8}
+patch -up2 --verbose -i %{PATCH9}
 popd
 
+pushd tools/depends/target/binary-addons/build
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7
+#%{?_smp_mflags}
 %install
 #make DESTDIR=%{buildroot} install %{?_smp_mflags}

kodi.binary-addons-noX.spec Changed

@@ -14,12 +14,13 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
+#
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
+%define kodi_version Leia
 %define _kodi_addons_dir %{_datadir}/kodi/addons
+%define dev_build 1
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +41,7 @@
 %define kodi_player none
 
 Name:           kodi.binary-addons-noX
-Version:        17.5
+Version:        18.0rc5
 Release:        0
 Summary:        Binary Addons for Kodi
 License:        GPL-2.0+ and GPL-3.0+
@@ -51,7 +52,8 @@
 Source2:        kodi.binary-addons.spec.files.inc
 Source3:        kodi.binary-addons.tar
 Source4:        repo-binary-addons.%{kodi_version}.tar.bz2
-Source5:        kodi-platform-c8188d8.tar.gz
+Source5:        kodi-platform-e8574b8.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip
 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
@@ -60,6 +62,10 @@
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
 Patch5:         lib555-missing-xlocale.patch
 Patch6:         pvr.stalker-gcc7.patch
+# PATCH-PACKMAN kodi.binary.addons-noreturnfromnonvoid.patch - davejplater@gmail.com - Suddenly an rpmlint no return from nonvoid has appeared after taglib was updated.
+Patch7:         kodi.binary.addons-noreturnfromnonvoid.patch
+Patch8:         kodi.binary-addons-screensavers.rsxs-host-toolchain.patch
+Patch9:         kodi.binary-addons-vfs.sacd.no-int-conversion.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -74,22 +80,30 @@
 BuildRequires:  kodi-devel = %{version}
 %endif
 BuildRequires:  tinyxml-devel
+BuildRequires:  liblz4-devel
+BuildRequires:  libnfs-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
 BuildRequires:  libstdc++-devel
+BuildRequires:  libsmbclient-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+BuildRequires:  giflib-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(flac)
 BuildRequires:  libhdhomerun-devel
+BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libmodplug)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libprojectM)
 BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(lzo2)
 BuildRequires:  pkgconfig(p8-platform)
 BuildRequires:  pkgconfig(tinyxml2)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  libraw-devel
 
 # kodi needs the same libtag version which was used to build against
 %requires_eq    libtag1
@@ -122,7 +136,7 @@
 %endif
 %endif
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmprath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
@@ -137,56 +151,77 @@
 %patch1
 %patch2
 
-pushd project/cmake/addons
+pushd cmake/addons
 tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires
+# Remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
-tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
-echo "kodi-platform file://../depends/common/kodi-platform" > depends/common/kodi-platform/kodi-platform.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
 popd
 
 %build
-sed -i~ 's/@@@_libdir@@@/%{_lib}/' project/cmake/scripts/common/AddonHelpers.cmake
-diff -u project/cmake/scripts/common/AddonHelpers.cmake~ project/cmake/scripts/common/AddonHelpers.cmake && exit 0
-pushd project/cmake/addons
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
-%endif
-    -DBUILD_DIR=build \
-    -DBUILD_SHARED_LIBS=1 \
-    -DNEED_SUDO=FALSE \
-    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
+sed -i~ 's/@@@_libdir@@@/%{_lib}/' cmake/scripts/common/AddonHelpers.cmake
+diff -u cmake/scripts/common/AddonHelpers.cmake~ cmake/scripts/common/AddonHelpers.cmake && exit 0
+
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
-%if 0%{?suse_version} > 1320
+#%if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
   #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
-  patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
-  patch -up0 --verbose < %{PATCH5}
-  patch -up4 --verbose < %{PATCH6}
-%endif
+  #patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  #patch -up0 --verbose < %{PATCH5}
+  #patch -up4 --verbose < %{PATCH6}
+#%endif
 
 # fake buildtime in audiodecoder.qsf
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
-            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
-            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-
-make VERBOSE=1 %{?_smp_mflags}
+#for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+#            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+#            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+#  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+#done
+#patch -p 0 < %{PATCH7}
+#make VERBOSE=1 %{?_smp_mflags}
+
+pushd tools/depends/target/binary-addons
+mkdir -p native
+%cmake \
+    ../../../../../cmake/addons \
+%if %{dev_build}
+    -DVERBOSE=ON \
+%endif
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DBUILD_DIR=build \
+    -DNEED_SUDO=FALSE \
+    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DADDONS_TO_BUILD="all" 
+
+popd
+
+# Patching addons after being unpacked
+pushd cmake/addons
+patch -up0 --verbose -i %{PATCH8}
+patch -up2 --verbose -i %{PATCH9}
 popd
 
+pushd tools/depends/target/binary-addons/build
+make -O %{?_smp_mflags} VERBOSE=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7
+#%{?_smp_mflags}
 %install
 #make DESTDIR=%{buildroot} install %{?_smp_mflags}

_service:download_files:17.5-Krypton.tar.gz Deleted

download_binary-addons.sh Changed