[kodi] Update to 17 beta 6

commit 9dd9cbab99939fa6fc604d106607b29408571f42 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Sun Dec 11 17:23:46 2016 -0600 Update to 17 beta 6 .gitignore | 2 +- kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 16 +++++++--------- sources | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8b6560c..13c4b27 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kodi-17.0b5-patched.tar.xz +/kodi-17.0b6-patched.tar.xz diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 8815dfe..40f41f2 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=17 -MINORVERSION=0b5 +MINORVERSION=0b6 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 CODENAME=Krypton diff --git a/kodi.spec b/kodi.spec index 066eefd..1094352 100644 --- a/kodi.spec +++ b/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE b5 +%global PRERELEASE b6 #global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases @@ -8,7 +8,7 @@ Name: kodi Version: 17.0 -Release: 0.8%{?dist} +Release: 0.9%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -38,10 +38,6 @@ Patch1: kodi-16.0-versioning.patch # Drop DVD library support Patch2: kodi-17a2-libdvd.patch -# Libcec 4.0 support -# https://github.com/popcornmix/xbmc/commit/e2e1ba73de53e0f64baa2edc6a45263... -Patch3: kodi-17b5-libcec4.patch - # Optional deps (not in EPEL) %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) @@ -100,6 +96,7 @@ BuildRequires: gperf BuildRequires: jasper-devel BuildRequires: java-devel BuildRequires: lame-devel +BuildRequires: lcms2-devel BuildRequires: libXinerama-devel BuildRequires: libXmu-devel BuildRequires: libXtst-devel @@ -260,9 +257,6 @@ library. %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -b.versioning %patch2 -p1 -b.libdvd -%if 0%{?fedora} > 25 -%patch3 -p1 -b.libcec4 -%endif %if 0%{?_with_dvd} cp -p %{SOURCE2} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz cp -p %{SOURCE3} tools/depends/target/libdvdread/libdvdread-master.tar.gz @@ -416,6 +410,10 @@ fi %changelog +* Sun Dec 11 2016 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.0-0.9 +- Kodi 17 beta 6 +- Drop libcec patch, now upstream + * Mon Oct 31 2016 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.0-0.8 - Kodi 17 beta 5 - Include patch for libcec 4.0 support diff --git a/sources b/sources index 50b7c91..5faeaca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bac6c4beb9acd3a417ccb15fadbf0852 kodi-17.0b5-patched.tar.xz +08c93b0627635fde158e7428fa14d268 kodi-17.0b6-patched.tar.xz