Use external ffmpeg

3 files changed, 71 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48707b899f22..4ffebc9c85b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by mksrcinfo v8
-# Sat Sep 23 05:58:56 UTC 2017
 pkgbase = kodi-git
-	pkgver = 20170923.f97ea3ce16
+	pkgver = 20171023.65aca5104d
 	pkgrel = 1
 	url = http://kodi.tv
 	arch = i686
@@ -15,6 +13,7 @@ pkgbase = kodi-git
 	makedepends = cwiid
 	makedepends = doxygen
 	makedepends = git
+	makedepends = ffmpeg
 	makedepends = glew
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
@@ -25,6 +24,7 @@ pkgbase = kodi-git
 	makedepends = libbluray
 	makedepends = libcdio
 	makedepends = libcec
+	makedepends = libfmt-git
 	makedepends = libgl
 	makedepends = libmariadbclient
 	makedepends = libmicrohttpd
@@ -32,65 +32,49 @@ pkgbase = kodi-git
 	makedepends = libmpeg2
 	makedepends = libnfs
 	makedepends = libplist
-	makedepends = libpulse
-	makedepends = libssh
-	makedepends = libva
-	makedepends = libvdpau
 	makedepends = libxrandr
 	makedepends = libxslt
 	makedepends = lzo
+	makedepends = mesa
 	makedepends = nasm
 	makedepends = nss-mdns
 	makedepends = python2-pillow
 	makedepends = python2-pybluez
 	makedepends = python2-simplejson
+	makedepends = rapidjson-git
 	makedepends = rtmpdump
 	makedepends = shairplay
 	makedepends = smbclient
 	makedepends = swig
 	makedepends = taglib
 	makedepends = tinyxml
-	makedepends = unzip
 	makedepends = upower
-	makedepends = yajl
-	makedepends = zip
-	makedepends = mesa
-	makedepends = libcrossguid-git
-	makedepends = libfmt-git
-	makedepends = rapidjson-git
-	source = xbmc::git://github.com/xbmc/xbmc.git
+	source = xbmc::git+https://github.com/xbmc/xbmc.git#branch=master
 	source = 0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch
-	sha512sums = SKIP
-	sha512sums = 39c84be54caa0e4a9b57ec92a903d688703e3fc2cf6ea566efad9f2509eb286d981837e4968af1c28ffb2f5fe7a872fa546535c787a56dbdb335991514fb1a06
+	sha256sums = SKIP
+	sha256sums = 867e0b91c9c4d3f69074b567d065f50bdfe9010b3601fef876069e41842bbaac
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
-	depends = python2-pillow
-	depends = python2-pybluez
-	depends = python2-simplejson
-	depends = xorg-xdpyinfo
 	depends = bluez-libs
-	depends = fribidi
-	depends = freetype2
+	depends = desktop-file-utils
+	depends = ffmpeg
 	depends = glew
 	depends = hicolor-icon-theme
 	depends = libcdio
-	depends = libjpeg-turbo
+	depends = libfmt-git
 	depends = libmariadbclient
 	depends = libmicrohttpd
-	depends = libpulse
-	depends = libssh
-	depends = libva
-	depends = libvdpau
 	depends = libxrandr
 	depends = libxslt
 	depends = lzo
+	depends = mesa
+	depends = python2-pillow
+	depends = python2-simplejson
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
-	depends = yajl
-	depends = mesa
-	depends = desktop-file-utils
+	depends = xorg-xdpyinfo
 	optdepends = gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
@@ -105,12 +89,12 @@ pkgname = kodi-git
 	optdepends = unrar: Archives support
 	optdepends = unzip: Archives support
 	optdepends = upower: Display battery level
-	provides = xbmc
 	provides = kodi
-	conflicts = xbmc
+	provides = xbmc
 	conflicts = kodi
-	replaces = xbmc-svn
+	conflicts = xbmc
 	replaces = xbmc-git
