From 0cbd811e464dc0fe3d4eb0197426b6657d93e671 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Aug 2016 12:38:17 -0300 Subject: kodi-16.1-4.parabola1: updated patch for curl >= 7.50.1 --- libre/kodi/10160.patch | 57 +------------------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) (limited to 'libre/kodi/10160.patch') 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 -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 - #include - #include "utils/HttpHeader.h" -+#include - - 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 -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; -- cgit v1.2.3