alarm/kodi-rbp to 17.0-1 (#1447)

archlinuxarm · Feb 4, 2017 · 00ab15b · 00ab15b
1 parent 6f60d8f
commit 00ab15b
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 2,397 deletions.
diff --git a/alarm/kodi-rbp/10775.patch b/alarm/kodi-rbp/10775.patch
diff --git a/alarm/kodi-rbp/99-kodi.rules b/alarm/kodi-rbp/99-kodi.rules
@@ -0,0 +1,4 @@
+SUBSYSTEM=="bcm2708_vcio",GROUP="video",MODE="0660"
+SUBSYSTEM=="vc-sm",GROUP="video",MODE="0660"
+SUBSYSTEM=="vchiq",GROUP="video",MODE="0660"
+SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0660"
diff --git a/alarm/kodi-rbp/PKGBUILD b/alarm/kodi-rbp/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Oleg Rakhmanov <oleg@archlinuxarm.org>
+# Contributor graysky <graysky AT archlinux DOT org>
+# Contributor BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor tomasgroth at yahoo.dk
 # Contributor WarheadsSE <max@warheads.net>
-# Contributor Romzetron <asromzek@gmail.com>
-# Contributor Holzhaus <holthuis.jan@googlemail.com>
+# Contributor Adrian Fedoreanu <adrian [dot] fedoreanu [at] gmail [dot] com>
 
 buildarch=20
 
 _prefix=/usr
 
 pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients')
-pkgver=16.1
-_codename=Jarvis
-pkgrel=7
+pkgver=17.0
+_codename=Krypton
+pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
 arch=('armv6h' 'armv7h')
 url="http://kodi.tv"
@@ -23,138 +24,113 @@ makedepends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
              'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'xorg-xdpyinfo' 'libbluray'
              'libnfs' 'afpfs-ng' 'avahi' 'bluez-libs' 'tinyxml' 'raspberrypi-firmware' 'libcec-rpi'
              'libplist' 'swig' 'taglib' 'libxslt' 'shairplay' 'boost' 'cmake' 'gperf' 'nasm' 'zip'
-             'udisks' 'upower' 'git' 'autoconf' 'java-environment' 'libdcadec.so' 'libcrossguid')
+             'upower' 'autoconf' 'java-environment' 'libcrossguid-git' 'dcadec' 'libpulse' 'cwiid')
 source=("https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
         'kodi.service'
-        'polkit.rules'
-        'gcc6_fix.patch'
-        'hifiberry_digi.patch'
-        '10775.patch')
-
-sha256sums=('7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10'
-            'e9276dcc220b853bb24a1404a6016c9046aa080041fb225e16f7ffb97c364308'
-            '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
-            'b0fe75d10b2678894d1dec48f3258c0bec2a4a170f33d76a9a8334bb1969b18f'
-            '0b9d951911a8576c26dec8a31f394282677e48afff49b9579448121d27b8509e'
-            '75529f0f42e9f84d2b55c86ba48d89f5e1286d84365f3ba6676c5b41fba6a314')
+        '99-kodi.rules'
+        'https://github.com/popcornmix/xbmc/commit/0c320b6cdd4fb409be45008e6b9042463d54b742.patch'
+        'https://github.com/popcornmix/xbmc/commit/4d983105d7fd65b1d92f2ae2602e6e1cdcaddbe0.patch'
+        'polkit.rules')
+
+sha256sums=('4bfffa2493973ae15ab1d922632c09a2583908d6140bc4f58ec8f9314e4f6545'
+            '5235068d5800d69f0287087815990e7fe8d6572733d60c8800546d35f608e87f'
+            'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
+            '813f8c622c341eefb33774115199d2abe9c189cf2ce52e79719dbd42d48a1274'
+            'd830c010ead152bc9a9ba6b812c985d6e649bda7480fec9b3c451f5ea03ba792'
+            '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96')
 prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
 
