alarm/kodi-rbp-git to 18.0a3.20180801-1 (#1607)

alarm/kodi-rbp-git/PKGBUILD

@@ -12,10 +12,10 @@ _prefix=/usr
 pkgbase=kodi-rbp-git
 _suffix=rbp-git
 pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix")
-pkgver=18.0a2.20180621
-pkgrel=5
+pkgver=18.0a3.20180801
+pkgrel=1
 _codename=Leia
-_tag="18.0a2-$_codename"
+_tag="18.0a3-$_codename"
 _rtype=Alpha
 _ffmpeg_version="4.0.2-$_codename-$_rtype"3
 _libdvdcss_version="1.4.1-$_codename-$_rtype"-3
@@ -23,18 +23,19 @@ _libdvdnav_version="6.0.0-$_codename-$_rtype"-3
 _libdvdread_version="6.0.0-$_codename-$_rtype"-3
 _fmt_version="3.0.1"
 _crossguid_version="8f399e8bd4"
+_fstrcmp_version="0.7.D001"
 arch=('armv6h' 'armv7h')
 url="http://kodi.tv"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'doxygen'
   'gperf' 'hicolor-icon-theme' 'jasper' 'java-environment' 'libaacs' 'libass'
-  'libbluray' 'libcdio' 'libmariadbclient' 'libmicrohttpd'
+  'libbluray' 'libcdio' 'libmariadbclient' 'libmicrohttpd' 'groff'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libcec-rpi'
   'libxrandr' 'libxslt' 'lirc' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
   'python2-pybluez' 'python2-simplejson' 'raspberrypi-firmware' 'rtmpdump'
   'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
-  'yajl' 'zip' 'giflib' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon'
+  'yajl' 'zip' 'giflib' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon' 'ghostscript'
 )
 source=("xbmc-$_tag.tar.gz::https://github.com/xbmc/xbmc/archive/$_tag.tar.gz"
   'kodi.service'
@@ -47,7 +48,7 @@ source=("xbmc-$_tag.tar.gz::https://github.com/xbmc/xbmc/archive/$_tag.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
-  'fix_fmt_race_condition.patch'
+  "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -56,8 +57,9 @@ noextract=(
   "ffmpeg-$_ffmpeg_version.tar.gz"
   "fmt-$_fmt_version.tar.gz"
   "crossguid-$_crossguid_version.tar.gz"
+  "fstrcmp-$_fstrcmp_version.tar.gz"
 )
-sha256sums=('937d755c638324bf388fc9e971c5d8f90fcc0ab9362f0b15bbad5e47f0bc67d6'
+sha256sums=('f452388b8ce34f9f2d3c002f7e5f28a7b3ad69e8d2be9d775b8ef8f89497d211'
             'aa96b6abb18329dcca7b5f775df69eee10beeb9ca727e867e7a96886953c66d0'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
@@ -68,15 +70,12 @@ sha256sums=('937d755c638324bf388fc9e971c5d8f90fcc0ab9362f0b15bbad5e47f0bc67d6'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
             'dce62ab75a161dd4353a98364feb166d35e7eea382169d59d9ce842c49c55bad'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
-            'd4ce2791cbf6fe6a4ea3507816e253a39d6562c7163dbf8ec30f5006484b75fa')
+            'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476')
 
 prepare() {
   cd "$srcdir/xbmc-$_tag"
 
- patch -Np1 -i "$srcdir/hifiberry_digi.patch"
-
- patch -Np1 -i "$srcdir/fix_fmt_race_condition.patch"
-
+  patch -Np1 -i "$srcdir/hifiberry_digi.patch"
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir $srcdir/kodi-build
 }
@@ -104,19 +103,21 @@ build() {
     -DCMAKE_PREFIX_PATH=/opt/vc \
     -DCORE_PLATFORM_NAME=rbpi \
     -DWITH_CPU="$_CPU" \
-    -DENABLE_INTERNAL_FMT=ON \
     -DENABLE_EVENTCLIENTS=ON \
     -DENABLE_OPENGL=OFF \
     -DENABLE_X11=OFF \
     -DENABLE_VAAPI=OFF \
     -DENABLE_VDPAU=OFF \
-    -DENABLE_INTERNAL_CROSSGUID=ON \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
     -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz" \
     -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz" \
+    -DENABLE_INTERNAL_FMT=ON \
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
     ../"xbmc-$_tag"
   make
   make preinstall
@@ -129,7 +130,7 @@ package_kodi-rbp-git() {
     'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'libmariadbclient'
     'libmicrohttpd' 'libpulse' 'libssh' 'libxrandr' 'lirc' 'raspberrypi-firmware'
     'libxslt' 'lzo' 'python2-pillow' 'python2-simplejson' 'smbclient'
-    'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libinput' 'libxkbcommon'
+    'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libinput' 'libxkbcommon' 'libbluray'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
@@ -157,13 +158,6 @@ package_kodi-rbp-git() {
      -P cmake_install.cmake
   done
 
-  # Licenses
-  install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "$pkgdir/usr/share/doc/kodi/$licensef" \
-      "$pkgdir/usr/share/licenses/$pkgname"
-  done
-
   # python2 is being used
   cd "$pkgdir"
   grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done

alarm/kodi-rbp-git/fix_fmt_race_condition.patch

@@ -1,53 +0,0 @@
-commit c2d8c14a29018a6dbd39a00454addd5944f67fcb
-Author: wsnipex <wsnipex@a1.net>
-Date:   Sun Jul 22 12:34:38 2018 +0200
-
-    fmt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4350a82bd1..9676919ce5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -288,7 +288,7 @@ endif()
- 
- # main library (used for main binary and tests)
- add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo>)
--add_dependencies(lib${APP_NAME_LC} libcpluff ffmpeg dvdnav crossguid ${PLATFORM_GLOBAL_TARGET_DEPS})
-+add_dependencies(lib${APP_NAME_LC} libcpluff ffmpeg dvdnav crossguid Fmt ${PLATFORM_GLOBAL_TARGET_DEPS})
- set_target_properties(lib${APP_NAME_LC} PROPERTIES PREFIX "")
- 
- # Other files (IDE)
-diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
-index ec0a12cb9e..60a6978a11 100644
---- a/cmake/modules/FindFmt.cmake
-+++ b/cmake/modules/FindFmt.cmake
-@@ -34,7 +34,7 @@ if(ENABLE_INTERNAL_FMT)
- 
-   set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
-   set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
--  externalproject_add(fmt
-+  externalproject_add(Fmt
-                       URL ${FMT_URL}
-                       DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
-                       PREFIX ${CORE_BUILD_DIR}/fmt
-@@ -43,8 +43,10 @@ if(ENABLE_INTERNAL_FMT)
-                                  -DFMT_DOC=OFF
-                                  -DFMT_TEST=OFF
-                                  "${EXTRA_ARGS}"
--                      BUILD_BYPRODUCTS ${FMT_LIBRARY})
--  set_target_properties(fmt PROPERTIES FOLDER "External Projects")
-+                      BUILD_BYPRODUCTS ${FMT_LIBRARY} ${FMT_INCLUDE_DIR})
-+  set_target_properties(Fmt PROPERTIES FOLDER "External Projects"
-+                                       IMPORTED_LOCATION "${FMT_LIBRARY}"
-+                                       INTERFACE_INCLUDE_DIRECTORIES "${FMT_INCLUDE_DIR}")
- 
-   include(FindPackageHandleStandardArgs)
-   find_package_handle_standard_args(Fmt
-@@ -98,6 +100,5 @@ if(FMT_FOUND)
-   endif()
- endif()
- 
--mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
--
- endif()
-+mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)