Update to 14.0 final

Signed-off-by: Michael Cronenworth <mike@cchtml.com>

4 files changed, 50 insertions, 45 deletions

diff --git a/kodi-14.0-dvddemux-ffmpeg.patch b/kodi-14.0-dvddemux-ffmpeg.patch
index 150e4d9..0c6d627 100644
--- a/kodi-14.0-dvddemux-ffmpeg.patch
+++ b/kodi-14.0-dvddemux-ffmpeg.patch
@@ -1,6 +1,6 @@
 --- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig	2014-08-01 11:18:24.000000000 -0500
 +++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2014-08-24 15:36:34.844966866 -0500
-@@ -487,10 +487,6 @@
+@@ -519,10 +519,6 @@
  
  void CDVDDemuxFFmpeg::Flush()
  {
@@ -8,6 +8,6 @@
 -  if (m_pFormatContext)
 -    av_read_frame_flush(m_pFormatContext);
 -
-   m_iCurrentPts = DVD_NOPTS_VALUE;
+   m_currentPts = DVD_NOPTS_VALUE;
  
    m_pkt.result = -1;
diff --git a/xbmc-13.0-hdhomerun.patch b/kodi-14.0-hdhomerun.patch
index 65db620..1bbe13e 100644
--- a/xbmc-13.0-hdhomerun.patch
+++ b/kodi-14.0-hdhomerun.patch
@@ -15,9 +15,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 8eda3c4..fbb19bd 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -205,11 +205,10 @@ PAPCODECS_DIRS+= \
- endif
- 
+@@ -204,7 +204,6 @@
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
@@ -25,11 +23,7 @@ index 8eda3c4..fbb19bd 100644
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
- ifeq (@USE_MYSQL@,1)
- LIB_DIRS += lib/cmyth
-@@ -413,12 +412,10 @@ else
- endif
- libexif: dllloader
+@@ -425,8 +424,6 @@
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
@@ -38,21 +32,15 @@ index 8eda3c4..fbb19bd 100644
  papcodecs: dllloader dvdpcodecs
  	test -d system/players/paplayer || mkdir system/players/paplayer
  	$(MAKE) -C lib/vgmstream
- 	$(MAKE) -C lib/timidity
- 	$(MAKE) -C lib/nosefart
-@@ -442,11 +439,11 @@ ifeq (@USE_PVR_ADDONS@,1)
- 	$(MAKE) -C pvr-addons
- endif
+@@ -454,7 +451,7 @@
  
  codecs: papcodecs dvdpcodecs dvdpextcodecs
  
--libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-+libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+-libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
++libs: $(LIBSSE4) imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
  
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
- xcode_depends: \
- 	codecs libs visualizations screensavers eventclients skins libaddon \
 diff --git a/configure.in b/configure.in
 index 343292e..2060e24 100644
 --- a/configure.in
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 154063d..82b9bde 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAJORVERSION=14
-MINORVERSION=0a3
+MINORVERSION=0
 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
 #GITSHORT=ge988513
 CODENAME=Helix
diff --git a/kodi.spec b/kodi.spec
index 291a66b..01ceb1d 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,18 +1,18 @@
-%global PRERELEASE a3
-#global DIRVERSION %{version}
+#global PRERELEASE rc3
+%global DIRVERSION %{version}
 #global GITCOMMIT Gotham_r2-ge988513
 # use the line below for pre-releases
-%global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}%{PRERELEASE}
 %global _hardened_build 1
 
 Name: kodi
 Version: 14.0
-Release: 0.2.alpha3%{?dist}
+Release: 1%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+
 Group: Applications/Multimedia
-URL: http://www.xbmc.org/
+URL: http://www.kodi.tv/
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
 # kodi contains code that we cannot ship, as well as redundant private
 # copies of upstream libraries that we already distribute.  Therefore
@@ -27,7 +27,7 @@ Patch1: xbmc-13.0-dvdread.patch
 
 # need to file trac ticket, this patch just forces external hdhomerun
 # functionality, needs to be able fallback internal version
