Packman Build Service PMBS

kodi.spec Changed

@@ -7,9 +7,8 @@
 
 %define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
 %define _kodi_addons_dir %{_datadir}/kodi/addons
-%define ffmpeg_archive_name 2.4.6-Helix
-%define pvr_addons_archive_name Helix_rc3
-%define kodi_version Helix
+%define ffmpeg_archive_name 2.6.2-Isengard-beta
+%define kodi_version Isengard
 
 %bcond_without enable_rpi_build
 %bcond_without enable_rpi_omxplayer
@@ -31,21 +30,24 @@
 %endif
 
 Name:        kodi
-Version:     14.2
+Version:     15.0rc1
 Release:     0
 Summary:     Kodi Media center
 License:     GPL-2.0+ and GPL-3.0+
 Group:       Productivity/Multimedia/Video/Players
 Url:         http://kodi.tv/
 
-Source0:     %{version}-%{kodi_version}.tar.gz
-Source1:     https://github.com/opdenkamp/xbmc-pvr-addons/archive/%{pvr_addons_archive_name}.tar.gz
-Source2:     https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
-# PATCH-FIX-OPENSUSE -- enable all pvr addons
-Patch0:      pvr-addons-enable-all.patch
+Source0:     %{version}-%{kodi_version}.tar.gz 
+Source1:     https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz
+Source2:     pvr-addons.tar.bz2
+Source3:     kodi-platform-054a42f66.tar.gz
 Patch1:      no-xbmc-symbolic-link.patch
+Patch2:      float_tk.patch
 # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI
 #Patch2:     disable_omxplayer_3d_support.patch
+Patch3:	     cmake_no_deps.patch
+Patch4:      cmake_do_not_download.patch
+Patch5:      cmake_build64.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-build
 ExcludeArch: ppc64
 %if %{noX_build}
@@ -95,18 +97,21 @@
 %if %{with enable_opengl}
 BuildRequires:  glew-devel
 %endif
+BuildRequires:  giflib-devel
 BuildRequires:  glibc-devel
 BuildRequires:	gmp-devel
 BuildRequires:  gperf
 BuildRequires:  java
+BuildRequires:	jsoncpp-devel
 BuildRequires:  libSDL-devel
 BuildRequires:  libSDL_image-devel
 BuildRequires:  libSDL_mixer-devel
 BuildRequires:  libass-devel >= 0.9.7
 BuildRequires:  libbluray-devel
 BuildRequires:  libbz2-devel
+BuildRequires:  libcap-devel
 BuildRequires:  libcdio-devel
-BuildRequires:  libcec-devel = 2.2.0
+BuildRequires:  cec-client-devel >= 3.0.0
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
@@ -116,24 +121,27 @@
 BuildRequires:  libfaac-devel
 #BuildRequires:  libffmpeg-devel
 BuildRequires:  libgcrypt-devel
+BuildRequires:  libgnutls-devel
 BuildRequires:  libgpg-error-devel
 BuildRequires:  libhdhomerun-devel
+BuildRequires:  libhogweed2
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmodplug-devel
+BuildRequires:	libmp3lame-devel
 BuildRequires:  libmpeg2-devel
 BuildRequires:  libnettle-devel
 BuildRequires:  libnfs-devel
 BuildRequires:  libogg-devel
 BuildRequires:  libpcrecpp0
+BuildRequires:	libplatform-devel
 BuildRequires:  libplist-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  librtmp-devel
 BuildRequires:  libsamplerate-devel
-BuildRequires:  shairplay-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libssh-devel
 BuildRequires:  libstdc++-devel
@@ -146,6 +154,8 @@
 BuildRequires:  libvdpau-devel
 %endif
 BuildRequires:  libvorbis-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
 BuildRequires:  mysql-devel
@@ -153,15 +163,14 @@
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  python-devel
+BuildRequires:	readline-devel
+BuildRequires:  shairplay-devel
+BuildRequires:	sidplay-libs-devel libsidplay2-1 
 BuildRequires:  sqlite-devel
 BuildRequires:  swig
-BuildRequires:  tinyxml-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  libxslt-devel
+BuildRequires:  tinyxml2-devel tinyxml-devel
 BuildRequires:  unzip
-BuildRequires:  libgnutls-devel
 BuildRequires:  bluez-devel
-BuildRequires:  libcap-devel
 %if !%{noX_build}
 BuildRequires:  xorg-x11-devel
 %endif
@@ -214,44 +223,42 @@
 %endif
 
 %description devel
