diff options
| author | Michael Cronenworth <mike@cchtml.com> | 2014-05-14 21:19:14 -0500 |
|---|---|---|
| committer | Michael Cronenworth <mike@cchtml.com> | 2014-05-14 21:19:14 -0500 |
| commit | 41efddf8e13ce5382ae112ba04ee1434a3d83a44 (patch) | |
| tree | a4c6921f770983a36c3cd686bfd4c53c04031dfb | |
| parent | fefeb4ade984814f3588e674e5a9bb6b6d45ef81 (diff) | |
| download | xbmc-rpm-41efddf8e13ce5382ae112ba04ee1434a3d83a44.tar.gz xbmc-rpm-41efddf8e13ce5382ae112ba04ee1434a3d83a44.tar.xz xbmc-rpm-41efddf8e13ce5382ae112ba04ee1434a3d83a44.zip | |
Update to 13.1 beta 1
Include patch for dbus suspend crash.
| -rwxr-xr-x | xbmc-generate-tarball-xz.sh | 12 | ||||
| -rw-r--r-- | xbmc.spec | 24 |
2 files changed, 22 insertions, 14 deletions
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 0dd6bf3..81d1bea 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -1,16 +1,16 @@ #!/bin/sh MAJORVERSION=13 -MINORVERSION=0 -GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 -GITSHORT=ge988513 -PRERELEASE=Gotham_r2 +MINORVERSION=1b1 +#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 +#GITSHORT=ge988513 +#PRERELEASE=Gotham VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}${GITSHORT:+-${GITSHORT}} -#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham +GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham #GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE -GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT +#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT # download zipball if [[ ! -f xbmc-$VERSION.zip ]]; then @@ -1,19 +1,19 @@ -#global PRERELEASE Gotham_rc1 -%global DIRVERSION %{version} -%global GITCOMMIT Gotham_r2-ge988513 +%global PRERELEASE b1 +#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: xbmc -Version: 13.0 -Release: 2%{?dist} +Version: 13.1 +Release: 0.1.beta1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ Group: Applications/Multimedia URL: http://www.xbmc.org/ -Source0: %{name}-%{DIRVERSION}-%{GITCOMMIT}-patched.tar.xz +Source0: %{name}-%{DIRVERSION}-patched.tar.xz # xbmc contains code that we cannot ship, as well as redundant private # copies of upstream libraries that we already distribute. Therefore # we use this script to remove the code before shipping it. @@ -36,6 +36,10 @@ Patch3: xbmc-13.0-libmysqlclient.patch # Set program version parameters Patch4: xbmc-13.0-versioning.patch +# Fix crash during suspend +# https://github.com/xbmc/xbmc/pull/4696 +Patch5: xbmc-13.0-dbus-power.patch + # External ffmpeg patches Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch @@ -234,12 +238,13 @@ library. %prep -%setup -q -n %{name}-%{DIRVERSION}-%{GITCOMMIT} +%setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch100 -p1 %patch101 -p1 @@ -384,6 +389,9 @@ fi %changelog +* Wed May 14 2014 Michael Cronenworth <mike@cchtml.com> - 13.1-0.1.beta1 +- Update to 13.1 beta 1 + * Sat May 10 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-2 - Update to latest Gotham final branch (commit e988513) - Fixes for rtmp (RFBZ #3234) |