Packman Build Service PMBS

kodi-noX.changes Changed

@@ -1,4 +1,27 @@
 -------------------------------------------------------------------
+Thu Jul 23 14:14:30 UTC 2015 - scarabeus@opensuse.org
+
+- Run over with spec-cleaner
+- kodi-xrandr is not around with noX variant
+
+-------------------------------------------------------------------
+Wed Jul 22 12:03:42 UTC 2015 - scarabeus@opensuse.org
+
+- Add hicolor-icon-theme to builddeps as that pkg provide some
+  directories for us
+
+-------------------------------------------------------------------
+Wed Jul 22 11:31:38 UTC 2015 - scarabeus@opensuse.org
+
+- Tweak a bit download_pvr.sh to be easier to use
+
+-------------------------------------------------------------------
+Wed Jul 22 09:11:12 UTC 2015 - sagiben@gmail.com scarabeus@opensuse.org
+
+- Version update to Kodi 15.0 Isengard:
+  http://kodi.wiki/view/Kodi_v15_(Isengard)_changelog
+
+-------------------------------------------------------------------
 Wed Jul  8 07:22:43 UTC 2015 - olaf@aepfle.de
 
 - Fix rsxs build in Factory

kodi.changes Changed

@@ -1,4 +1,27 @@
 -------------------------------------------------------------------
+Thu Jul 23 14:14:30 UTC 2015 - scarabeus@opensuse.org
+
+- Run over with spec-cleaner
+- kodi-xrandr is not around with noX variant
+
+-------------------------------------------------------------------
+Wed Jul 22 12:03:42 UTC 2015 - scarabeus@opensuse.org
+
+- Add hicolor-icon-theme to builddeps as that pkg provide some
+  directories for us
+
+-------------------------------------------------------------------
+Wed Jul 22 11:31:38 UTC 2015 - scarabeus@opensuse.org
+
+- Tweak a bit download_pvr.sh to be easier to use
+
+-------------------------------------------------------------------
+Wed Jul 22 09:11:12 UTC 2015 - sagiben@gmail.com scarabeus@opensuse.org
+
+- Version update to Kodi 15.0 Isengard:
+  http://kodi.wiki/view/Kodi_v15_(Isengard)_changelog
+
+-------------------------------------------------------------------
 Wed Jul  8 07:22:43 UTC 2015 - olaf@aepfle.de
 
 - Fix rsxs build in Factory

kodi-noX.spec Changed

@@ -1,19 +1,25 @@
 #
-# Please submit bugfixes or comments via https://bugs.links2linux.org/
+# spec file for package kodi
 #
-# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with the pre_checkin.sh script
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
-%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
+# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
+# kodi.* files with the pre_checkin.sh script
+%define kodi_version Isengard
 %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
-
-%bcond_without enable_rpi_build
-%bcond_without enable_rpi_omxplayer
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build ("%{name}" == "kodi-noX")
 %if %{noX_build}
@@ -21,7 +27,7 @@
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
-%ifarch %{arm} armv6l armv6hl
+%ifarch %arm armv6l armv6hl
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
@@ -29,159 +35,151 @@
 %bcond_with enable_opengles
 %endif
 %endif
-
-Name:        kodi-noX
-Version:     14.2
-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
-Patch1:      no-xbmc-symbolic-link.patch
-Patch2:      kodi-rsxs.patch
+%bcond_without enable_rpi_build
+%bcond_without enable_rpi_omxplayer
+Name:           kodi-noX
+Version:        15.0
+Release:        0
+Summary:        Media center (formerly known as XBMC)
+License:        GPL-2.0+ and GPL-3.0+
+Group:          Productivity/Multimedia/Video/Players
+Url:            http://kodi.tv/
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source1:        kodi.SuSEFirewall2
+# Generated by:
+#   cd xbmc-VERSION
+#   sh ../download_pvr.sh
+Source2:        pvr-addons.tar.bz2
+Source3:        kodi-platform-054a42f66.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
 # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI
-#Patch2:     disable_omxplayer_3d_support.patch
-BuildRoot:   %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ppc64
-%if %{noX_build}
-Conflicts:   kodi
-%else
-Conflicts:   kodi-noX
-%endif
-Obsoletes:   xbmc <= %{version}
-Provides:    xbmc = %{version}
-Conflicts:   xbmc
-
-%if 0%{?suse_version} < 1140
-BuildRequires:  hal-devel
-%endif
-%if 0%{?fedora} >= 14
-BuildRequires:  gettext-autopoint
-%else
-BuildRequires:  gettext
-%endif
-%ifarch armv6l armv6hl
-%if %{with enable_rpi_build}
-%if %{with enable_rpi_omxplayer}
-BuildRequires:  omxplayer
-%endif
-%endif
-%endif
-BuildRequires:  -post-build-checks
-BuildRequires:  alsa-devel
+#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:  avahi-devel
 BuildRequires:  boost-devel
+BuildRequires:  byacc
 BuildRequires:  ccache
 # needed to delete the fixed rpath introduced by smbclient
 BuildRequires:  chrpath
 BuildRequires:  cmake
-BuildRequires:  curl curl-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
-BuildRequires:  enca-devel
 BuildRequires:  fdupes
-BuildRequires:  flac-devel
 BuildRequires:  flex
-BuildRequires:  fontconfig-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  fribidi-devel
 BuildRequires:  ftgl-devel
 BuildRequires:  gcc-c++
-%if %{with enable_opengl}
-BuildRequires:  glew-devel
-%endif
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
 BuildRequires:  glibc-devel
-BuildRequires:	gmp-devel
+BuildRequires:  gmp-devel
 BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
-BuildRequires:  libSDL-devel
-BuildRequires:  libSDL_image-devel
-BuildRequires:  libSDL_mixer-devel
-BuildRequires:  libass-devel >= 0.9.7
-BuildRequires:  libbluray-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libcdio-devel
-BuildRequires:  libcec-devel >= 2.2.0
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libdca-devel
-BuildRequires:  libdvdread-devel
-BuildRequires:  libexpat-devel
+BuildRequires:  libcap-devel
 BuildRequires:  libfaac-devel
-#BuildRequires:  libffmpeg-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
-BuildRequires:  libhdhomerun-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libmad-devel
-BuildRequires:  libmicrohttpd-devel
-BuildRequires:  libmodplug-devel
-BuildRequires:  libmpeg2-devel
-BuildRequires:  libnettle-devel
-BuildRequires:  libnfs-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libpcrecpp0
-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:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
 BuildRequires:  libstdc++-devel
-BuildRequires:  libtag-devel >= 1.8
-BuildRequires:  libtiff-devel
 BuildRequires:  libtool
-BuildRequires:  libudev-devel
-BuildRequires:  libva-devel
-%if %{with enable_opengl}
-BuildRequires:  libvdpau-devel
-%endif
-BuildRequires:  libvorbis-devel

kodi.spec Changed

@@ -1,19 +1,25 @@
 #
-# Please submit bugfixes or comments via https://bugs.links2linux.org/
+# spec file for package kodi
 #
-# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with the pre_checkin.sh script
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
-%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
+# Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
+# kodi.* files with the pre_checkin.sh script
+%define kodi_version Isengard
 %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
-
-%bcond_without enable_rpi_build
-%bcond_without enable_rpi_omxplayer
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build ("%{name}" == "kodi-noX")
 %if %{noX_build}
@@ -21,7 +27,7 @@
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
-%ifarch %{arm} armv6l armv6hl
+%ifarch %arm armv6l armv6hl
 %bcond_with enable_opengl
 %bcond_without enable_opengles
 %else
@@ -29,159 +35,151 @@
 %bcond_with enable_opengles
 %endif
 %endif
-
-Name:        kodi
-Version:     14.2
-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
-Patch1:      no-xbmc-symbolic-link.patch
-Patch2:      kodi-rsxs.patch
+%bcond_without enable_rpi_build
+%bcond_without enable_rpi_omxplayer
+Name:           kodi
+Version:        15.0
+Release:        0
+Summary:        Media center (formerly known as XBMC)
+License:        GPL-2.0+ and GPL-3.0+
+Group:          Productivity/Multimedia/Video/Players
+Url:            http://kodi.tv/
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source1:        kodi.SuSEFirewall2
+# Generated by:
+#   cd xbmc-VERSION
+#   sh ../download_pvr.sh
+Source2:        pvr-addons.tar.bz2
+Source3:        kodi-platform-054a42f66.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
 # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI
-#Patch2:     disable_omxplayer_3d_support.patch
-BuildRoot:   %{_tmppath}/%{name}-%{version}-build
-ExcludeArch: ppc64
-%if %{noX_build}
-Conflicts:   kodi
-%else
-Conflicts:   kodi-noX
-%endif
-Obsoletes:   xbmc <= %{version}
-Provides:    xbmc = %{version}
-Conflicts:   xbmc
-
-%if 0%{?suse_version} < 1140
-BuildRequires:  hal-devel
-%endif
-%if 0%{?fedora} >= 14
-BuildRequires:  gettext-autopoint
-%else
-BuildRequires:  gettext
-%endif
-%ifarch armv6l armv6hl
-%if %{with enable_rpi_build}
-%if %{with enable_rpi_omxplayer}
-BuildRequires:  omxplayer
-%endif
-%endif
-%endif
-BuildRequires:  -post-build-checks
-BuildRequires:  alsa-devel
+#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:  avahi-devel
 BuildRequires:  boost-devel
+BuildRequires:  byacc
 BuildRequires:  ccache
 # needed to delete the fixed rpath introduced by smbclient
 BuildRequires:  chrpath
 BuildRequires:  cmake
-BuildRequires:  curl curl-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
-BuildRequires:  enca-devel
 BuildRequires:  fdupes
-BuildRequires:  flac-devel
 BuildRequires:  flex
-BuildRequires:  fontconfig-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  fribidi-devel
 BuildRequires:  ftgl-devel
 BuildRequires:  gcc-c++
-%if %{with enable_opengl}
-BuildRequires:  glew-devel
-%endif
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
 BuildRequires:  glibc-devel
-BuildRequires:	gmp-devel
+BuildRequires:  gmp-devel
 BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
-BuildRequires:  libSDL-devel
-BuildRequires:  libSDL_image-devel
-BuildRequires:  libSDL_mixer-devel
-BuildRequires:  libass-devel >= 0.9.7
-BuildRequires:  libbluray-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libcdio-devel
-BuildRequires:  libcec-devel >= 2.2.0
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libdca-devel
-BuildRequires:  libdvdread-devel
-BuildRequires:  libexpat-devel
+BuildRequires:  libcap-devel
 BuildRequires:  libfaac-devel
-#BuildRequires:  libffmpeg-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
-BuildRequires:  libhdhomerun-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libmad-devel
-BuildRequires:  libmicrohttpd-devel
-BuildRequires:  libmodplug-devel
-BuildRequires:  libmpeg2-devel
-BuildRequires:  libnettle-devel
-BuildRequires:  libnfs-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libpcrecpp0
-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:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
 BuildRequires:  libstdc++-devel
-BuildRequires:  libtag-devel >= 1.8
-BuildRequires:  libtiff-devel
 BuildRequires:  libtool
-BuildRequires:  libudev-devel
-BuildRequires:  libva-devel
-%if %{with enable_opengl}
-BuildRequires:  libvdpau-devel
-%endif
-BuildRequires:  libvorbis-devel

cmake_build64.patch Added

cmake_do_not_download.patch Added