-Development files for the Kodi media Center
+Development files for Kodi Media Center
+
+%package pvr.addons
+Summary:	PVR Addons files for Kodi
+Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name}
+%if %{noX_build}
+Conflicts:      %{name}-pvr.addons
+%else
+Conflicts:      %{name}-noX-pvr.addons
+%endif
+
+%description pvr.addons
+PVR Addons for Kodi Media Center
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%patch0
+#%if !%{noX_build}
+#%patch2
+#%endif
+
 %patch1
-%if !%{noX_build}
-#%%patch2
+%patch3
+%patch4
+%ifarch x86_64
+%patch5
 %endif
 
-tar -xf %{SOURCE1}
-mv xbmc-pvr-addons-%{pvr_addons_archive_name} pvr-addons
-pushd pvr-addons
-./bootstrap
-popd
-
-#cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
+cp %{SOURCE1} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
 
 # 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')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
-
-# remove it in ffmpeg archive and repackage it
-tar xpfz %{SOURCE2} -C tools/depends/target/ffmpeg/
-for file in tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/cmdutils.c; do
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
-tar cpfz tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz -C tools/depends/target/ffmpeg/ FFmpeg-%{ffmpeg_archive_name}/
-rm -r tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}
-
-# remove the remaining occurencies in the source tree
-for file in lib/timidity/timidity/speex_a.c xbmc/Application.cpp xbmc/GUIInfoManager.cpp ; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
-  sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
-done
 
 chmod +x bootstrap
 ./bootstrap
@@ -306,10 +313,27 @@
 %endif
 
 make %{?_smp_mflags}
-#make -j1 V=0
+
+pushd project/cmake/addons

cmake_build64.patch Added

cmake_do_not_download.patch Added

@@ -0,0 +1,80 @@
+--- project/cmake/scripts/common/handle-depends.cmake.orig	2015-06-02 20:42:49.403633056 +0300
++++ project/cmake/scripts/common/handle-depends.cmake	2015-06-03 06:23:21.574707199 +0300
+@@ -124,12 +124,12 @@
+         endif()
+ 
+         # check if there's a deps.txt containing dependencies on other libraries
+-        if(EXISTS ${dir}/deps.txt)
+-          file(STRINGS ${dir}/deps.txt deps)
+-          message(STATUS "${id} depends: ${deps}")
+-        else()
+-          set(deps)
+-        endif()
++        #if(EXISTS ${dir}/deps.txt)
++        #  file(STRINGS ${dir}/deps.txt deps)
++        #  message(STATUS "${id} depends: ${deps}")
++        #else()
++        #  set(deps)
++        #endif()
+ 
+         if(CROSS_AUTOCONF AND AUTOCONF_FILES)
+           foreach(afile ${AUTOCONF_FILES})
+@@ -152,17 +152,18 @@
+                                   "${INSTALL_COMMAND}")
+ 
+         # if there's an url defined we need to pass that to externalproject_add()
++	set(url "")
+         if(DEFINED url AND NOT "${url}" STREQUAL "")
+           # check if there's a third parameter in the file
+-          if(deflength GREATER 2)
+-            # the third parameter is considered as a revision of a git repository
+-            list(GET def 2 revision)
+-
+-            externalproject_add(${id}
+-                                GIT_REPOSITORY ${url}
+-                                GIT_TAG ${revision}
+-                                "${EXTERNALPROJECT_SETUP}")
+-          else()
++        #  if(deflength GREATER 2)
++        #    # the third parameter is considered as a revision of a git repository
++        #    list(GET def 2 revision)
++	#
++        #    externalproject_add(${id}
++        #                        GIT_REPOSITORY ${url}
++        #                        GIT_TAG ${revision}
++        #                        "${EXTERNALPROJECT_SETUP}")
++        #  else()
+             set(CONFIGURE_COMMAND "")
+             if(NOT WIN32)
+               # manually specify the configure command to be able to pass in the custom PKG_CONFIG_PATH
+@@ -177,22 +178,25 @@
+                                     -DCMAKE_EXE_LINKER_FLAGS=-L${OUTPUT_DIR}/lib
+                                     -DCMAKE_INCLUDE_PATH=${OUTPUT_DIR}/include)
+             endif()
+-
++	    message(STATUS "DOWNLOAD_DIR = ${BUILD_DIR}/download")
++	    message(STATUS "CONFIGURE_COMMAND = ${CONFIGURE_COMMAND}")
+             externalproject_add(${id}
+                                 URL ${url}
+                                 DOWNLOAD_DIR ${BUILD_DIR}/download
+                                 CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
+                                 "${EXTERNALPROJECT_SETUP}")
+-          endif()
++        #  endif()
+         else()
++	  message(STATUS " SOURCE_DIR = ${dir}")
++	  message(STATUS " SETUP = ${EXTERNALPROJECT_SETUP}")
+           externalproject_add(${id}
+                               SOURCE_DIR ${dir}
+                               "${EXTERNALPROJECT_SETUP}")
+         endif()
+ 
+-        if(deps)
+-          add_dependencies(${id} ${deps})
+-        endif()
++        #if(deps)
++        #  add_dependencies(${id} ${deps})
++        #endif()
+       endif()
+ 
+       # if the dependency is available for the target platform add it to the list of the addon's dependencies

