diff options
| -rw-r--r-- | xbmc-13.0-dbus-power.patch | 29 | ||||
| -rw-r--r-- | xbmc-13.1-curl.patch | 36 | ||||
| -rwxr-xr-x | xbmc-generate-tarball-xz.sh | 2 | ||||
| -rw-r--r-- | xbmc.spec | 22 |
4 files changed, 9 insertions, 80 deletions
diff --git a/xbmc-13.0-dbus-power.patch b/xbmc-13.0-dbus-power.patch deleted file mode 100644 index f6b32d3..0000000 --- a/xbmc-13.0-dbus-power.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 20fbf81a797e42b316df9682e5c793672f904804 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <pierre@ossman.eu> -Date: Mon, 12 May 2014 21:28:40 +0200 -Subject: [PATCH] [linux] bad boolean type given to dbus - ---- - xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -index 37be5dd..5a97fe6 100644 ---- a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -+++ b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp -@@ -225,10 +225,10 @@ bool CLogindUPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) - { - if (dbus_message_is_signal(msg, "org.freedesktop.login1.Manager", "PrepareForSleep")) - { -- bool arg; -+ dbus_bool_t arg; - // the boolean argument defines whether we are going to sleep (true) or just woke up (false) - dbus_message_get_args(msg, NULL, DBUS_TYPE_BOOLEAN, &arg, DBUS_TYPE_INVALID); -- CLog::Log(LOGDEBUG, "LogindUPowerSyscall: Received PrepareForSleep with arg %i", arg); -+ CLog::Log(LOGDEBUG, "LogindUPowerSyscall: Received PrepareForSleep with arg %i", (int)arg); - if (arg) - { - callback->OnSleep(); --- -1.9.3 - diff --git a/xbmc-13.1-curl.patch b/xbmc-13.1-curl.patch deleted file mode 100644 index f4a586f..0000000 --- a/xbmc-13.1-curl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b47117d9d0e1be09a298079919cc335baf2f37f0 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <pierre@ossman.eu> -Date: Sun, 25 May 2014 17:10:03 +0200 -Subject: [PATCH] curl: don't mess with the default cipher list as we can't - know the format - ---- - xbmc/filesystem/CurlFile.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp -index 30de6f9..0a5ea14 100644 ---- a/xbmc/filesystem/CurlFile.cpp -+++ b/xbmc/filesystem/CurlFile.cpp -@@ -394,7 +394,7 @@ CCurlFile::CCurlFile() - m_username = ""; - m_password = ""; - m_httpauth = ""; -- m_cipherlist = "DEFAULT"; -+ m_cipherlist = ""; - m_proxytype = PROXY_HTTP; - m_state = new CReadState(); - m_oldState = NULL; -@@ -608,7 +608,8 @@ void CCurlFile::SetCommonOptions(CReadState* state) - g_curlInterface.easy_setopt(h, CURLOPT_IGNORE_CONTENT_LENGTH, 1); - - // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use. -- g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); -+ if (!m_cipherlist.empty()) -+ g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); - } - - void CCurlFile::SetRequestHeaders(CReadState* state) --- -1.9.3 - diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 17f33fb..b73b0bf 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=13 -MINORVERSION=1 +MINORVERSION=2b2 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 #PRERELEASE=Gotham @@ -1,13 +1,13 @@ -#global PRERELEASE rc1 -%global DIRVERSION %{version} +%global PRERELEASE b2 +%global DIRVERSION %{version}%{?PRERELEASE} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases #global DIRVERSION %{version}%{PRERELEASE} %global _hardened_build 1 Name: xbmc -Version: 13.1 -Release: 1%{?dist} +Version: 13.2 +Release: 0.1.beta2%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ @@ -36,14 +36,6 @@ 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 - -# Fix default cipher string -# https://github.com/xbmc/xbmc/pull/4794 -Patch6: xbmc-13.1-curl.patch - # External ffmpeg patches Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch @@ -250,8 +242,6 @@ library. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch100 -p1 %patch101 -p1 @@ -400,6 +390,10 @@ fi %changelog +* Wed Jul 30 2014 Michael Cronenworth <mike@cchtml.com> - 13.2-0.1.beta2 +- Update to 13.2 beta 2 +- Drop upstream patches + * Mon Jun 09 2014 Michael Cronenworth <mike@cchtml.com> - 13.1-1 - Update to 13.1 final - Fix default cipher string for Fedora curl (RFBZ #3253) |