+	replaces = xbmc-svn
 
 pkgname = kodi-eventclients-git
 	pkgdesc = Kodi Event Clients (master branch)
@@ -119,9 +103,9 @@ pkgname = kodi-eventclients-git
 
 pkgname = kodi-tools-texturepacker-git
 	pkgdesc = Kodi Texturepacker tool (master branch)
-	depends = libpng
 	depends = giflib
 	depends = libjpeg-turbo
+	depends = libpng
 	depends = lzo
 
 pkgname = kodi-dev-git
diff --git a/.gitignore b/.gitignore
index 3e1a5bb6ae18..9ddefe54039d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-src
-pkg
-*.log
-*.log.*
-*.pkg.tar.?z
+*
+!.SRCINFO
+!.gitignore
+!0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch
+!PKGBUILD
+!README.md
diff --git a/PKGBUILD b/PKGBUILD
index cce39734a951..eccbd3d267fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# vim:set ts=2 sw=2 et:
-# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer: Lenovsky <lenovsky@protonmail.ch>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: DonVla <donvla@users.sourceforge.net>
 # Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de>
 # Contributor: Ralf Barth <archlinux dot org at haggy dot org>
@@ -18,28 +18,21 @@
 pkgbase=kodi-git
 pkgname=('kodi-git' 'kodi-eventclients-git' 'kodi-tools-texturepacker-git' 'kodi-dev-git')
 _gitname='xbmc'
-pkgver=20170923.f97ea3ce16
+pkgver=20171023.65aca5104d
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://kodi.tv"
 license=('GPL2')
