Update to 18.1rc1pre1-1

2 files changed, 109 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66c98c5caddb..29ef95b42047 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Mon Jan 28 20:33:10 UTC 2019
+# Sun Feb  3 20:49:12 UTC 2019
 pkgbase = kodi-devel
-	pkgver = 18.0
+	pkgver = 18.1rc1pre1
 	pkgrel = 1
 	url = http://kodi.tv
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = kodi-devel
 	makedepends = curl
 	makedepends = doxygen
 	makedepends = glew
+	makedepends = git
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
 	makedepends = jasper
@@ -74,9 +75,30 @@ pkgbase = kodi-devel
 	source = http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
-	source = 00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch
 	source = cheat-sse-build.patch
 	source = cpuinfo
+	source = 00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch
+	source = 01-PR14924.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/14924.patch
+	source = 02-PR15352.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15352.patch
+	source = 03-PR15328.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15328.patch
+	source = 04-PR15327.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15327.patch
+	source = 05-PR15248.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15248.patch
+	source = 06-PR15342.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15342.patch
+	source = 07-PR15362.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15362.patch
+	source = 08-PR15359.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15359.patch
+	source = 09-PR15376.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15376.patch
+	source = 10-PR15368.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15368.patch
+	source = 11-PR15383.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15383.patch
+	source = 12-PR15382.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15382.patch
+	source = 13-PR15381.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15381.patch
+	source = 14-PR15392.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15392.patch
+	source = 15-PR15394.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15394.patch
+	source = 16-PR15385.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15385.patch
+	source = 17-PR15401.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15401.patch
+	source = 18-PR15403.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15403.patch
+	source = 19-PR15351.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15351.patch
+	source = 20-PR15399.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15399.patch
+	source = 21-PR15410.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15410.patch
 	sha256sums = ac5d64d59c6f4811b41a869538506e56c342b530fac97ad9dc9715f3d480e633
 	sha256sums = 9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
@@ -86,9 +108,28 @@ pkgbase = kodi-devel
 	sha256sums = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
 	sha256sums = 5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3
-	sha256sums = 849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb
 	sha256sums = 304d4581ef024bdb302ed0f2dcdb9c8dea03f78ba30d2a52f4a0d1c8fc4feecd
 	sha256sums = 27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1
+	sha256sums = 849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb
+	sha256sums = 026b9fb181bbfab92cd141eebff9458cfe536cf789a748047db0e43685db56c1
+	sha256sums = a31e0ebdb1b7f4af1f2772d87dc5c1b83be105b20c2cc2d2659de58529f0b207
+	sha256sums = 6e3c798913b1a1aaaebd1e0e699c72e78366e681f8b56282aeaa0237d8508a22
+	sha256sums = 269a0f6df80a045c930f38206dabeb966abe317fd05a3d6d38c02c15ed74d6a9
+	sha256sums = b8ee25888ab3e5efbe2e1997180108ac9f2563eeaabecdc83ff981deed079ef6
+	sha256sums = 090d038f824a2d5571e68ced2377173c371bd2e20996eeb1c2b2d9e5999050d4
+	sha256sums = ba525b840f615815892258f74a85c332c9030e8e95988a5463cbb42d35a38a8e
+	sha256sums = 65f3f4f297f1f5fcc3b91d5f1bbd232d41497a885f2af5480ec72cac3605b76c
+	sha256sums = 834b542997a21a9c205330ed1b743ec8c430bee9c01a64c0493347756aff4f25
+	sha256sums = c9dbeeb0d51e8eaa56981f64ca2c3bc5a58317d613d97eba474d2488fefcb04e
+	sha256sums = ad3b9acf718875c15a2d8427a9e8b90cf88b2512404e7305bc9b0a36ca2f0b5e
+	sha256sums = 3850804d0380db35d651e964b83cbe4d0e3e1e7b1bd85c2dda955fd3974e0737
+	sha256sums = 50b4a057cc2c1c6a6ada2839eb119d91d42ac14e1bbcb5baf272964412fbc711
+	sha256sums = 4c73812dca6de51ab896d060508608756dd5051cc53c6ca4cce9031fd8747b3a
+	sha256sums = c53ba29065ea3a1a2ed1c6de76b4f5a6b089313a20704f67224233ac1de2971a
+	sha256sums = f8966249bc86234a8445109600c24ad926026f179e5bcf65ab3facdfd6acef09
+	sha256sums = e27441261d72aaa3f3611638715444b068795d175b0b8c8de8d7612062ca4137
+	sha256sums = 3dea58570ec1a59c94513e4c468d232f87d9a71787740b2bc631751e13ce17c1
+	sha256sums = 4676b603e0c170f2d627e305560622b72dbdee51c0a221058c350841a814dc39
 
 pkgname = kodi-devel
 	pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media
@@ -133,7 +174,7 @@ pkgname = kodi-devel
 	optdepends = unrar: Archives support
 	optdepends = unzip: Archives support
 	optdepends = upower: Display battery level
-	provides = kodi=18.0
+	provides = kodi=18.1rc1pre1
 	conflicts = kodi
 	conflicts = kodi-git
 	conflicts = kodi-pre-release
@@ -142,7 +183,7 @@ pkgname = kodi-devel
 pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
 	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.0
+	provides = kodi-eventclients=18.1rc1pre1
 	conflicts = kodi-eventclients
 	conflicts = kodi-pre-release-eventclients
 	replaces = kodi-pre-release-eventclients
@@ -153,7 +194,7 @@ pkgname = kodi-devel-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.0
+	provides = kodi-tools-texturepacker=18.1rc1pre1
 	conflicts = kodi-tools-texturepacker
 	conflicts = kodi-pre-release-tools-texturepacker
 	replaces = kodi-pre-release-tools-texturepacker
