Packman Build Service PMBS

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -18,8 +18,10 @@
 
 # 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
+# set this parameter to enable building Kodi with ccache, debug information, etc.
+%define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +42,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi
-Version:        15.2
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,22 +50,14 @@
 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
+Source2:        crossguid-8f399e8bd4.tar.gz
+# AUTO-GENERATED using get_version.sh
+Source3:        kodi.VERSION
 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
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -85,6 +79,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
@@ -98,15 +95,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
 
@@ -114,6 +111,7 @@
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dcadec)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(expat)
@@ -121,7 +119,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
@@ -130,7 +130,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if "%{kodi_platform}" == "none"
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -171,24 +173,13 @@
 # Otherwise fails with configure error on libcec because udev.pc file is not found
 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
@@ -199,6 +190,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
@@ -242,85 +238,59 @@
 %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
+%patch2
 %patch3
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-#%patch7 -p1
+
 
 # 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
 
-# Fix the final version string showing as "exported"
-# instead of the SVN revision number.
-export HAVE_GIT="no" GIT_REV="exported"
+# Set the final version string 
+cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -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

kodi-noX-raspberry-pi2.spec Changed

@@ -18,8 +18,10 @@
 
 # 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
+# set this parameter to enable building Kodi with ccache, debug information, etc.
+%define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +42,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi2
-Version:        15.2
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,22 +50,14 @@
 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
+Source2:        crossguid-8f399e8bd4.tar.gz
+# AUTO-GENERATED using get_version.sh
+Source3:        kodi.VERSION
 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
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -85,6 +79,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
@@ -98,15 +95,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
 
@@ -114,6 +111,7 @@
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dcadec)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(expat)
@@ -121,7 +119,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
@@ -130,7 +130,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if "%{kodi_platform}" == "none"
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -171,24 +173,13 @@
 # Otherwise fails with configure error on libcec because udev.pc file is not found
 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
@@ -199,6 +190,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
@@ -242,85 +238,59 @@
 %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
+%patch2
 %patch3
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-#%patch7 -p1
+
 
 # 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
 
-# Fix the final version string showing as "exported"
-# instead of the SVN revision number.
-export HAVE_GIT="no" GIT_REV="exported"
+# Set the final version string 
+cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -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

kodi-noX.spec Changed

@@ -18,8 +18,10 @@
 
 # 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
+# set this parameter to enable building Kodi with ccache, debug information, etc.
+%define dev_build 0
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 1
 %if %{noX_build}
@@ -40,7 +42,7 @@
 %define kodi_player none
 
 Name:           kodi-noX
-Version:        15.2
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,22 +50,14 @@
 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
+Source2:        crossguid-8f399e8bd4.tar.gz
+# AUTO-GENERATED using get_version.sh
+Source3:        kodi.VERSION
 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
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -85,6 +79,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
@@ -98,15 +95,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
 
@@ -114,6 +111,7 @@
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dcadec)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(expat)
@@ -121,7 +119,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
@@ -130,7 +130,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if "%{kodi_platform}" == "none"
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -171,24 +173,13 @@
 # Otherwise fails with configure error on libcec because udev.pc file is not found
 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
@@ -199,6 +190,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
@@ -242,85 +238,59 @@
 %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
+%patch2
 %patch3
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-#%patch7 -p1
+
 
 # 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
 
-# Fix the final version string showing as "exported"
-# instead of the SVN revision number.
-export HAVE_GIT="no" GIT_REV="exported"
+# Set the final version string 
+cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -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

kodi.spec Changed

@@ -18,8 +18,10 @@
 
 # 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
+# set this parameter to enable building Kodi with ccache, debug information, etc.
+%define dev_build 0
 # 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}
@@ -40,7 +42,7 @@
 %define kodi_player none
 
 Name:           kodi
-Version:        15.2
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,22 +50,14 @@
 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
+Source2:        crossguid-8f399e8bd4.tar.gz
+# AUTO-GENERATED using get_version.sh
+Source3:        kodi.VERSION
 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
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -85,6 +79,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
@@ -98,15 +95,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
 
@@ -114,6 +111,7 @@
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dcadec)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(expat)
@@ -121,7 +119,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
@@ -130,7 +130,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if "%{kodi_platform}" == "none"
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -171,24 +173,13 @@
 # Otherwise fails with configure error on libcec because udev.pc file is not found
 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
@@ -199,6 +190,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
@@ -242,85 +238,59 @@
 %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
+%patch2
 %patch3
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-#%patch7 -p1
+
 
 # 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
 
-# Fix the final version string showing as "exported"
-# instead of the SVN revision number.
-export HAVE_GIT="no" GIT_REV="exported"
+# Set the final version string 
+cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -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

FindJsonCpp.cmake.patch Deleted

cmake_build64.patch Deleted

cmake_do_not_download.patch Deleted

@@ -1,122 +0,0 @@
-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 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()

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

kodi-timestamp.patch Deleted

@@ -1,31 +0,0 @@
----
- 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,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.0-Jarvis.tar.gz Added

crossguid-8f399e8bd4.tar.gz Added

download_pvr.sh Deleted

get_version.sh Added

kodi-platform-054a42f66.tar.gz Deleted

kodi.VERSION Added

pre_checkin.sh Changed

@@ -1,9 +1,10 @@
 #!/bin/bash
 
+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
-	s/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec
-cp kodi.changes kodi-noX.changes
+sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
+cp $name.changes $name-noX.changes
 
 # Kodi platforms
 armv6_platforms="raspberry-pi"
@@ -17,8 +18,8 @@
 	sed -e "s/%define noX_build 0/%define noX_build 1/g
 	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
-	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
-	cp kodi.changes kodi-noX-$BOARDNAME.changes
+	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
+	cp $name.changes $name-noX-$BOARDNAME.changes
 done
 
 for BOARDNAME in $armv7_platforms; do
@@ -27,8 +28,8 @@
 	sed -e "s/%define noX_build 0/%define noX_build 1/g
 	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
-	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
-	cp kodi.changes kodi-noX-$BOARDNAME.changes
+	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
+	cp $name.changes $name-noX-$BOARDNAME.changes
 done
 
 # Disable format_spec_file for now since it changes header

pvr-addons.tar.bz2 Deleted

Changes of Revision 24