alarm/kodi-imx to 16.1-2

alarm/kodi-imx/PKGBUILD

@@ -1,7 +1,6 @@
-# vim:set ts=2 sw=2 et:
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer: Oleg Rakhmanov <oleg@archlinuxarm.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
@@ -12,9 +11,6 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - i.MX6 changes
 
-# Prevent autobuild till GCC5.2 issues get resolved.
-noautobuild=1
-
 buildarch=4
 
 _prefix=/usr
@@ -23,7 +19,7 @@ pkgbase=kodi
 pkgname=('kodi-imx' 'kodi-imx-eventclients')
 pkgver=16.1
 _codename=Jarvis
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://kodi.tv"
 license=('GPL2')
@@ -44,14 +40,16 @@ source=(
   'imx-spdif.conf'
   'kodi.service'
   'polkit.rules'
-  'kodi.conf')
+  'kodi.conf'
+  'gcc6_fix.patch')
 
 sha256sums=('7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10'
             '6d9822d97b9e1268c04078f6c9b6316eb013f95f96f90034b51fa7473b9752ff'
             '0e16e4d2ec0c0e1810fe1ad6a7c4dee99d6fc0f49502f0e836210f5dd537d92d'
             '75eae110b6ca1c844505a231b453377afb092ef3969a31c8f4c72a3c3247381a'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
-            'db6372248015fa4e663bf789e4f7121b5a9ade323f361994bbd6f135ce169123')
+            'db6372248015fa4e663bf789e4f7121b5a9ade323f361994bbd6f135ce169123'
+            'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f')
 prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
@@ -63,6 +61,9 @@ prepare() {
   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
+
 }
 
 build() {
@@ -76,7 +77,7 @@ build() {
 
   # Configuring XBMC
   export PYTHON_VERSION=2  # external python v2
-  CFLAGS="-Ofast -mfloat-abi=hard -mfpu=neon -mtls-dialect=gnu -march=armv7-a -mtune=cortex-a9 -pipe -fstack-protector -D_GLIBCXX_USE_CXX11_ABI=1 --param=ssp-buffer-size=4 -I/opt/fsl/include"
+  CFLAGS="-Ofast -mfloat-abi=hard -mfpu=neon -mtls-dialect=gnu -march=armv7-a -mtune=cortex-a9 -pipe -fstack-protector  --param=ssp-buffer-size=4 -I/opt/fsl/include"
   CXXFLAGS="${CFLAGS}"
   CPPFLAGS+=" -I/opt/fsl/include"
   LDFLAGS+=" -Wl,-rpath,/opt/fsl/lib -L/opt/fsl/lib"