Packman Build Service PMBS

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX.spec Changed

@@ -36,9 +36,9 @@
 %bcond_without enable_rpi_build
 %bcond_without enable_rpi_omxplayer
 Name:           kodi-noX
-Version:        15.0rc1
+Version:        15.0
 Release:        0
-Summary:        Kodi Media center
+Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
@@ -51,8 +51,9 @@
 #Patch2:     disable_omxplayer_3d_support.patch
 Patch3:         cmake_no_deps.patch
 Patch4:         cmake_do_not_download.patch
-Patch5:         cmake_build64.patch
 Patch6:         kodi-texturepacker.patch
+# PATCH-FIX-UPSTREAM: fix build with gcc5 (Tumbleweed)
+Patch7:         kodi-15.0-gcc5.patch
 BuildRequires:  alsa-devel
 BuildRequires:  avahi-devel
 BuildRequires:  bluez-devel
@@ -250,8 +251,8 @@
 %patch1
 %patch3
 %patch4
-%patch5
 %patch6
+%patch7 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -269,10 +270,28 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-chmod +x bootstrap
-./bootstrap
+pushd project/cmake/addons
+# For some non-aparent reason it searches for stuff in build/build/download
+mkdir build; cd build
+mkdir -p build/download
+tar xvf %{SOURCE2} -C build/download
+cd ..
+tar zxvf %{SOURCE3} --strip-components=1 -C depends/common/kodi-platform
+# remove kodi-platform dependencies, because they are alreay installed
+rm -f  depends/common/kodi-platform/deps.txt
+rm -rf depends/common/tinyxml depends/common/platform
+# We do not provide sidplay2 library on any SUSE distribution
+rm -rf addons/audiodecoder.sidplay
+popd
+%if "%{_libdir}" == "/usr/lib64"
+sed -i \
+     -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \
+     project/cmake/scripts/common/addon-helpers.cmake
+%endif
 
 %build
+chmod +x bootstrap
+./bootstrap
 %ifarch armv6l armv6hl
 %if %{with enable_rpi_build}
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
@@ -343,18 +362,12 @@
 make %{?_smp_mflags}
 
 pushd project/cmake/addons
-mkdir -p build/download
-tar xvf %{SOURCE2} -C build/download
-tar zxvf %{SOURCE3} --strip-components=1 -C depends/common/kodi-platform
-# remove kodi-platform dependencies, because they are alreay installed
-rm -f  depends/common/kodi-platform/deps.txt
-rm -rf depends/common/tinyxml depends/common/platform
-# TODO :
-rm -rf addons/audiodecoder.sidplay
-
 %cmake \
     -DBUILD_SHARED_LIBS=1 \
-    -DNEED_SUDO=FALSE
+    -DNEED_SUDO=FALSE \
+    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
 make %{?_smp_mflags}
 popd
 
