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 77

kodi.spec Changed

@@ -18,7 +18,7 @@
 
 # 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_version Jarvis
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # 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
@@ -40,7 +40,7 @@
 %define kodi_player none
 
 Name:           kodi
-Version:        15.2
+Version:        16.0rc3
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -51,19 +51,15 @@
 # Generated by:
 #   cd xbmc-VERSION
 #   sh ../download_pvr.sh
-Source2:        pvr-addons.tar.bz2
-Source3:        kodi-platform-054a42f66.tar.gz
+Source3:  		kodi-platform-15edaf78d.tar.gz
+Source4:		crossguid-8f399e8bd4.tar.gz
 Source10:       kodi.service
 Source11:       kodi-noX.service
 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
-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
+Patch8:			crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -114,6 +110,7 @@
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dcadec)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(expat)
@@ -171,6 +168,7 @@
 # Otherwise fails with configure error on libcec because udev.pc file is not found
 BuildRequires:  pkgconfig(udev)
 %endif
+BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
@@ -242,31 +240,15 @@
 %description devel
 Development files for Kodi Media Center
 
-%package pvr.addons
-Summary:        PVR Addons files for Kodi
-Group:          Productivity/Multimedia/Video/Players
-BuildRequires:  jsoncpp-devel
-Requires:       %{name}
-Requires:       libjsoncpp1
-%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}
 %patch1
-%patch3
 %patch4
 %ifarch x86_64
 %patch5
 %endif
 %patch6
-#%patch7 -p1
+%patch8
 
 # 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')
@@ -284,24 +266,18 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-### prep for pvr.addons
-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
-# We do not provide sidplay2 library on any SUSE distribution
-rm -rf addons/audiodecoder.sidplay
-popd
-###
-
+cp %{SOURCE4} tools/depends/target/crossguid
 
 %build
+
+make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
+		
 chmod +x bootstrap
 ./bootstrap
 
+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
@@ -310,7 +286,6 @@
     --enable-airplay \
     --enable-alsa \
     --enable-avahi \
-    --enable-fishbmc \
     --enable-libbluray \
     --enable-libcap \
     --enable-libcec \
@@ -318,9 +293,7 @@
     --enable-mid \
     --enable-mysql \
     --enable-nfs \
-    --enable-projectm \
     --enable-pulse \
-    --enable-rsxs \
     --enable-rtmp \
     --enable-samba \
     --enable-shared \
@@ -329,7 +302,6 @@
     --enable-upnp \
     --enable-webserver \
 %if %{with enable_opengl}
-    --enable-goom \
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
@@ -367,25 +339,6 @@
 
 make %{?_smp_mflags}
 
-pushd project/cmake/addons
-%cmake \
-    -DBUILD_DIR=build \
-    -DBUILD_SHARED_LIBS=1 \
-    -DNEED_SUDO=FALSE \
-    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
-make %{?_smp_mflags}
-
-# 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 audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
-    sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-
-popd
-
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
@@ -474,18 +427,18 @@
 %{_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.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.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.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/
@@ -494,20 +447,6 @@

cmake_do_not_download.patch Changed

@@ -1,8 +1,6 @@
-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
+--- 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
@@ -12,20 +10,20 @@
 -        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(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
+@@ -152,17 +152,18 @@
                                    "${INSTALL_COMMAND}")
  
          # if there's an url defined we need to pass that to externalproject_add()
-+	set(url "")
++		set(url "")
          if(DEFINED url AND NOT "${url}" STREQUAL "")
            # check if there's a third parameter in the file
 -          if(deflength GREATER 2)
@@ -37,35 +35,25 @@
 -                                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()
++#          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}
+@@ -183,16 +184,16 @@
                                  DOWNLOAD_DIR ${BUILD_DIR}/download
                                  CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
                                  "${EXTERNALPROJECT_SETUP}")
 -          endif()
-+        #  endif()
++#          endif()
          else()
-+	  message(STATUS " SOURCE_DIR = ${dir}")
-+	  message(STATUS " SETUP = ${EXTERNALPROJECT_SETUP}")
            externalproject_add(${id}
                                SOURCE_DIR ${dir}
                                "${EXTERNALPROJECT_SETUP}")
@@ -74,36 +62,49 @@
 -        if(deps)
 -          add_dependencies(${id} ${deps})
 -        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
+--- 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)
  
- # 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}")
+-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()
-+#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}")
++#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
-@@ -221,11 +221,11 @@ foreach(addon ${addons})
+@@ -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
@@ -111,12 +112,36 @@
 -            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()
