diff options
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | 0001-fmt-does-not-have-sprintf.patch | 35 | ||||
-rw-r--r-- | PKGBUILD | 21 |
3 files changed, 53 insertions, 12 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sun Mar 5 05:50:15 UTC 2017 +# Mon Mar 20 05:54:03 UTC 2017 pkgbase = kodi-git - pkgver = 20170304.2bbf02ddfaf + pkgver = 20170319.ff33fc014a3 pkgrel = 1 url = http://kodi.tv arch = i686 @@ -56,8 +56,11 @@ pkgbase = kodi-git makedepends = zip makedepends = mesa makedepends = libcrossguid-git + makedepends = libfmt-git source = xbmc::git://github.com/xbmc/xbmc.git - sha256sums = SKIP + source = 0001-fmt-does-not-have-sprintf.patch + sha512sums = SKIP + sha512sums = 0275bd3bc9c9c5edc09878364c2acc5271cad4a5598462d29b7e4e62584e469ce6501c6fe416df0374a23cbde20f6877306f7cfc72f4f51152da145c3941fdea pkgname = kodi-git pkgdesc = A software media player and entertainment hub for digital media (master branch) diff --git a/0001-fmt-does-not-have-sprintf.patch b/0001-fmt-does-not-have-sprintf.patch new file mode 100644 index 000000000000..244894f4de2f --- /dev/null +++ b/0001-fmt-does-not-have-sprintf.patch @@ -0,0 +1,35 @@ +From b239de6c5d498d69679ce204717defffb9f998e4 Mon Sep 17 00:00:00 2001 +From: BlackEagle <ike.devolder@gmail.com> +Date: Sun, 19 Mar 2017 22:19:43 +0100 +Subject: [PATCH] fmt does not have sprintf + +Signed-off-by: BlackEagle <ike.devolder@gmail.com> +--- + xbmc/utils/StringUtils.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h +index 0c1d98c2be..8bebcc654f 100644 +--- a/xbmc/utils/StringUtils.h ++++ b/xbmc/utils/StringUtils.h +@@ -61,7 +61,7 @@ public: + { + auto result = fmt::format(fmt, std::forward<Args>(args)...); + if (result == fmt) +- result = fmt::sprintf(fmt, std::forward<Args>(args)...); ++ result = fmt::format(fmt, std::forward<Args>(args)...); + + return result; + } +@@ -70,7 +70,7 @@ public: + { + auto result = fmt::format(fmt, std::forward<Args>(args)...); + if (result == fmt) +- result = fmt::sprintf(fmt, std::forward<Args>(args)...); ++ result = fmt::format(fmt, std::forward<Args>(args)...); + + return result; + } +-- +2.12.0 + @@ -18,7 +18,7 @@ pkgbase=kodi-git pkgname=('kodi-git' 'kodi-eventclients-git' 'kodi-tools-texturepacker-git' 'kodi-dev-git') _gitname='xbmc' -pkgver=20170304.2bbf02ddfaf +pkgver=20170319.ff33fc014a3 pkgrel=1 arch=('i686' 'x86_64') url="http://kodi.tv" @@ -31,12 +31,14 @@ makedepends=( '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' + 'mesa' 'libcrossguid-git' 'libfmt-git' ) source=( "$_gitname::git://github.com/xbmc/xbmc.git" + '0001-fmt-does-not-have-sprintf.patch' ) -sha256sums=('SKIP') +sha512sums=('SKIP' + '0275bd3bc9c9c5edc09878364c2acc5271cad4a5598462d29b7e4e62584e469ce6501c6fe416df0374a23cbde20f6877306f7cfc72f4f51152da145c3941fdea') pkgver() { cd "$srcdir/$_gitname" @@ -47,15 +49,16 @@ prepare() { [[ -d kodi-build ]] && rm -rf kodi-build mkdir kodi-build cd $_gitname + patch -p1 -i "$srcdir/0001-fmt-does-not-have-sprintf.patch" } build() { - cd kodi-build + cd "$_gitname" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DENABLE_EVENTCLIENTS=ON \ -DLIRC_DEVICE=/run/lirc/lircd \ - ../$_gitname/ + . make VERBOSE=1 make preinstall } @@ -102,7 +105,7 @@ package_kodi-git() { 'kodi-bin' ) - cd kodi-build + cd "$_gitname" # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ @@ -138,7 +141,7 @@ package_kodi-eventclients-git() { 'kodi-eventclients-xbmc-send' ) - cd kodi-build + cd "$_gitname" # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ @@ -162,7 +165,7 @@ package_kodi-tools-texturepacker-git() { 'kodi-tools-texturepacker' ) - cd kodi-build + cd "$_gitname" # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ @@ -190,7 +193,7 @@ package_kodi-dev-git() { 'kodi-visualization-dev' ) - cd kodi-build + cd "$_gitname" # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ |