alarm/kodi-rbp-17.5-2 (#1529)

alarm/kodi-rbp/PKGBUILD

@@ -13,19 +13,30 @@ pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev')
 _codename=Krypton
 pkgver=17.5
-pkgrel=1
+pkgrel=2
 arch=('armv6h' 'armv7h')
 url="http://kodi.tv"
 license=('GPL2')
-makedepends=('afpfs-ng' 'autoconf' 'avahi' 'bluez-libs' 'boost' 'cmake' 'cwiid' 'dcadec'
-    'doxygen' 'ffmpeg' 'fribidi' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-environment'
-    'libaacs' 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libjpeg-turbo' 'libmad'
-    'libmariadbclient' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpng'
-    'libpulse' 'libsamplerate' 'libssh' 'libtiff' 'libva' 'libxslt' 'lzo' 'nasm' 'python2'
-    'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'raspberrypi-firmware' 'rtmpdump'
-    'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'xorg-xdpyinfo'
-    'yajl' 'zip')
+makedepends=(
+  'raspberrypi-firmware' 'libpulse'
+  'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen'
+  'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-environment' 'libaacs'
+  'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libgl' 'libmariadbclient'
+  'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libxrandr'
+  'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns' 'python2-pillow' 'python2-pybluez'
+  'python2-simplejson' 'rtmpdump' 'shairplay' 'smbclient' 'swig' 'taglib'
+  'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
+)
+_libdvdcss_commit="2f12236bc1c92f73c21e973363f79eb300de603f"
+_libdvdnav_commit="981488f7f27554b103cca10c1fbeba027396c94a"
+_libdvdread_commit="17d99db97e7b8f23077b342369d3c22a6250affd"
+_ffmpeg_version="3.1.11-$_codename-$pkgver"
 source=("https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
+    "$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
+    "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_commit.tar.gz"
+    "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_commit.tar.gz"
+    "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_commit.tar.gz"
+    "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
     'kodi.service'
     '99-kodi.rules'
     'https://github.com/popcornmix/xbmc/commit/0c320b6cdd4fb409be45008e6b9042463d54b742.patch'
@@ -33,7 +44,18 @@ source=("https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
     'polkit.rules'
     'hifiberry_digi.patch'
     'fix-python-lib-path.patch')
+noextract=(
+    "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz"
+    "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz"
+    "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz"
+    "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz"
+)
 sha256sums=('84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2'
+            '84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2'
+            'b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34'
+            '312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d'
+            'e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b'
+            '7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0'
             '5235068d5800d69f0287087815990e7fe8d6572733d60c8800546d35f608e87f'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '6f23df9cf214502f0a446edf07b18ce1855e549cabb1cd94ac9180770ba48ee4'
@@ -79,31 +101,40 @@ build() {
     -DENABLE_VAAPI=OFF \
     -DENABLE_VDPAU=OFF \
     -DENABLE_INTERNAL_CROSSGUID=ON \
-    -DENABLE_INTERNAL_FFMPEG="no" \
-    -DWITH_FFMPEG="yes" \
     -DLIRC_DEVICE=/run/lirc/lircd \
+    -Dlibdvdcss_URL="$srcdir/$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz" \
+    -Dlibdvdnav_URL="$srcdir/$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz" \
+    -Dlibdvdread_URL="$srcdir/$pkgbase-libdvdread-$_libdvdread_commit.tar.gz" \
+    -DFFMPEG_URL="$srcdir/$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz" \
     ../"xbmc-$pkgver-$_codename"/project/cmake
-
   make
   make preinstall
 }
 
 package_kodi-rbp() {
   pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi)"
-  depends=('ffmpeg' 'glew' 'jasper' 'libbluray' 'libcdio' 'libmad' 'libmariadbclient' 'libmicrohttpd'
-    'libmpeg2' 'libplist' 'libxslt' 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
-    'raspberrypi-firmware' 'rtmpdump' 'sdl_image' 'smbclient' 'swig' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl')
+  depends=(
+  'libpulse' 'raspberrypi-firmware' 
+  'bluez-libs' 'desktop-file-utils' 'glew' 'hicolor-icon-theme'
+  'libcdio' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt'
+  'python2-pillow' 'python2-simplejson' 'smbclient' 'taglib' 'tinyxml'
+  'xorg-xdpyinfo' 'yajl' 'libass'
+  )
   optdepends=(
-    'afpfs-ng: Apple airplay and AFP share support'
-    'libcec-rpi: Pulse-Eight USB-CEC adapter support'
+    'afpfs-ng: Apple shares support'
+    'bluez: Blutooth support'
+    'python2-pybluez: Bluetooth support'
     'libnfs: NFS shares support'
-    'lirc: remote controller support'
+    'libplist: AirPlay support'
+    'libcec-rpi: Pulse-Eight USB-CEC adapter support'
+    'lirc: Remote controller support'
     'lsb-release: log distro information in crashlog'
-    'polkit: permissions for automounting external drives and power management functionality'
-    'shairplay: limited Apple airplay support'
-    'unrar: access compressed files without unpacking them'
-    'unzip: access compressed files without unpacking them'
-    'upower: used to trigger power management functionality')
+    'polkit: Permissions for automounting external drives and power management functionality'
+    'shairplay: AirPlay support'
+    'unrar: Archives support'
+    'unzip: Archives support'
+    'upower: Display battery level'
+  )
   install='kodi.install'
   provides=('xbmc' 'kodi')
   conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git')