Update to 18.0-1

2 files changed, 12 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dbfb7f928d6..66c98c5caddb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jan 26 20:18:37 UTC 2019
+# Mon Jan 28 20:33:10 UTC 2019
 pkgbase = kodi-devel
-	pkgver = 18.0rc5.2
-	pkgrel = 7
+	pkgver = 18.0
+	pkgrel = 1
 	url = http://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -65,7 +65,7 @@ pkgbase = kodi-devel
 	noextract = crossguid-8f399e8bd4.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
 	noextract = flatbuffers-1.9.0.tar.gz
-	source = kodi-18.0rc5.2-Leia.tar.gz::https://github.com/xbmc/xbmc/archive/18.0rc5.2-Leia.tar.gz
+	source = kodi-18.0-Leia.tar.gz::https://github.com/xbmc/xbmc/archive/18.0-Leia.tar.gz
 	source = ffmpeg-4.0.3-Leia-RC5.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-RC5.tar.gz
 	source = libdvdcss-1.4.2-Leia-Beta-5.tar.gz::https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
 	source = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz
@@ -75,10 +75,9 @@ pkgbase = kodi-devel
 	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 = 01-GLContextEGL-properly.guard.members.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15313.patch
 	source = cheat-sse-build.patch
 	source = cpuinfo
-	sha256sums = e8ec83659339491286bf7d9f65037f18c0a4e21d5479808474ef5ca98ff691bb
+	sha256sums = ac5d64d59c6f4811b41a869538506e56c342b530fac97ad9dc9715f3d480e633
 	sha256sums = 9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
@@ -88,7 +87,6 @@ pkgbase = kodi-devel
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
 	sha256sums = 5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3
 	sha256sums = 849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb
-	sha256sums = 6e443a1d0e9b1bd0e60575917c79dc92a6d5ce52a6e9c6ddb14a6b3385e2cb80
 	sha256sums = 304d4581ef024bdb302ed0f2dcdb9c8dea03f78ba30d2a52f4a0d1c8fc4feecd
 	sha256sums = 27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1
 
@@ -135,7 +133,7 @@ pkgname = kodi-devel
 	optdepends = unrar: Archives support
 	optdepends = unzip: Archives support
 	optdepends = upower: Display battery level
-	provides = kodi=18.0rc5.2
+	provides = kodi=18.0
 	conflicts = kodi
 	conflicts = kodi-git
 	conflicts = kodi-pre-release
@@ -144,7 +142,7 @@ pkgname = kodi-devel
 pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
 	optdepends = python2: most eventclients are implemented in python2
-	provides = kodi-eventclients=18.0rc5.2
+	provides = kodi-eventclients=18.0
 	conflicts = kodi-eventclients
 	conflicts = kodi-pre-release-eventclients
 	replaces = kodi-pre-release-eventclients
@@ -155,7 +153,7 @@ pkgname = kodi-devel-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=18.0rc5.2
+	provides = kodi-tools-texturepacker=18.0
 	conflicts = kodi-tools-texturepacker
 	conflicts = kodi-pre-release-tools-texturepacker
 	replaces = kodi-pre-release-tools-texturepacker
@@ -163,7 +161,7 @@ pkgname = kodi-devel-tools-texturepacker
 pkgname = kodi-devel-dev
 	pkgdesc = Kodi dev files
 	depends = kodi-devel
-	provides = kodi-dev=18.0rc5.2
+	provides = kodi-dev=18.0
 	conflicts = kodi-dev
 	conflicts = kodi-pre-release-dev
 	replaces = kodi-pre-release-dev
diff --git a/PKGBUILD b/PKGBUILD
index e5ad7cd47f43..ac517874cb87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,9 +23,9 @@
 
 pkgbase=kodi-devel
 pkgname=('kodi-devel' 'kodi-devel-eventclients' 'kodi-devel-tools-texturepacker' 'kodi-devel-dev')
-pkgver=18.0rc5.2
+pkgver=18.0
 # diffs: https://github.com/xbmc/xbmc/compare/18.0rc5-Leia..18.0rc5.2-Leia
-pkgrel=7
+pkgrel=1
 _codename=Leia
 _tag="$pkgver-$_codename"
 # Found on their respective github release pages. One can check them against
@@ -71,7 +71,6 @@ source=(
   "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'
-  '01-GLContextEGL-properly.guard.members.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15313.patch'
   'cheat-sse-build.patch'
   'cpuinfo'
 )
@@ -85,7 +84,7 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('e8ec83659339491286bf7d9f65037f18c0a4e21d5479808474ef5ca98ff691bb'
+sha256sums=('ac5d64d59c6f4811b41a869538506e56c342b530fac97ad9dc9715f3d480e633'
             '9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
@@ -95,7 +94,6 @@ sha256sums=('e8ec83659339491286bf7d9f65037f18c0a4e21d5479808474ef5ca98ff691bb'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
             '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
             '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
-            '6e443a1d0e9b1bd0e60575917c79dc92a6d5ce52a6e9c6ddb14a6b3385e2cb80'
             '304d4581ef024bdb302ed0f2dcdb9c8dea03f78ba30d2a52f4a0d1c8fc4feecd'
             '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1')
 
@@ -111,7 +109,6 @@ prepare() {
   fi
 
   patch -Np1 -i ../00-fix.building.with.mariadb.patch
-  patch -Np1 -i ../01-GLContextEGL-properly.guard.members.patch
 }
 
 build() {