@@ -362,7 +375,7 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # SuSEfirewall service description
-install -D -m 644 %{_sourcedir}/kodi.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
@@ -409,12 +422,17 @@
 %{_libdir}/kodi/kodi.bin
 %{_libdir}/kodi/kodi-xrandr
 %{_bindir}/kodi-standalone
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/library.xbmc.addon/
 %{_libdir}/kodi/addons/library.xbmc.addon/*
+%dir %{_libdir}/kodi/addons/library.xbmc.codec/
 %{_libdir}/kodi/addons/library.xbmc.codec/*
+%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
 %{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
+%dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
 %dir %{_libdir}/kodi/system
@@ -426,68 +444,125 @@
 %{_mandir}/man1/kodi.1.gz
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
+%dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
+%dir %{_kodi_addons_dir}/metadata.artists.universal/
 %{_kodi_addons_dir}/metadata.artists.universal/*
+%dir %{_kodi_addons_dir}/metadata.common.allmusic.com/
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
+%dir %{_kodi_addons_dir}/metadata.common.amazon.de/
 %{_kodi_addons_dir}/metadata.common.amazon.de/*
+%dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
+%dir %{_kodi_addons_dir}/metadata.common.hdtrailers.net/
 %{_kodi_addons_dir}/metadata.common.hdtrailers.net/*
+%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
 %{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
+%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.last.fm/
 %{_kodi_addons_dir}/metadata.common.last.fm/*
+%dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
+%dir %{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.tvdb.com/
 %{_kodi_addons_dir}/metadata.tvdb.com/*
+%dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
+%dir %{_kodi_addons_dir}/resource.uisounds.confluence/
 %{_kodi_addons_dir}/resource.uisounds.confluence/*
 %if %{with enable_opengl}
+%dir %{_libdir}/kodi/addons/screensaver.rsxs.euphoria/
 %{_libdir}/kodi/addons/screensaver.rsxs.euphoria/*
+%dir %{_kodi_addons_dir}/screensaver.rsxs.euphoria/
 %{_kodi_addons_dir}/screensaver.rsxs.euphoria/*
+%dir %{_libdir}/kodi/addons/screensaver.rsxs.plasma/
 %{_libdir}/kodi/addons/screensaver.rsxs.plasma/*
+%dir %{_kodi_addons_dir}/screensaver.rsxs.plasma/
 %{_kodi_addons_dir}/screensaver.rsxs.plasma/*
+%dir %{_libdir}/kodi/addons/screensaver.rsxs.solarwinds/
 %{_libdir}/kodi/addons/screensaver.rsxs.solarwinds/*
+%dir %{_kodi_addons_dir}/screensaver.rsxs.solarwinds/
 %{_kodi_addons_dir}/screensaver.rsxs.solarwinds/*
 %endif
+%dir %{_kodi_addons_dir}/screensaver.xbmc.builtin.black/
 %{_kodi_addons_dir}/screensaver.xbmc.builtin.black/*
+%dir %{_kodi_addons_dir}/screensaver.xbmc.builtin.dim/
 %{_kodi_addons_dir}/screensaver.xbmc.builtin.dim/*
+%dir %{_kodi_addons_dir}/script.module.pil/
 %{_kodi_addons_dir}/script.module.pil/*
+%dir %{_kodi_addons_dir}/service.xbmc.versioncheck/
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
+%dir %{_kodi_addons_dir}/skin.confluence/
 %{_kodi_addons_dir}/skin.confluence/*
 %if %{with enable_opengl}
+%dir %{_libdir}/kodi/addons/visualization.fishbmc/
 %{_libdir}/kodi/addons/visualization.fishbmc/*
+%dir %{_kodi_addons_dir}/visualization.fishbmc/
 %{_kodi_addons_dir}/visualization.fishbmc/*
 %endif
+%dir %{_libdir}/kodi/addons/visualization.glspectrum/
 %{_libdir}/kodi/addons/visualization.glspectrum/*
+%dir %{_kodi_addons_dir}/visualization.glspectrum/
 %{_kodi_addons_dir}/visualization.glspectrum/*
 %if %{with enable_opengl}
+%dir %{_libdir}/kodi/addons/visualization.goom/
 %{_libdir}/kodi/addons/visualization.goom/*
+%dir %{_kodi_addons_dir}/visualization.goom/
 %{_kodi_addons_dir}/visualization.goom/*
+%dir %{_libdir}/kodi/addons/visualization.projectm/
 %{_libdir}/kodi/addons/visualization.projectm/*
+%dir %{_kodi_addons_dir}/visualization.projectm/
 %{_kodi_addons_dir}/visualization.projectm/*
 %endif
+%dir %{_kodi_addons_dir}/visualization.vortex/
 %{_kodi_addons_dir}/visualization.vortex/*

kodi.spec Changed

15.0-Isengard.tar.gz Added

15.0rc2-Isengard.tar.gz Deleted

Changes of Revision 42