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 49

kodi-next.spec Changed

@@ -19,179 +19,190 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 1
+# WARNING: Build with bundled ffmpeg until version 18.0 is reached
+%bcond_with sysffmpeg
 # 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}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_without kodi_with_X11
+%define kodi_platform none
+%define kodi_player none
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform none
-%define kodi_player none
+ExclusiveArch: %ix86 x86_64 aarch64
 
 Name:           kodi
-Version:        17.1rc1
-#Version:        master
+Version:        master
 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
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  boost-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz - TO CHANGE
+Source21:       libdvdnav-kodi-deps-leia.tar.gz
+Source22:       libdvdcss-kodi-deps-leia.tar.gz
+Source23:       libdvdread-kodi-deps-leia.tar.gz
+Source24:       fmt-3.0.1.tar.gz
+Source25:       rapidjson-1.1.0.tar.gz
+%if %{without sysffmpeg}
+# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
+%endif
+Patch0:         kodi.arm.patch
+#Patch1:         no-xbmc-symbolic-link.patch
+#Patch2:         kodi-texturepacker.patch
+#Patch3:         crossguid_build64.patch
+Patch4:         kodi.aarch64.patch
+Patch5:         kodi-tools-libdir.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
-BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-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
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
+BuildRequires:  gawk
+# need gcc5
+BuildRequires:  gcc5 
+BuildRequires:  gcc5-c++
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  libyajl-devel >= 2
+BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
-BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  shairplay-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
+BuildRequires:  libcap-devel
+%if %{with sysffmpeg}
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+%else
+BuildRequires:  ladspa-devel

kodi.spec Changed

@@ -19,178 +19,190 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 1
+# WARNING: Build with bundled ffmpeg until version 18.0 is reached
+%bcond_with sysffmpeg
 # 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}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_without kodi_with_X11
+%define kodi_platform none
+%define kodi_player none
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform none
-%define kodi_player none
+ExclusiveArch: %ix86 x86_64 aarch64
 
 Name:           kodi
-Version:        17.1rc1
+Version:        master
 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
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  boost-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz - TO CHANGE
+Source21:       libdvdnav-kodi-deps-leia.tar.gz
+Source22:       libdvdcss-kodi-deps-leia.tar.gz
+Source23:       libdvdread-kodi-deps-leia.tar.gz
+Source24:       fmt-3.0.1.tar.gz
+Source25:       rapidjson-1.1.0.tar.gz
+%if %{without sysffmpeg}
+# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
+Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
+%endif
+Patch0:         kodi.arm.patch
+#Patch1:         no-xbmc-symbolic-link.patch
+#Patch2:         kodi-texturepacker.patch
+#Patch3:         crossguid_build64.patch
+Patch4:         kodi.aarch64.patch
+Patch5:         kodi-tools-libdir.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
-BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-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
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
+BuildRequires:  gawk
+# need gcc5
+BuildRequires:  gcc5 
+BuildRequires:  gcc5-c++
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  libyajl-devel >= 2
+BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
-BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  shairplay-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
+BuildRequires:  libcap-devel
+%if %{with sysffmpeg}
+BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
+BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
+BuildRequires:  pkgconfig(libavformat) >= 56.25.101
+BuildRequires:  pkgconfig(libavutil) >= 54.20.100
+BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
+BuildRequires:  pkgconfig(libswscale) >= 3.1.101
+BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+%else
+BuildRequires:  ladspa-devel
+BuildRequires:  libgsm-devel

_service Changed

_service:download_files:3.4-Leia-Alpha-1.tar.gz Added

_service:download_files:master.tar.gz Added

fmt-3.0.1.tar.gz Added

libdvdcss-kodi-deps-leia.tar.gz Added

libdvdnav-kodi-deps-leia.tar.gz Added

libdvdread-kodi-deps-leia.tar.gz Added

pre_checkin.sh Changed

@@ -2,7 +2,9 @@
 
 name=kodi
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
-sed -e "s/%define noX_build 0/%define noX_build 1/g
+ARCH_RESTRICTIONS="does-not-build"
+sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
 	s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
 cp $name.changes $name-noX.changes
 
@@ -14,9 +16,11 @@
 # armv6 boards
 for BOARDNAME in $armv6_platforms; do
 	ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now
+	ARCH_RESTRICTIONS="does-not-build"
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%define noX_build 0/%define noX_build 1/g
-	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
+	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes
@@ -25,8 +29,9 @@
 for BOARDNAME in $armv7_platforms; do
 	ARCH_RESTRICTIONS="armv7l armv7hl"
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%define noX_build 0/%define noX_build 1/g
-	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
+	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
+	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes

rapidjson-1.1.0.tar.gz Added