-  find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
-  sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
-	sed 's/python/python2/' -i tools/Linux/kodi.sh.in
-  sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in
-  # 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
+  # ffmpeg: Automatic switch to software decode for GMC with more than one warp point
+  patch -Np1 -i "$srcdir/0c320b6cdd4fb409be45008e6b9042463d54b742.patch"
+  # fix for files with GMC
+  patch -Np1 -i "$srcdir/4d983105d7fd65b1d92f2ae2602e6e1cdcaddbe0.patch"
 
-  patch -Np1 -i ${srcdir}/gcc6_fix.patch
-  patch -Np1 -i ${srcdir}/hifiberry_digi.patch
-
-  # libcec 4.0
-  patch -Np1 -i ${srcdir}/10775.patch
+  [[ -d kodi-build ]] && rm -rf kodi-build
+  mkdir $srcdir/kodi-build
 }
 
 build() {
-  cd "$srcdir/xbmc-$pkgver-$_codename"
+  cd "kodi-build"
+
+  # -DCPU=arm1176jzf-s for rpi1
+  # -DCPU=cortex-a7 for rpi2
+  # -DCPU=cortex-a53 for rpi3
+
+  [[ $CARCH == "armv6h" ]] && _CPU=arm1176jzf-s
+  [[ $CARCH == "armv7h" ]] && _CPU=cortex-a7
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_PREFIX_PATH=/opt/vc \
+    -DCORE_SYSTEM_NAME=rbpi \
+    -DWITH_CPU="$_CPU" \
+    -DENABLE_EVENTCLIENTS=ON \
+    -DENABLE_OPENGL=OFF \
+    -DENABLE_X11=OFF \
+    -DENABLE_VAAPI=OFF \
+    -DENABLE_VDPAU=OFF \
+    -DLIRC_DEVICE=/run/lirc/lircd \
+    ../"xbmc-$pkgver-$_codename"/project/cmake
 
-  # Bootstrapping
-  MAKEFLAGS=-j1 ./bootstrap
-
-  # 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\
-         -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"
-
-  export LDFLAGS="$LDFLAGS -L/opt/vc/lib"
-
-  # If build fails try uncommenting the line below first
-  # export MAKEFLAGS="-j1"
-
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix  \
-  --with-platform=raspberry-pi \
-  --disable-gl \
-  --enable-gles \
-  --disable-x11 \
-  --disable-sdl \
-  --enable-optimizations \
-  --disable-goom \
-  --disable-vaapi \
-  --disable-vdpau \
-  --disable-xrandr \
-  --enable-airplay \
-  --enable-airtunes \
-  --enable-avahi \
-  --enable-libbluray \
-  --enable-dvdcss \
-  --disable-debug \
-  --disable-joystick \
-  --disable-mid \
-  --enable-nfs \
-  --disable-profiling \
-  --disable-projectm \
-  --enable-rsxs \
-  --enable-rtmp \
-  --disable-vaapi \
-  --enable-optical-drive \
-  --enable-player=omxplayer \
-  --with-lirc-device=/run/lirc/lircd \
-  ac_cv_lib_bluetooth_hci_devid=no
   make
+  make preinstall
 }
 
 package_kodi-rbp() {
   pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi)"
 
-  # depends expected for kodi plugins:
-  # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
-  # depends expeced in FEH.py
-  # 'mesa-demos' 'xorg-xdpyinfo'
   depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio'
            'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'libssh' 'libmicrohttpd'
            'sdl_image' 'python2' 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'libass'
-           'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'xorg-xdpyinfo' 'libbluray'
-           'libnfs' 'avahi' 'bluez-libs' 'tinyxml' 'raspberrypi-firmware' 'libcec-rpi'
-           'libplist' 'swig' 'taglib' 'libxslt' 'shairplay' 'libdcadec.so')
+           'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'xorg-xdpyinfo' 'libbluray'
+           'avahi' 'bluez-libs' 'tinyxml' 'raspberrypi-firmware' 'libpulse'
+           'libplist' 'swig' 'taglib' 'libxslt' 'libcrossguid-git')
 
   optdepends=(
-    'afpfs-ng: Apple shares support'
+    'afpfs-ng: Apple airplay and AFP share support'
+    'libcec-rpi: Pulse-Eight USB-CEC adapter support'
+    'libnfs: NFS shares support'
     'lirc: remote controller support'
+    'lsb-release: log distro information in crashlog'
     'polkit: permissions for automounting external drives and power management functionality'
-    'udisks: automount external drives'
-    'upower: used to trigger power management functionality'
+    'shairplay: limited Apple airplay support'
     'unrar: access compressed files without unpacking them'
-    'lsb-release: log distro information in crashlog'
-    'gdb: stack trace in crashlog')
+    'unzip: access compressed files without unpacking them'
+    'upower: used to trigger power management functionality')
 