cmake_no_deps.patch Added

@@ -0,0 +1,28 @@
+--- project/cmake/addons/CMakeLists.txt.orig	2015-05-16 21:14:41.654680016 +0300
++++ project/cmake/addons/CMakeLists.txt	2015-05-16 21:16:13.099495848 +0300
+@@ -265,16 +265,16 @@
+           # add "kodi-platform" as a dependency to every addon
+           add_dependencies(${id} kodi-platform)
+ 
+-          set(${id}_DEPENDS_DIR ${SOURCE_DIR}/depends)
++          #set(${id}_DEPENDS_DIR ${SOURCE_DIR}/depends)
+ 
+-          if(EXISTS ${${id}_DEPENDS_DIR})
+-            include(${APP_ROOT}/project/cmake/scripts/common/handle-depends.cmake)
+-            add_addon_depends(${id} ${${id}_DEPENDS_DIR})
+-            if(${id}_DEPS AND NOT "${${id}_DEPS}" STREQUAL "")
+-              message(STATUS "${id} DEPENDENCIES: ${${id}_DEPS}")
+-              add_dependencies(${id} ${${id}_DEPS})
+-            endif()
+-          endif()
++          #if(EXISTS ${${id}_DEPENDS_DIR})
++          #  include(${APP_ROOT}/project/cmake/scripts/common/handle-depends.cmake)
++          #  add_addon_depends(${id} ${${id}_DEPENDS_DIR})
++          #  if(${id}_DEPS AND NOT "${${id}_DEPS}" STREQUAL "")
++          #    message(STATUS "${id} DEPENDENCIES: ${${id}_DEPS}")
++          #    add_dependencies(${id} ${${id}_DEPS})
++          #  endif()
++          #endif()
+         else()
+           message(FATAL_ERROR "${id}: invalid or missing addon source directory at ${SOURCE_DIR}")
+         endif()

no-xbmc-symbolic-link.patch Changed

@@ -1,22 +1,29 @@
---- Makefile.in.orig	2014-12-11 19:53:57.329541044 +0200
-+++ Makefile.in	2014-12-11 19:59:00.337752920 +0200
-@@ -564,7 +564,6 @@
+--- Makefile.in.orig	2015-06-14 22:04:27.173202995 +0300
++++ Makefile.in	2015-06-14 22:04:52.094240003 +0300
+@@ -514,7 +514,6 @@
  install-binaries: install-scripts
  	@echo "Copying @APP_NAME_LC@ binary to $(DESTDIR)$(libdir)/@APP_NAME_LC@/"
  	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
 -	@cd $(DESTDIR)$(libdir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
- ifeq (1,@USE_XRANDR@)
+ ifeq (1,@USE_X11@)
  	@install @APP_NAME_LC@-xrandr $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@-xrandr
  endif
-@@ -608,7 +607,6 @@
+@@ -552,14 +551,10 @@
+ install-scripts:
+ 	@install -d $(DESTDIR)$(bindir)
+ 	@install tools/Linux/@APP_NAME_LC@.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
- 	@cd $(DESTDIR)$(bindir); [ -L xbmc-standalone ] || [ -f xbmc-standalone ] ||  ln -s @APP_NAME_LC@-standalone xbmc-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 -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/FEH.py
  	@install -d $(DESTDIR)$(datarootdir)/xsessions
  	@install -m 0644 tools/Linux/@APP_NAME_LC@-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
-@@ -677,7 +675,6 @@
+-	@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..."
+@@ -624,7 +619,6 @@
  	@for f in project/cmake/scripts/common/*.cmake; do \
  	  install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \
  	done

pvr-addons-enable-all.patch Deleted

14.2-Helix.tar.gz Deleted

15.0rc1-Isengard.tar.gz Added

_service:download_files:2.6.2-Isengard-beta.tar.gz Added

download_pvr.sh Added

kodi-platform-054a42f66.tar.gz Added

pvr-addons.tar.bz2 Added

Changes of Revision 18