Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

kodi.spec Changed

@@ -18,10 +18,10 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Jarvis
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%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 0
 %if %{noX_build}
@@ -42,7 +42,8 @@
 %define kodi_player none
 
 Name:           kodi
-Version:        16.0
+#Version:        17.0
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -50,11 +51,14 @@
 Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
-Source2:        crossguid-8f399e8bd4.tar.gz
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+Source20:       crossguid-8f399e8bd4.tar.gz
+Source21:       libdvdcss-master.tar.gz
+Source22:       libdvdread-master.tar.gz
+Source23:       libdvdnav-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
@@ -242,10 +246,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+
 %patch1
 %patch2
 %patch3
-%patch4 -p0
+#%patch4 -p0
 
 
 # Remove build time references so build-compare can do its work
@@ -268,8 +273,10 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE2} tools/depends/target/crossguid
-
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdcss
+cp %{SOURCE22} tools/depends/target/libdvdread
+cp %{SOURCE23} tools/depends/target/libdvdnav
 
 %build
 
@@ -349,7 +356,7 @@
     --disable-optimizations \
     --disable-static 
 
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
@@ -427,6 +434,10 @@
 %{_mandir}/man1/kodi.1.gz
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
+%dir %{_kodi_addons_dir}/game.controller.default
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -461,8 +472,6 @@
 %{_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/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
 %dir %{_kodi_addons_dir}/xbmc.codec/
@@ -499,14 +508,36 @@
 %{_kodi_addons_dir}/xbmc.webinterface/*
 %dir %{_kodi_addons_dir}/kodi.adsp
 %{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/library.kodi.adsp
-%{_kodi_addons_dir}/library.kodi.adsp/*
-%dir %{_kodi_addons_dir}/library.kodi.audioengine
-%{_kodi_addons_dir}/library.kodi.audioengine/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
+%dir %{_kodi_addons_dir}/skin.estuary
+%{_kodi_addons_dir}/skin.estuary/*
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%{_libdir}/kodi/archsetup.cmake
+%{_libdir}/kodi/checkcommits.cmake
+%{_libdir}/kodi/generateversionedfiles.cmake
+%{_libdir}/kodi/generatorsetup.cmake
+%{_libdir}/kodi/macros.cmake
+%{_libdir}/kodi/managestring.cmake
+%{_libdir}/kodi/pathsetup.cmake
+%{_libdir}/kodi/projectmacros.cmake
 %{_libdir}/kodi/addon-helpers.cmake
 %{_libdir}/kodi/addoptions.cmake
 %{_libdir}/kodi/check_target_platform.cmake
@@ -514,12 +545,6 @@
 %{_libdir}/kodi/kodi-config.cmake
 %{_libdir}/kodi/prepare-env.cmake
 %{_libdir}/kodi/xbmc-config.cmake
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
 
 %if %{noX_build}
 %{_unitdir}/kodi-noX.service
@@ -530,10 +555,17 @@
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
+%{_includedir}/kodi/AEChannelData.h
 %{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
 %{_includedir}/kodi/libXBMC_addon.h
 %{_includedir}/kodi/libXBMC_codec.h
 %{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
 %{_includedir}/kodi/xbmc_addon_cpp_dll.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
@@ -543,19 +575,22 @@
 %{_includedir}/kodi/xbmc_pvr_types.h
 %{_includedir}/kodi/xbmc_scr_dll.h
 %{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_stream_utils.hpp
 %{_includedir}/kodi/xbmc_vis_dll.h
 %{_includedir}/kodi/xbmc_vis_types.h
 %{_includedir}/kodi/xbmc_audioenc_dll.h
 %{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/AEChannelData.h
 %{_includedir}/kodi/kodi_audiodec_dll.h
 %{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/libKODI_guilib.h
 %{_includedir}/kodi/kodi_adsp_dll.h
 %{_includedir}/kodi/kodi_adsp_types.h
 %{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
 
 %changelog

no-xbmc-symbolic-link.patch Changed

@@ -1,6 +1,6 @@
---- Makefile.in.orig	2016-02-15 06:46:03.149076640 +0200
-+++ Makefile.in	2016-02-15 06:47:14.550439552 +0200
-@@ -464,7 +464,6 @@
+--- Makefile.in.orig	2016-03-31 21:54:56.341468445 +0300
++++ Makefile.in	2016-03-31 21:55:26.720402549 +0300
+@@ -460,7 +460,6 @@
  install-binaries: install-scripts
  	@echo "Copying @APP_NAME_LC@ binary to $(DESTDIR)$(libdir)/@APP_NAME_LC@/"
  	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
@@ -8,22 +8,22 @@
  ifeq (1,@USE_X11@)
  	@install @APP_NAME_LC@-xrandr $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@-xrandr
  endif
-@@ -502,14 +501,10 @@
+@@ -498,14 +497,10 @@
  install-scripts:
  	@install -d $(DESTDIR)$(bindir)
- 	@install tools/Linux/@APP_NAME_LC@.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
+ 	@install tools/Linux/kodi.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
 -	@cd $(DESTDIR)$(bindir); [ -L xbmc ] || [ -f xbmc ] || ln -s @APP_NAME_LC@ xbmc
- 	@install tools/Linux/@APP_NAME_LC@-standalone.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@-standalone
+ 	@install tools/Linux/kodi-standalone.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@-standalone
 -	@cd $(DESTDIR)$(bindir); [ -L xbmc-standalone ] || [ -f xbmc-standalone ] ||  ln -s @APP_NAME_LC@-standalone xbmc-standalone
  	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
 -	@cd $(DESTDIR)$(datarootdir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
  	@install -d $(DESTDIR)$(datarootdir)/xsessions
- 	@install -m 0644 tools/Linux/@APP_NAME_LC@-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
+ 	@install -m 0644 tools/Linux/kodi-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
 -	@cd $(DESTDIR)$(datarootdir)/xsessions; [ -L xbmc.desktop ] || [ -f xbmc.desktop ] || ln -s @APP_NAME_LC@.desktop xbmc.desktop
  
  install-datas: install-scripts
  	@echo "Copying support and legal files..."
-@@ -574,7 +569,6 @@
+@@ -570,7 +565,6 @@
  	@for f in project/cmake/scripts/common/*.cmake; do \
  	  install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \
  	done

_service:download_url:master.tar.gz Changed

libdvdcss-master.tar.gz Added

libdvdnav-master.tar.gz Added

libdvdread-master.tar.gz Added