++#            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
+@@ -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()
+

crossguid_build64.patch Added

@@ -0,0 +1,57 @@
+--- tools/depends/target/crossguid/Makefile.orig	2015-11-18 20:23:57.292287991 +0200
++++ tools/depends/target/crossguid/Makefile	2015-11-18 20:26:03.680950988 +0200
+@@ -6,7 +6,7 @@
+ VERSION=8f399e8bd4
+ SOURCE=$(LIBNAME)-$(VERSION)
+ ARCHIVE=$(SOURCE).tar.gz
+-
++LIBDIR=lib
+ 
+ ifeq ($(CROSS_COMPILING), yes)
+   DEPS += ../../Makefile.include
+@@ -37,8 +37,8 @@
+ 
+ .PHONY: .installed-$(PLATFORM)
+ 
+-all: .installed-$(PLATFORM) $(PREFIX)/lib/lib$(LIBNAME).a
+-$(PREFIX)/lib/lib$(LIBNAME).a:
++all: .installed-$(PLATFORM) $(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a
++$(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a:
+ 	@make .installed-$(PLATFORM)
+ 
+ $(TARBALLS_LOCATION)/$(ARCHIVE):
+@@ -59,9 +59,9 @@
+ 
+ .installed-$(PLATFORM): $(LIBDYLIB)
+ 	@[ -d $(PREFIX)/include ] || mkdir -p $(PREFIX)/include
+-	@[ -d $(PREFIX)/lib ] || mkdir $(PREFIX)/lib
++	@[ -d $(PREFIX)/$(LIBDIR) ] || mkdir $(PREFIX)/$(LIBDIR)
+ 	cp $(PLATFORM)/guid.h $(PREFIX)/include/
+-	cp $(LIBDYLIB) $(PREFIX)/lib/
++	cp $(LIBDYLIB) $(PREFIX)/$(LIBDIR)/
+ 	touch $@
+ 
+ clean:
+--- configure.ac.orig	2015-11-18 21:11:21.359915900 +0200
++++ configure.ac	2015-11-18 21:13:32.074555671 +0200
+@@ -1133,12 +1133,14 @@
+ AC_LANG_PUSH([C++])
+ SAVED_LIBS="$LIBS"
+ LIBS="$LIBS -lcrossguid $UUID_LIBS"
+-AC_LINK_IFELSE(
+-  [AC_LANG_PROGRAM(
+-    [#include <guid.h>],
+-    [Guid dummy])],
+-  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS"],
+-  [AC_MSG_ERROR(crossguid not found)])
++#AC_LINK_IFELSE(
++#  [AC_LANG_PROGRAM(
++#    [#include <guid.h>],
++#    [Guid dummy])],
++#  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS"],
++#  [AC_MSG_ERROR(crossguid not found)])
++AC_MSG_RESULT(yes) 
++SAVED_LIBS="$SAVED_LIBS $LDFLAGS"
+ LIBS="$SAVED_LIBS"
+ AC_LANG_POP([C++])
+

float_tk.patch Deleted

no-xbmc-symbolic-link.patch Changed

@@ -1,6 +1,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 @@
+--- 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 @@
  install-binaries: install-scripts
  	@echo "Copying @APP_NAME_LC@ binary to $(DESTDIR)$(libdir)/@APP_NAME_LC@/"
  	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
@@ -8,7 +8,7 @@
  ifeq (1,@USE_X11@)
  	@install @APP_NAME_LC@-xrandr $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@-xrandr
  endif
-@@ -552,14 +551,10 @@
+@@ -502,14 +501,10 @@
  install-scripts:
  	@install -d $(DESTDIR)$(bindir)
  	@install tools/Linux/@APP_NAME_LC@.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
@@ -23,7 +23,7 @@
  
  install-datas: install-scripts
  	@echo "Copying support and legal files..."
-@@ -624,7 +619,6 @@
+@@ -574,7 +569,6 @@
  	@for f in project/cmake/scripts/common/*.cmake; do \
  	  install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \
  	done

_service Changed

_service:download_url:15.2-Isengard.tar.gz Deleted

_service:download_url:16.0rc3-Jarvis.tar.gz Added

crossguid-8f399e8bd4.tar.gz Added

download_pvr.sh Deleted

kodi-platform-054a42f66.tar.gz Deleted

kodi-platform-15edaf78d.tar.gz Added