-makedepends=(
-  'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew'
-  'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
-  'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd'
-  'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
-  'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
-  'python2-pybluez' 'python2-simplejson' 'rtmpdump'
-  'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
-  'mesa' 'libcrossguid-git' 'libfmt-git' 'rapidjson-git'
-)
-source=(
-  "$_gitname::git://github.com/xbmc/xbmc.git"
-  '0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch'
-)
-sha512sums=('SKIP'
-            '39c84be54caa0e4a9b57ec92a903d688703e3fc2cf6ea566efad9f2509eb286d981837e4968af1c28ffb2f5fe7a872fa546535c787a56dbdb335991514fb1a06')
-
+makedepends=('afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'ffmpeg' 'glew'
+             'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' 'libbluray'
+             'libcdio' 'libcec' 'libfmt-git' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmodplug'
+             'libmpeg2' 'libnfs' 'libplist' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns'
+             'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rapidjson-git' 'rtmpdump'
+             'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'upower')
+source=("$_gitname::git+https://github.com/xbmc/xbmc.git#branch=master"
+        '0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch')
+sha256sums=('SKIP'
+            '867e0b91c9c4d3f69074b567d065f50bdfe9010b3601fef876069e41842bbaac')
 pkgver() {
   cd "$srcdir/$_gitname"
   git log -1 --date=short --format="%cd.%h" | tr -d '-'
@@ -54,10 +47,13 @@ prepare() {
 
 build() {
   cd "$_gitname"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_EVENTCLIENTS=ON \
     -DLIRC_DEVICE=/run/lirc/lircd \
+    -DENABLE_INTERNAL_FFMPEG="no" \
+    -DWITH_FFMPEG="yes" \
     .
   make VERBOSE=1
   make preinstall
@@ -73,37 +69,28 @@ package_kodi-git() {
   # 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
   # depends expeced in FEH.py
   # 'mesa-demos' 'xorg-xdpyinfo'
-  depends=(
-    'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'xorg-xdpyinfo'
-    'bluez-libs' 'fribidi' 'freetype2' 'glew' 'hicolor-icon-theme' 'libcdio'
-    'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh'
-    'libva' 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'smbclient' 'taglib' 'tinyxml'
-    'yajl' 'mesa' 'desktop-file-utils'
-  )
-  optdepends=(
-    'gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED'
-    'afpfs-ng: Apple shares support'
-    'bluez: Blutooth support'
-    'python2-pybluez: Bluetooth support'
-    'libnfs: NFS shares support'
-    'libplist: AirPlay support'
-    'libcec: Pulse-Eight USB-CEC adapter support'
-    'lirc: Remote controller support'
-    'lsb-release: log distro information in crashlog'
-    'pulseaudio: PulseAudio support'
-    'shairplay: AirPlay support'
-    'unrar: Archives support'
-    'unzip: Archives support'
-    'upower: Display battery level'
-  )
-  provides=('xbmc' 'kodi')
-  conflicts=('xbmc' 'kodi')
-  replaces=('xbmc-svn' 'xbmc-git')
-
-  _components=(
-    'kodi'
-    'kodi-bin'
-  )
+  depends=('bluez-libs' 'desktop-file-utils' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio'
+           'libfmt-git' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt' 'lzo' 'mesa'
+           'python2-pillow' 'python2-simplejson' 'smbclient' 'taglib' 'tinyxml' 'xorg-xdpyinfo')
+  optdepends=('gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED'
+              'afpfs-ng: Apple shares support'
+              'bluez: Blutooth support'
+              'python2-pybluez: Bluetooth support'
+              'libnfs: NFS shares support'
+              'libplist: AirPlay support'
+              'libcec: Pulse-Eight USB-CEC adapter support'
+              'lirc: Remote controller support'
+              'lsb-release: log distro information in crashlog'
+              'pulseaudio: PulseAudio support'
+              'shairplay: AirPlay support'
+              'unrar: Archives support'
+              'unzip: Archives support'
+              'upower: Display battery level')
+  provides=('kodi' 'xbmc')
+  conflicts=('kodi' 'xbmc')
+  replaces=('xbmc-git' 'xbmc-svn')
+
+  _components=('kodi' 'kodi-bin')
 
   cd "$_gitname"
   # install eventclients
@@ -131,15 +118,10 @@ package_kodi-git() {
 package_kodi-eventclients-git() {
   pkgdesc="Kodi Event Clients (master branch)"
   conflicts=('kodi-eventclients')
-
   depends=('cwiid')
 
-  _components=(
-    'kodi-eventclients-common'
-    'kodi-eventclients-ps3'
-    'kodi-eventclients-wiiremote'
-    'kodi-eventclients-xbmc-send'
-  )
+  _components=('kodi-eventclients-common' 'kodi-eventclients-ps3' 'kodi-eventclients-wiiremote'
+               'kodi-eventclients-xbmc-send')
 
   cd "$_gitname"
   # install eventclients
@@ -159,11 +141,9 @@ package_kodi-eventclients-git() {
 
 package_kodi-tools-texturepacker-git() {
   pkgdesc="Kodi Texturepacker tool (master branch)"
-  depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
+  depends=('giflib' 'libjpeg-turbo' 'libpng' 'lzo')
 
-  _components=(
-    'kodi-tools-texturepacker'
-  )
+  _components=('kodi-tools-texturepacker')
 
   cd "$_gitname"
   # install eventclients
@@ -181,17 +161,9 @@ package_kodi-dev-git() {
   pkgdesc="Kodi dev files (master branch)"
   depends=('kodi')
 
-  _components=(
-    'kodi-addon-dev'
-    'kodi-audio-dev'
-    'kodi-eventclients-dev'
-    'kodi-game-dev'
-    'kodi-inputstream-dev'
-    'kodi-peripheral-dev'
-    'kodi-pvr-dev'
-    'kodi-screensaver-dev'
-    'kodi-visualization-dev'
-  )
+  _components=('kodi-addon-dev' 'kodi-audio-dev' 'kodi-eventclients-dev' 'kodi-game-dev'
+               'kodi-inputstream-dev' 'kodi-peripheral-dev' 'kodi-pvr-dev' 'kodi-screensaver-dev'
+               'kodi-visualization-dev')
 
   cd "$_gitname"
   # install eventclients