commit 3c3e1e16657a91f97a722579dab7dff80bfa7327 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Wed Jun 22 15:09:03 2016 -0500 Update to 17.0 alpha 1 .gitignore | 2 +- kodi-14.0-dvddemux-ffmpeg.patch | 13 ---- kodi-16.0-dcadec.patch | 14 ---- kodi-generate-tarball-xz.sh | 6 +- kodi.spec | 34 ++++------ sources | 2 +- xbmc-13.0-dvdread.patch | 138 ---------------------------------------- 7 files changed, 16 insertions(+), 193 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7c7ab45..fc6b14d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kodi-16.1-patched.tar.xz +/kodi-17.0a1-patched.tar.xz diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 23c6d13..654dfbf 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,10 +1,10 @@ #!/bin/sh -MAJORVERSION=16 -MINORVERSION=1 +MAJORVERSION=17 +MINORVERSION=0a1 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 -CODENAME=Jarvis +CODENAME=Krypton VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}} diff --git a/kodi.spec b/kodi.spec index 362c3f3..3cfdb7a 100644 --- a/kodi.spec +++ b/kodi.spec @@ -1,13 +1,13 @@ -#global PRERELEASE rc1 +%global PRERELEASE a1 %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: 16.1 -Release: 1%{?dist} +Version: 17.0 +Release: 0.1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -23,19 +23,8 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz # ./kodi-generate-tarball-xz.sh Source1: kodi-generate-tarball-xz.sh -# filed ticket, but patch still needs work -# http://trac.xbmc.org/ticket/9658 -Patch1: xbmc-13.0-dvdread.patch - # Set program version parameters -Patch2: kodi-16.0-versioning.patch - -# Remove call to internal ffmpeg function (misued anyway) -Patch3: kodi-14.0-dvddemux-ffmpeg.patch - -# Disable dcadec library detection when using external ffmpeg (dcadec is only -# needed to build bundled ffmpeg) -Patch4: kodi-16.0-dcadec.patch +Patch1: kodi-16.0-versioning.patch # Optional deps (not in EPEL) %if 0%{?fedora} @@ -175,7 +164,7 @@ BuildRequires: weston-devel BuildRequires: yajl-devel BuildRequires: zlib-devel -Requires: google-roboto-fonts +Requires: dejavu-sans-fonts # need explicit requires for these packages # as they are dynamically loaded via XBMC's arcane # pseudo-DLL loading scheme (sigh) @@ -246,9 +235,6 @@ library. %prep %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p0 %build @@ -324,9 +310,8 @@ ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module #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}/kodi/addons/skin.confluence/fonts/ -ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/ +# Use external font files instead of bundled ones +ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/ # Move man-pages into system dir mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ @@ -407,6 +392,9 @@ fi %changelog +* Wed Jun 22 2016 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.0-0.1 +- Kodi 17.0 alpha 1 + * Mon Apr 25 2016 Michael Cronenworth <mike(a)cchtml.com&gt; - 16.1-1 - Kodi 16.1 final diff --git a/sources b/sources index 8346cbb..97d3a6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f04f8d695bec409c5e39d5cd542d081 kodi-16.1-patched.tar.xz +0e3f8686fab57f169a50004341167cf7 kodi-17.0a1-patched.tar.xz