Packman Build Service PMBS

kodi.spec Changed

@@ -48,18 +48,12 @@
 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
-Source3:  		kodi-platform-15edaf78d.tar.gz
-Source4:		crossguid-8f399e8bd4.tar.gz
+Source2:        crossguid-8f399e8bd4.tar.gz
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Patch1:         no-xbmc-symbolic-link.patch
-Patch4:         cmake_do_not_download.patch
-Patch5:		cmake_build64.patch
-Patch6:         kodi-texturepacker.patch
-Patch8:			crossguid_build64.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -81,6 +75,9 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
 BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -94,15 +91,15 @@
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
 BuildRequires:  nasm
-
-
-
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
 #BuildRequires:  sidplay-libs-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 
@@ -118,7 +115,9 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(glew)
+%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libass) >= 0.9.7
@@ -127,7 +126,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if !%{noX_build}
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -169,24 +170,12 @@
 BuildRequires:  pkgconfig(udev)
 %endif
 BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(vdpau)
+%endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-BuildRequires:  pkgconfig(vdpau)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -197,6 +186,11 @@
 %endif
 %endif
 %endif
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
@@ -243,17 +237,13 @@
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
 %patch1
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-%patch8
+%patch2
+%patch3
 
 # 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')
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
@@ -266,21 +256,25 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE4} tools/depends/target/crossguid
+cp %{SOURCE2} tools/depends/target/crossguid
+
 
 %build
 
+# build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 		
 chmod +x bootstrap
 ./bootstrap
 
+# add crossguid to INCLUDES and LIBS
 export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
 export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
+
 %configure \
     --with-ffmpeg=shared \
     --enable-airplay \
@@ -306,7 +300,6 @@
     --enable-vdpau \
     --enable-gl \
 %else
-    --disable-goom \
     --disable-vaapi \
     --disable-vdpau \
     --disable-gl \
@@ -427,18 +420,12 @@
 %{_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/

FindJsonCpp.cmake.patch Deleted

cmake_build64.patch Deleted

cmake_do_not_download.patch Deleted

@@ -1,147 +0,0 @@
---- project/cmake/scripts/common/handle-depends.cmake.orig	2015-11-24 21:56:37.278275032 +0200
-+++ project/cmake/scripts/common/handle-depends.cmake	2015-11-24 22:20:22.202457643 +0200
-@@ -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
-@@ -183,16 +184,16 @@
-                                 DOWNLOAD_DIR ${BUILD_DIR}/download
-                                 CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
-                                 "${EXTERNALPROJECT_SETUP}")
--          endif()
-+#          endif()
-         else()
-           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
---- project/cmake/addons/CMakeLists.txt.orig	2015-11-24 22:01:24.508214039 +0200
-+++ project/cmake/addons/CMakeLists.txt	2015-11-26 06:26:08.705423958 +0200
-@@ -156,15 +156,15 @@
- include(${APP_ROOT}/project/cmake/scripts/common/check_target_platform.cmake)
- 
- set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
--if(NOT WIN32)
--  # check install permissions
--  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()
--endif()
-+#if(NOT WIN32)
-+#  # check install permissions
-+#  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()
-+#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
-@@ -187,7 +187,7 @@
- file(GLOB_RECURSE addons ${ADDONS_DEFINITION_DIR}/*.txt)
- 
- #if there are no addons assume that bootstrapping hasn't happened yet
--if(NOT addons)
-+if(${DO_BOOTSTRAP} AND NOT addons)
-   message(STATUS "Bootstrapping all default repositories as no addons were found...")
-   set(BOOTSTRAP_BUILD_DIR "${BUILD_DIR}/bootstrap")
- 
-@@ -314,10 +314,10 @@
-             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}")
-+#            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()
- 
-@@ -360,16 +360,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()
- 
-           if(CROSS_AUTOCONF AND AUTOCONF_FILES)
-             if(EXISTS ${SOURCE_DIR}/bootstrap/autoreconf.txt)

cmake_no_deps.patch Deleted

@@ -1,28 +0,0 @@
---- 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-platform-15edaf78d.tar.gz Deleted

Changes of Revision 85