@@ -161,7 +202,7 @@ pkgname = kodi-devel-tools-texturepacker
 pkgname = kodi-devel-dev
 	pkgdesc = Kodi dev files
 	depends = kodi-devel
-	provides = kodi-dev=18.0
+	provides = kodi-dev=18.1rc1pre1
 	conflicts = kodi-dev
 	conflicts = kodi-pre-release-dev
 	replaces = kodi-pre-release-dev
diff --git a/PKGBUILD b/PKGBUILD
index ac517874cb87..696d3128a181 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,11 +23,11 @@
 
 pkgbase=kodi-devel
 pkgname=('kodi-devel' 'kodi-devel-eventclients' 'kodi-devel-tools-texturepacker' 'kodi-devel-dev')
-pkgver=18.0
-# diffs: https://github.com/xbmc/xbmc/compare/18.0rc5-Leia..18.0rc5.2-Leia
+pkgver=18.1rc1pre1
+_major=18.0
 pkgrel=1
 _codename=Leia
-_tag="$pkgver-$_codename"
+_tag="$_major-$_codename"
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
 # $CHROOT/build/kodi-devel/src/kodi-build/build/download
@@ -51,7 +51,7 @@ arch=('x86_64')
 url="http://kodi.tv"
 license=('GPL2')
 makedepends=(
-  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew'
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew' 'git'
   'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
@@ -70,9 +70,32 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
-  '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
   'cheat-sse-build.patch'
   'cpuinfo'
+  '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
+  # closed milestone patches go here
+  # https://github.com/xbmc/xbmc/milestone/121?closed=1
+  '01-PR14924.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/14924.patch'
+  '02-PR15352.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15352.patch'
+  '03-PR15328.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15328.patch'
+  '04-PR15327.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15327.patch'
+  '05-PR15248.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15248.patch'
+  '06-PR15342.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15342.patch'
+  '07-PR15362.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15362.patch'
+  '08-PR15359.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15359.patch'
+  '09-PR15376.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15376.patch'
+  '10-PR15368.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15368.patch'
+  '11-PR15383.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15383.patch'
+  '12-PR15382.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15382.patch'
+  '13-PR15381.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15381.patch'
+  '14-PR15392.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15392.patch'
+  '15-PR15394.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15394.patch'
+  '16-PR15385.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15385.patch'
+  '17-PR15401.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15401.patch'
+  '18-PR15403.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15403.patch'
+  '19-PR15351.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15351.patch'
+  '20-PR15399.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15399.patch'
+  '21-PR15410.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15410.patch'
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -93,9 +116,28 @@ sha256sums=('ac5d64d59c6f4811b41a869538506e56c342b530fac97ad9dc9715f3d480e633'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
-            '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
             '304d4581ef024bdb302ed0f2dcdb9c8dea03f78ba30d2a52f4a0d1c8fc4feecd'
-            '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1')
+            '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1'
+            '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
+            '026b9fb181bbfab92cd141eebff9458cfe536cf789a748047db0e43685db56c1'
+            'a31e0ebdb1b7f4af1f2772d87dc5c1b83be105b20c2cc2d2659de58529f0b207'
+            '6e3c798913b1a1aaaebd1e0e699c72e78366e681f8b56282aeaa0237d8508a22'
+            '269a0f6df80a045c930f38206dabeb966abe317fd05a3d6d38c02c15ed74d6a9'
+            'b8ee25888ab3e5efbe2e1997180108ac9f2563eeaabecdc83ff981deed079ef6'
+            '090d038f824a2d5571e68ced2377173c371bd2e20996eeb1c2b2d9e5999050d4'
+            'ba525b840f615815892258f74a85c332c9030e8e95988a5463cbb42d35a38a8e'
+            '65f3f4f297f1f5fcc3b91d5f1bbd232d41497a885f2af5480ec72cac3605b76c'
+            '834b542997a21a9c205330ed1b743ec8c430bee9c01a64c0493347756aff4f25'
+            'c9dbeeb0d51e8eaa56981f64ca2c3bc5a58317d613d97eba474d2488fefcb04e'
+            'ad3b9acf718875c15a2d8427a9e8b90cf88b2512404e7305bc9b0a36ca2f0b5e'
+            '3850804d0380db35d651e964b83cbe4d0e3e1e7b1bd85c2dda955fd3974e0737'
+            '50b4a057cc2c1c6a6ada2839eb119d91d42ac14e1bbcb5baf272964412fbc711'
+            '4c73812dca6de51ab896d060508608756dd5051cc53c6ca4cce9031fd8747b3a'
+            'c53ba29065ea3a1a2ed1c6de76b4f5a6b089313a20704f67224233ac1de2971a'
+            'f8966249bc86234a8445109600c24ad926026f179e5bcf65ab3facdfd6acef09'
+            'e27441261d72aaa3f3611638715444b068795d175b0b8c8de8d7612062ca4137'
+            '3dea58570ec1a59c94513e4c468d232f87d9a71787740b2bc631751e13ce17c1'
+            '4676b603e0c170f2d627e305560622b72dbdee51c0a221058c350841a814dc39')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -108,7 +150,17 @@ prepare() {
     patch -Np1 -i ../cheat-sse-build.patch
   fi
 
-  patch -Np1 -i ../00-fix.building.with.mariadb.patch
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    # only patch subset of patches that begin with 0-9
+    [[ $src == [0-9]*.patch ]] || continue
+    msg2 "Applying patch $src..."
+    # patch -Np1 < "../$src"
+    # patch will fail if binary diffs are present so use git apply
+    git apply --verbose -p1 < "../$src"
+  done
 }
 
 build() {