diff options
author | Ken Dreyer <ktdreyer@ktdreyer.com> | 2013-02-05 16:32:40 -0700 |
---|---|---|
committer | Ken Dreyer <ktdreyer@ktdreyer.com> | 2013-02-05 16:40:24 -0700 |
commit | 739e5b20c3a171b208605c56679920b08f5dd4af (patch) | |
tree | 961451cd4e88c9426ac08b3b91b88771e385dad8 | |
parent | 77cb3952ccf1aeabe7b6f9a6d7f4c3c5a5391cdf (diff) | |
download | xbmc-rpm-739e5b20c3a171b208605c56679920b08f5dd4af.tar.gz xbmc-rpm-739e5b20c3a171b208605c56679920b08f5dd4af.tar.xz xbmc-rpm-739e5b20c3a171b208605c56679920b08f5dd4af.zip |
Update to Frodo (12.0) final and add libcec dep
- Update to Frodo (12.0) final
- Add libcec dependency
-rw-r--r-- | .gitignore | 4 | ||||
-rwxr-xr-x | xbmc-generate-tarball-xz.sh | 6 | ||||
-rwxr-xr-x | xbmc-pvr-addons-generate-tarball-xz.sh | 6 | ||||
-rw-r--r-- | xbmc.spec | 21 |
4 files changed, 25 insertions, 12 deletions
@@ -7,6 +7,6 @@ /xbmc-9.11-patched.tar.xz /xbmc-12.0-Frodo_alpha6-patched.tar.xz /xbmc-12.0-Frodo_alpha7-patched.tar.xz -/xbmc-pvr-addons-5f97406cff-patched.tar.xz +/xbmc-pvr-addons-96774c4-patched.tar.xz /xbmc-12.0-Frodo_beta2-patched.tar.xz -/xbmc-12.0-Frodo_rc3-patched.tar.xz +/xbmc-12.0-patched.tar.xz diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index ee511c6..c1a5a63 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -2,12 +2,12 @@ MAJORVERSION=12 MINORVERSION=0 -PRERELEASE=Frodo_rc3 +#PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} -#GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden -GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE +GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo +#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE # download zipball if [[ ! -f xbmc-$VERSION.zip ]]; then diff --git a/xbmc-pvr-addons-generate-tarball-xz.sh b/xbmc-pvr-addons-generate-tarball-xz.sh index b3f0e14..12d881c 100755 --- a/xbmc-pvr-addons-generate-tarball-xz.sh +++ b/xbmc-pvr-addons-generate-tarball-xz.sh @@ -7,8 +7,10 @@ set -e # Upstream xbmc also hardcodes a Git hash for OSes that bundle # xbmc-pvr-addons. Let's try using the same hash that upstream uses. It -# can be found in tools/darwin/depends/xbmc-pvr-addons/Makefile. -GITHASH=5f97406cff +# can be found in the source tree like so: +# grep ^VERSION tools/darwin/depends/xbmc-pvr-addons/Makefile +COMMIT=96774c4f775b156a46fb58151379dece3e773c96 +GITHASH=${COMMIT:0:7} GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip # download zipball @@ -1,11 +1,11 @@ -%global PRERELEASE Frodo_rc3 -#global DIRVERSION %{version} +#global PRERELEASE Frodo_rc3 +%global DIRVERSION %{version} # use the line below for pre-releases -%global DIRVERSION %{version}-%{PRERELEASE} +#global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc Version: 12.0 -Release: 0.6.%{PRERELEASE}%{?dist} +Release: 1%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -20,7 +20,7 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz Source1: xbmc-generate-tarball-xz.sh # xbmc pvr addons are shipped as a separate git repo. -Source2: xbmc-pvr-addons-5f97406cff-patched.tar.xz +Source2: xbmc-pvr-addons-96774c4-patched.tar.xz Source3: xbmc-pvr-addons-generate-tarball-xz.sh # https://github.com/xbmc/xbmc/pull/1725.patch @@ -51,6 +51,7 @@ Patch4: xbmc-12.0-hdhomerun.patch %{?fedora:%global _with_libbluray 1} %{?fedora:%global _with_cwiid 1} %{?fedora:%global _with_libssh 1} +%{?fedora:%global _with_libcec 1} ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} @@ -161,6 +162,9 @@ BuildRequires: lame-devel BuildRequires: libssh-devel %endif BuildRequires: libcap-devel +%if 0%{?_with_libcec} +BuildRequires: libcec-devel +%endif # nfs-utils-lib-devel package currently broken #BuildRequires: nfs-utils-lib-devel @@ -180,6 +184,9 @@ Requires: libcrystalhd %if 0%{?_with_libbluray} Requires: libbluray %endif +%if 0%{?_with_libcec} +Requires: libcec +%endif # needed when doing a minimal install, see # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844 @@ -325,6 +332,10 @@ fi #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Tue Feb 05 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-1 +- Update to Frodo final +- Add libcec dependency + * Fri Jan 04 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.0-0.6.Frodo_rc3 - Update to Frodo RC 3 - Update PVR addons snapshot to match snapshot bundled in rc3 |