diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-08 12:38:17 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-08 12:38:17 -0300 |
| commit | 0cbd811e464dc0fe3d4eb0197426b6657d93e671 (patch) | |
| tree | 3642a16c37354660c2f302655ef2a9f6fae52b29 /libre/kodi | |
| parent | d109aa878409f2797f76fd4dcf810b3d4ef5e2ef (diff) | |
kodi-16.1-4.parabola1: updated patch for curl >= 7.50.1
Diffstat (limited to 'libre/kodi')
| -rw-r--r-- | libre/kodi/10160.patch | 57 | ||||
| -rw-r--r-- | libre/kodi/PKGBUILD | 6 |
2 files changed, 4 insertions, 59 deletions
diff --git a/libre/kodi/10160.patch b/libre/kodi/10160.patch index f69c8353a..73923ea5d 100644 --- a/libre/kodi/10160.patch +++ b/libre/kodi/10160.patch @@ -1,58 +1,3 @@ -From efa1179a7d55be713940cf82eaadb3d7379a7942 Mon Sep 17 00:00:00 2001 -From: fritsch <peter.fruehberger@gmail.com> -Date: Sat, 23 Jul 2016 21:34:05 +0200 -Subject: [PATCH 1/2] Curl: Support libcurl version 7.5.0 - ---- - xbmc/filesystem/CurlFile.h | 6 ++++++ - xbmc/filesystem/DllLibCurl.h | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xbmc/filesystem/CurlFile.h b/xbmc/filesystem/CurlFile.h -index b4f5046..81a5ae5 100644 ---- a/xbmc/filesystem/CurlFile.h -+++ b/xbmc/filesystem/CurlFile.h -@@ -24,11 +24,17 @@ - #include <map> - #include <string> - #include "utils/HttpHeader.h" -+#include <curl/curlver.h> - - namespace XCURL - { -+#if LIBCURL_VERSION_NUM >= 0x073200 -+ typedef struct Curl_easy CURL_HANDLE; -+ typedef struct Curl_multi CURLM; -+#else - typedef void CURL_HANDLE; - typedef void CURLM; -+#endif - struct curl_slist; - } - -diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h -index db97f92..1bdaae1 100644 ---- a/xbmc/filesystem/DllLibCurl.h -+++ b/xbmc/filesystem/DllLibCurl.h -@@ -52,7 +52,7 @@ namespace XCURL - virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0; - virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0; - virtual CURLMsg* multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0; -- virtual void multi_cleanup(CURL_HANDLE * handle )=0; -+ virtual void multi_cleanup(CURLM * handle )=0; - virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0; - virtual void slist_free_all(struct curl_slist *)=0; - }; - -From 9c6dd05394c7f55c046f285b124b0caa46e66ee4 Mon Sep 17 00:00:00 2001 -From: fritsch <peter.fruehberger@gmail.com> -Date: Sun, 24 Jul 2016 20:24:07 +0200 -Subject: [PATCH 2/2] Curl: Adjust multi_cleanup method which returns CURLMcode - ---- - xbmc/filesystem/DllLibCurl.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h index 1bdaae1..9e78a91 100644 --- a/xbmc/filesystem/DllLibCurl.h @@ -61,7 +6,7 @@ index 1bdaae1..9e78a91 100644 virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0; virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0; virtual CURLMsg* multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0; -- virtual void multi_cleanup(CURLM * handle )=0; +- virtual void multi_cleanup(CURL_HANDLE * handle )=0; + virtual CURLMcode multi_cleanup(CURLM * handle )=0; virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0; virtual void slist_free_all(struct curl_slist *)=0; diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index c4877a637..08298ee4e 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 184765 2016-08-01 18:25:37Z idevolder $ +# $Id: PKGBUILD 185967 2016-08-07 21:21:52Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> @@ -16,7 +16,7 @@ pkgbase=kodi pkgname=kodi pkgver=16.1 _codename=Jarvis -pkgrel=3.parabola1 +pkgrel=4.parabola1 arch=('i686' 'x86_64' 'armv7h') url="http://kodi.tv" license=('GPL2') @@ -47,7 +47,7 @@ mksha256sums=( sha256sums=( '68a6713567a6f65add13c6295d54709457e4c31e70d70cfc9c81ad64300405eb' 'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f' - '947119637577abb77fdac6173fea05b0a4524928d344e3b3f0ed328e51b3e596' + '870037ddedc09f161db16df8550e1b0eaaa67a8bdfe47e7151bc9ee25c9bfead' '3c9b4e647a1eea8d910e7ddc4df3125de05a4c0468c3350fe4e44208158d8822' ) |