-  install="kodi.install"
+  install='kodi.install'
   provides=('xbmc' 'kodi')
   conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git')
-  replaces=('xbmc-rbp')
+  replaces=('xbmc-rbp-git')
 
-  cd "$srcdir/xbmc-$pkgver-$_codename"
-  # Running make install
-  make DESTDIR="${pkgdir}" install
+  _components=('kodi' 'kodi-bin')
 
-  # We will no longer support the xbmc name
-  rm "$pkgdir/usr/share/xsessions/xbmc.desktop"
-  rm "$pkgdir/usr/bin/"xbmc{,-standalone}
-  # we will leave /usr/{include,lib,share}/xbmc for now
+  cd kodi-build
+  # install eventclients
+  for _cmp in ${_components[@]}; do
+  DESTDIR="$pkgdir" /usr/bin/cmake \
+    -DCMAKE_INSTALL_COMPONENT="$_cmp" \
+     -P cmake_install.cmake
+  done
 
   # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
   for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/kodi/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+    mv ${pkgdir}/usr/share/doc/kodi/${licensef} \
+      ${pkgdir}/usr/share/licenses/${pkgname}
   done
 
-  install -Dm0644 $srcdir/kodi.service $pkgdir/usr/lib/systemd/system/kodi.service
-  mkdir -m700 -p $pkgdir/usr/share/polkit-1/rules.d/
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-kodi.rules
-  chmod 0750 $pkgdir/usr/share/polkit-1/rules.d/
+  # python2 is being used
+  cd "$pkgdir"
+  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+
+  install -Dm0644 "$srcdir/kodi.service" "$pkgdir/usr/lib/systemd/system/kodi.service"
+  install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-kodi.rules"
+  chmod 0700 "$pkgdir/usr/share/polkit-1/rules.d/"
+
+  # fix permissions necessary for accelerated video playback
+  install -Dm0644 "$srcdir/99-kodi.rules" "$pkgdir/etc/udev/rules.d/99-kodi.rules"
 }
 
 package_kodi-rbp-eventclients() {
@@ -163,7 +139,22 @@ package_kodi-rbp-eventclients() {
   conflicts=('kodi-eventclients')
   depends=('cwiid')
 
-  cd "$srcdir/xbmc-$pkgver-$_codename"
+  _components=(
+    'kodi-eventclients-common'
+    'kodi-eventclients-ps3'
+    'kodi-eventclients-wiiremote'
+    'kodi-eventclients-xbmc-send'
+  )
+
+  cd kodi-build
+  # install eventclients
+  for _cmp in ${_components[@]}; do
+    DESTDIR="$pkgdir" /usr/bin/cmake \
+      -DCMAKE_INSTALL_COMPONENT="$_cmp" \
+      -P cmake_install.cmake
+  done
 
-  make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD
+  # python2 is being used
+  cd "$pkgdir"
+  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }
diff --git a/alarm/kodi-rbp/fix_libdvd.patch b/alarm/kodi-rbp/fix_libdvd.patch
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	2016-05-15 08:11:58.074191520 +0000
++++ Makefile.in	2016-05-15 08:12:25.599007513 +0000
+@@ -11,7 +11,6 @@
+
+ DVDPCODECS_DIRS= \
+ 	lib \
+-	lib/libdvd
+
+ VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
+                    xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
+@@ -341,7 +340,6 @@
+ 	$(MAKE) -C lib/addons/library.xbmc.pvr
+ 	$(MAKE) -C lib/addons/library.kodi.inputstream
+ dvdpcodecs: dllloader
+-	$(MAKE) -C lib/libdvd
+
+ dvdpextcodecs:
+