@@ -0,0 +1,122 @@
+Index: project/cmake/scripts/common/handle-depends.cmake
+===================================================================
+--- project/cmake/scripts/common/handle-depends.cmake.orig
++++ project/cmake/scripts/common/handle-depends.cmake
+@@ -124,12 +124,12 @@ function(add_addon_depends addon searchp
+         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 @@ function(add_addon_depends addon searchp
+                                   "${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 @@ function(add_addon_depends addon searchp
+                                     -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
+Index: project/cmake/addons/CMakeLists.txt
+===================================================================
+--- project/cmake/addons/CMakeLists.txt.orig
++++ project/cmake/addons/CMakeLists.txt
+@@ -123,12 +123,12 @@ include(${APP_ROOT}/project/cmake/script
+ 
+ # check install permissions
+ set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+-check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
+-if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-  set(NEED_SUDO TRUE)
+-  set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
+-  message(STATUS "NEED_SUDO: ${NEED_SUDO}")
+-endif()
++#check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
++#if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
++#  set(NEED_SUDO TRUE)
++#  set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
++#  message(STATUS "NEED_SUDO: ${NEED_SUDO}")
++#endif()
+ 
+ ### prepare the build environment for the binary addons
+ # copy the prepare-env.cmake script to the depends path so that we can include it
+@@ -221,11 +221,11 @@ foreach(addon ${addons})
+             endif()
+ 
+             # download the addon
+-            file(DOWNLOAD "${url}" "${BUILD_DIR}/download/${archive_name}.tar.gz" STATUS dlstatus LOG dllog SHOW_PROGRESS)
+-            list(GET dlstatus 0 retcode)
+-            if(NOT ${retcode} EQUAL 0)
+-              message(FATAL_ERROR "ERROR downloading ${url} - status: ${dlstatus} log: ${dllog}")
+-            endif()
++            #file(DOWNLOAD "${url}" "${BUILD_DIR}/download/${archive_name}.tar.gz" STATUS dlstatus LOG dllog SHOW_PROGRESS)
++            #list(GET dlstatus 0 retcode)
++            #if(NOT ${retcode} EQUAL 0)
++            #  message(FATAL_ERROR "ERROR downloading ${url} - status: ${dlstatus} log: ${dllog}")
++            #endif()
+           endif()
+ 
+           # remove any previously extracted version of the addon

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()

kodi-15.0-gcc5.patch Added

kodi-rsxs.patch Deleted

@@ -1,179 +0,0 @@
----
- xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h |   78 ++++++++++++------------
- xbmc/screensavers/rsxs-0.9/lib/argp.h           |   30 ++++-----
- 2 files changed, 56 insertions(+), 52 deletions(-)
-
-Index: b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
-===================================================================
---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
-@@ -135,16 +135,6 @@ extern ssize_t argp_fmtstream_printf (ar
- 				      const char *__fmt, ...)
-      __attribute__ ((__format__ (printf, 2, 3)));
- 
--extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
--extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
--
--extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
--extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
--
--extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
--				      const char *__str, size_t __len);
--extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
--				    const char *__str, size_t __len);
- &#xc;
- /* Access macros for various bits of state.  */
- #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
-@@ -154,33 +144,7 @@ extern size_t argp_fmtstream_write (argp
- #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
- #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
- 
--/* Set __FS's left margin to LMARGIN and return the old value.  */
--extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
--					  size_t __lmargin);
--extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
--					    size_t __lmargin);
--
--/* Set __FS's right margin to __RMARGIN and return the old value.  */
--extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
--					  size_t __rmargin);
--extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
--					    size_t __rmargin);
--
--/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
--extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
--					  size_t __wmargin);
--extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
--					    size_t __wmargin);
--
--/* Return the column number of the current output point in __FS.  */
--extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
--extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
--
--/* Internal routines.  */
--extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
--extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
- extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
--extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
- &#xc;
- #ifdef __OPTIMIZE__
- /* Inline versions of above routines.  */
-@@ -199,9 +163,9 @@ extern int __argp_fmtstream_ensure (argp
- 
- #ifndef ARGP_FS_EI
- #ifdef __clang__
--#define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
-+#define ARGP_FS_EI static inline __attribute__ ((__gnu_inline__))
- #else
--#define ARGP_FS_EI extern inline
-+#define ARGP_FS_EI static inline
- #endif
- #endif
- 
-@@ -298,6 +262,44 @@ __argp_fmtstream_point (argp_fmtstream_t
- #undef __argp_fmtstream_ensure
- #endif
- 
-+#else
-+extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
-+				      const char *__str, size_t __len);
-+extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
-+				    const char *__str, size_t __len);
-+/* Set __FS's left margin to LMARGIN and return the old value.  */
-+extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
-+					  size_t __lmargin);
-+extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
-+					    size_t __lmargin);
-+
-+/* Set __FS's right margin to __RMARGIN and return the old value.  */
-+extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
-+					  size_t __rmargin);
-+extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
-+					    size_t __rmargin);
-+
-+/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
-+extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
-+					  size_t __wmargin);
-+extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
-+					    size_t __wmargin);
-+
-+/* Return the column number of the current output point in __FS.  */
-+extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
-+extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
-+
-+/* Internal routines.  */
-+extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
-+extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
-+extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
-+
-+extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
-+extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
-+
-+extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-+extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-+
- #endif /* __OPTIMIZE__ */
- 
- #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
-Index: b/xbmc/screensavers/rsxs-0.9/lib/argp.h
-===================================================================
---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h
-+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h
-@@ -500,10 +500,6 @@ extern void __argp_state_help (const str
- 			       FILE *__restrict __stream,
- 			       unsigned int __flags);
- 
--/* Possibly output the standard usage message for ARGP to stderr and exit.  */
--extern void argp_usage (const struct argp_state *__state);
--extern void __argp_usage (const struct argp_state *__state);
--
- /* If appropriate, print the printf string FMT and following args, preceded
-    by the program name and `:', to stderr, and followed by a `Try ... --help'
-    message, then exit (1).  */
-@@ -531,15 +527,6 @@ extern void __argp_failure (const struct
- 			    const char *__restrict __fmt, ...)
-      __attribute__ ((__format__ (__printf__, 4, 5)));
- 
--/* Returns true if the option OPT is a valid short option.  */
--extern int _option_is_short (const struct argp_option *__opt) __THROW;
--extern int __option_is_short (const struct argp_option *__opt) __THROW;
--
--/* Returns true if the option OPT is in fact the last (unused) entry in an
--   options array.  */
--extern int _option_is_end (const struct argp_option *__opt) __THROW;
--extern int __option_is_end (const struct argp_option *__opt) __THROW;
--
- /* Return the input field for ARGP in the parser corresponding to STATE; used
-    by the help routines.  */
- extern void *_argp_input (const struct argp *__restrict __argp,
-@@ -559,7 +546,7 @@ extern void *__argp_input (const struct
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI static inline
- # endif
- 
- ARGP_EI void
-@@ -592,6 +579,21 @@ __NTH (__option_is_end (const struct arg
- #  undef __option_is_short
- #  undef __option_is_end
- # endif
-+#else
-+
-+/* Possibly output the standard usage message for ARGP to stderr and exit.  */
-+extern void argp_usage (const struct argp_state *__state);
-+extern void __argp_usage (const struct argp_state *__state);
-+
-+/* Returns true if the option OPT is a valid short option.  */
-+extern int _option_is_short (const struct argp_option *__opt) __THROW;
-+extern int __option_is_short (const struct argp_option *__opt) __THROW;
-+
-+/* Returns true if the option OPT is in fact the last (unused) entry in an
-+   options array.  */
-+extern int _option_is_end (const struct argp_option *__opt) __THROW;
-+extern int __option_is_end (const struct argp_option *__opt) __THROW;
-+
- #endif /* Use extern inlines.  */
- 
- #ifdef  __cplusplus

kodi-texturepacker.patch Added

kodi-timestamp.patch Added

@@ -0,0 +1,31 @@
+---
+ xbmc/Application.cpp      |    2 +-
+ xbmc/utils/SystemInfo.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: b/xbmc/Application.cpp
+===================================================================
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -513,7 +513,7 @@ bool CApplication::Create()
+ //  specialVersion = " (version for XXXX)";
+ #endif
+   CLog::Log(LOGNOTICE, "Using %s %s x%d build%s", buildType.c_str(), CSysInfo::GetAppName().c_str(), g_sysinfo.GetXbmcBitness(), specialVersion.c_str());
+-  CLog::Log(LOGNOTICE, "%s compiled " __DATE__ " by %s for %s %s %d-bit %s (%s)", CSysInfo::GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(),
++  CLog::Log(LOGNOTICE, "%s compiled $DATE by %s for %s %s %d-bit %s (%s)", CSysInfo::GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(),
+             g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetXbmcBitness(), g_sysinfo.GetBuildTargetPlatformVersionDecoded().c_str(),
+             g_sysinfo.GetBuildTargetPlatformVersion().c_str());
+ 
+Index: b/xbmc/utils/SystemInfo.cpp
+===================================================================
+--- a/xbmc/utils/SystemInfo.cpp
++++ b/xbmc/utils/SystemInfo.cpp
+@@ -1254,7 +1254,7 @@ std::string CSysInfo::GetVersion()
+ 
+ std::string CSysInfo::GetBuildDate()
+ {
+-  return StringUtils::Format("%s", __DATE__);
++  return StringUtils::Format("%s", "$DATE");
+ }
+ 
+ bool CSysInfo::IsAppleTV2()

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.0-Isengard.tar.gz Added

_service Deleted

_service:download_files:2.4.6-Helix.tar.gz Deleted

_service:download_files:Helix_rc3.tar.gz Deleted

download_pvr.sh Added

kodi-platform-054a42f66.tar.gz Added

kodi.SuSEFirewall2 Added

pvr-addons.tar.bz2 Added

Changes of Revision 13