alarm/kodi-rbp to 16.1-2

alarm/kodi-rbp/PKGBUILD

@@ -1,11 +1,9 @@
+# Maintainer: Oleg Rakhmanov <oleg@archlinuxarm.org>
 # Contributor tomasgroth at yahoo.dk
 # Contributor WarheadsSE <max@warheads.net>
 # Contributor Romzetron <asromzek@gmail.com>
 # Contributor Holzhaus <holthuis.jan@googlemail.com>
 
-# Prevent autobuild till GCC5.2 issues get resolved.
-noautobuild=1
-
 buildarch=20
 
 _prefix=/usr
@@ -14,7 +12,7 @@ pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients')
 pkgver=16.1
 _codename=Jarvis
-pkgrel=1
+pkgrel=2
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
 arch=('armv6h' 'armv7h')
 url="http://kodi.tv"
@@ -28,11 +26,13 @@ makedepends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
              'udisks' 'upower' 'git' 'autoconf' 'java-environment' 'libdcadec.so' 'libcrossguid')
 source=("https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
         'kodi.service'
-        'polkit.rules')
+        'polkit.rules'
+        'gcc6_fix.patch')
 
 sha256sums=('7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10'
             '5235068d5800d69f0287087815990e7fe8d6572733d60c8800546d35f608e87f'
-            '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96')
+            '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
+            'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f')
 prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
@@ -44,6 +44,8 @@ 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() {
@@ -55,7 +57,7 @@ build() {
   # Configuring Kodi
   export PYTHON_VERSION=2  # external python v2
   # we need to compile for armv6 instead of armv5 to avoid problems compiling assembler code
-  FLAGS="-Ofast -fexcess-precision=fast -mfloat-abi=hard -mabi=aapcs-linux -pipe -fstack-protector --param=ssp-buffer-size=4 -D_GLIBCXX_USE_CXX11_ABI=1\
+  FLAGS="-Ofast -fexcess-precision=fast -mfloat-abi=hard -mabi=aapcs-linux -pipe -fstack-protector --param=ssp-buffer-size=4\
          -I/opt/vc/include/ -I/opt/vc/include/IL -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
   [[ $CARCH == "armv6h" ]] && export CFLAGS="$FLAGS -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfpu=vfp" && export CXXFLAGS="$FLAGS -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfpu=vfp"
   [[ $CARCH == "armv7h" ]] && export CFLAGS="$FLAGS -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad" && export CXXFLAGS="$FLAGS -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mvectorize-with-neon-quad"