alarm/kodi-imx to 16.1-4

This commit is contained in:
moonman 2016-12-03 10:17:12 +00:00
parent d69f90b826
commit fa0351629b
2 changed files with 31 additions and 7 deletions

View file

@ -0,0 +1,22 @@
diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h
index 1bdaae1..9e78a91 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 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;
};
@@ -77,7 +77,7 @@ namespace XCURL
DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5))
DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2))
DEFINE_METHOD2(CURLMsg*, multi_info_read, (CURLM *p1, int *p2))
- DEFINE_METHOD1(void, multi_cleanup, (CURLM *p1))
+ DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1))
DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2))
DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1))
DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1))

View file

@ -19,7 +19,7 @@ pkgbase=kodi
pkgname=('kodi-imx' 'kodi-imx-eventclients')
pkgver=16.1
_codename=Jarvis
pkgrel=3
pkgrel=4
arch=('armv7h')
url="http://kodi.tv"
license=('GPL2')
@ -41,15 +41,17 @@ source=(
'kodi.service'
'polkit.rules'
'kodi.conf'
'gcc6_fix.patch')
'gcc6_fix.patch'
'10160.patch')
sha256sums=('7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10'
'6d9822d97b9e1268c04078f6c9b6316eb013f95f96f90034b51fa7473b9752ff'
'0e16e4d2ec0c0e1810fe1ad6a7c4dee99d6fc0f49502f0e836210f5dd537d92d'
'75eae110b6ca1c844505a231b453377afb092ef3969a31c8f4c72a3c3247381a'
'9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
'db6372248015fa4e663bf789e4f7121b5a9ade323f361994bbd6f135ce169123'
'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f')
'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f'
'870037ddedc09f161db16df8550e1b0eaaa67a8bdfe47e7151bc9ee25c9bfead')
prepare() {
cd "$srcdir/xbmc-$pkgver-$_codename"
@ -60,10 +62,10 @@ prepare() {
# disable wiiremote due to incompatibility with bluez-5.29
sed '/WiiRemote/d' -i tools/EventClients/Makefile.in
sed '/mkdir -p $(DESTDIR)$(bindir)/i \
install:' -i tools/EventClients/Makefile.in
patch -Np1 -i ${srcdir}/gcc6_fix.patch
install:' -i tools/EventClients/Makefile.in
patch -Np1 -i ${srcdir}/gcc6_fix.patch
patch -Np1 -i ${srcdir}/10160.patch
}
build() {