-Patch2: xbmc-13.0-hdhomerun.patch
+Patch2: kodi-14.0-hdhomerun.patch
 
 # Avoid segfault during goom's configure
 # https://bugzilla.redhat.com/1069079
@@ -42,6 +42,8 @@ Patch5: kodi-14.0-dvddemux-ffmpeg.patch
 # Kodi is the renamed XBMC project
 Obsoletes: xbmc < 14.0-1
 Obsoletes: xbmc-eventclients < 14.0-1
+Provides: xbmc = %{version}
+ProvideS: xbmc-eventclients = %{version}
 
 # Optional deps (not in EPEL)
 %if 0%{?fedora}
@@ -112,7 +114,7 @@ BuildRequires: libbluray-devel
 BuildRequires: libcap-devel
 BuildRequires: libcdio-devel
 %if 0%{?_with_libcec}
-BuildRequires: libcec-devel
+BuildRequires: libcec-devel >= 2.2.0
 %endif
 %if 0%{?_with_crystalhd}
 BuildRequires: libcrystalhd-devel
@@ -184,7 +186,7 @@ Requires: google-roboto-fonts
 Requires: libbluray
 %endif
 %if 0%{?_with_libcec}
-Requires: libcec
+Requires: libcec >= 2.2.0
 %endif
 %if 0%{?_with_crystalhd}
 Requires: libcrystalhd
@@ -323,18 +325,18 @@ rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
 
 desktop-file-install \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop
 
 # Normally we are expected to build these manually. But since we are using
 # the system Python interpreter, we also want to use the system libraries
-install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib
-ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL
+install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
+ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
 #install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
 #ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
 
 # Use external Roboto font files instead of bundled ones
-ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/
-ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/xbmc/addons/skin.confluence/fonts/
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
 
 
 %post
@@ -354,37 +356,52 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc copying.txt CONTRIBUTORS LICENSE.GPL README
+%doc copying.txt CONTRIBUTORS LICENSE.GPL README.md
 %doc docs
+%{_bindir}/kodi
+%{_bindir}/kodi-standalone
 %{_bindir}/xbmc
 %{_bindir}/xbmc-standalone
+%{_libdir}/kodi
 %{_libdir}/xbmc
+%{_datadir}/kodi
 %{_datadir}/xbmc
-%{_datadir}/xsessions/XBMC.desktop
-%{_datadir}/applications/xbmc.desktop
+%{_datadir}/xsessions/kodi.desktop
+%{_datadir}/xsessions/xbmc.desktop
+%{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 
 
 %files devel
+%{_includedir}/kodi
 %{_includedir}/xbmc
 
 
 %files eventclients
-%python_sitelib/xbmc
-%dir %{_datadir}/pixmaps/xbmc
-%{_datadir}/pixmaps/xbmc/*.png
-%{_bindir}/xbmc-j2meremote
-%{_bindir}/xbmc-ps3d
-%{_bindir}/xbmc-ps3remote
-%{_bindir}/xbmc-send
-%{_bindir}/xbmc-wiiremote
+%python_sitelib/kodi
+%dir %{_datadir}/pixmaps/kodi
+%{_datadir}/pixmaps/kodi/*.png
+%{_bindir}/kodi-j2meremote
+%{_bindir}/kodi-ps3d
+%{_bindir}/kodi-ps3remote
+%{_bindir}/kodi-send
+%{_bindir}/kodi-wiiremote
 
 
 %files eventclients-devel
-%{_includedir}/xbmc/xbmcclient.h
+%{_includedir}/kodi/xbmcclient.h
 
 
 %changelog
+* Tue Dec 23 2014 Michael Cronenworth <mike@cchtml.com> - 14.0-1
+- Update to 14.0 final
+
+* Tue Dec 09 2014 Michael Cronenworth <mike@cchtml.com> - 14.0-0.4.rc3
+- Update to 14.0 RC3
+
+* Sun Nov 09 2014 Michael Cronenworth <mike@cchtml.com> - 14.0-0.3.beta2
+- Update to 14.0 beta 2
+
 * Tue Sep 02 2014 Michael Cronenworth <mike@cchtml.com> - 14.0-0.2.alpha3
 - Update to 14.0 alpha 3