[arch-commits] Commit in kodi/trunk (PKGBUILD cheat-sse-build.patch)
Ike Devolder
idevolder at archlinux.org
Sun Feb 24 21:30:38 UTC 2019
Date: Sunday, February 24, 2019 @ 21:30:37
Author: idevolder
Revision: 435558
upgpkg: kodi 18.1-1
Modified:
kodi/trunk/PKGBUILD
kodi/trunk/cheat-sse-build.patch
-----------------------+
PKGBUILD | 100 +++++++++++++++++++++++++++---------------------
cheat-sse-build.patch | 4 -
2 files changed, 60 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-24 21:30:24 UTC (rev 435557)
+++ PKGBUILD 2019-02-24 21:30:37 UTC (rev 435558)
@@ -19,11 +19,10 @@
pkgbase=kodi
pkgname=('kodi' 'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev')
-pkgver=17.6
-_codename=Krypton
-pkgrel=9
+pkgver=18.1
+pkgrel=1
arch=('x86_64')
-url="http://kodi.tv"
+url="https://kodi.tv"
license=('GPL2')
makedepends=(
'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew'
@@ -30,22 +29,33 @@
'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
- 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns'
+ 'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm' 'nss-mdns'
'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump'
'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
- 'yajl' 'zip' 'git' 'giflib'
+ 'yajl' 'zip' 'git' 'giflib' 'rapidjson' 'ghostscript'
)
-_libdvdcss_commit="2f12236bc1c92f73c21e973363f79eb300de603f"
-_libdvdnav_commit="981488f7f27554b103cca10c1fbeba027396c94a"
-_libdvdread_commit="17d99db97e7b8f23077b342369d3c22a6250affd"
-_ffmpeg_version="3.1.11-$_codename-17.5"
+
+_codename=Leia
+
+_libdvdcss_version="1.4.2-$_codename-Beta-5"
+_libdvdnav_version="6.0.0-$_codename-Alpha-3"
+_libdvdread_version="6.0.0-$_codename-Alpha-3"
+_ffmpeg_version="4.0.3-$_codename-RC5"
+_fmt_version="5.1.0"
+_crossguid_version="8f399e8bd4"
+_fstrcmp_version="0.7.D001"
+_flatbuffers_version="1.9.0"
+
source=(
"$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-libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
+ "$pkgbase-libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
+ "$pkgbase-libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
"$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
- 'fix-python-lib-path.patch'
+ "$pkgbase-fmt-$_fmt_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
+ "$pkgbase-crossguid-$_crossguid_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
+ "$pkgbase-fstrcmp-$_fstrcmp_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
+ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
'cheat-sse-build.patch'
'cpuinfo'
)
@@ -54,14 +64,21 @@
"$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz"
"$pkgbase-libdvdread-$_libdvdread_commit.tar.gz"
"$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz"
+ "$pkgbase-fmt-$_fmt_version.tar.gz"
+ "$pkgbase-crossguid-$_crossguid_version.tar.gz"
+ "$pkgbase-fstrcmp-$_fstrcmp_version.tar.gz"
+ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz"
)
-sha512sums=('1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111'
- '12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9'
- '005355da5e3d34f69737f7c3fe7884e82ffdc8f654f337e97d4a4d1e486c9f346f63b4dee74de2765e7a8d94925de5d25c3c82da732d2e8d4f58fcfeb9dd2586'
- 'e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2'
- 'b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73'
- '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2'
- 'be8d6b77088373d0173dee6434ebd04c9382fb00190641b392a6f9f5338b35d186f6d871aaea4a01908f283a452b23de3a1113947d9070e77fde531e32458f7e'
+sha512sums=('2df32e14e1138474cf0a1b8102b4c734e1a54799b1aab049cfe9f623f467e0c9eb87237b4c81ded280e72bc4655a27a887904d164927b3fd227a9c9311531ebc'
+ '5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e'
+ '11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72'
+ 'b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7'
+ 'a95eaeca26baa9dca4343f1ed6dc068e0800199997a5ad1a28664061e533aa8b0e6d0ad53c18009e21bdd09177b7eda8e59a5a98a10f0f6a081cf03803ee9277'
+ 'b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6'
+ '2682d63609d3dcdfcd8136be632e45df26ad88ce93b9c49745cf728bbd2e6254a7b05c8b059ab581d532372e504206a525a52564b64d076dfdae9c965a09fd16'
+ 'aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c'
+ '0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696'
+ '424dbde693c83d923f82fe22cf42564eb51077bd021fc1cc72d03318fe49d498082494fd57354908a2443aea41f47a280d750d59cee9e78cff4241111a6ceada'
'539b33f30f6735caaf57fb9f19de449b8a8902362ae9e66a6fceabd530d02888533d2ab262fb187670780c997e5c1d23bd715a3c6860fd50280c1031f47865f7')
prepare() {
@@ -69,7 +86,7 @@
mkdir kodi-build
cd "xbmc-$pkgver-$_codename"
- patch -p1 -i "$srcdir/fix-python-lib-path.patch"
+
# detect if building in arch chroot
if [[ "$srcdir" =~ ^\/build.* ]]; then
patch -p1 -i "$srcdir/cheat-sse-build.patch"
@@ -81,13 +98,21 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DENABLE_EVENTCLIENTS=ON \
- -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" \
+ -DENABLE_INTERNAL_FFMPEG=ON \
+ -DENABLE_INTERNAL_FMT=ON \
+ -DENABLE_INTERNAL_CROSSGUID=ON \
+ -DENABLE_INTERNAL_FSTRCMP=ON \
+ -DENABLE_INTERNAL_FLATBUFFERS=ON \
+ -Dlibdvdcss_URL="$srcdir/$pkgbase-libdvdcss-$_libdvdcss_version.tar.gz" \
+ -Dlibdvdnav_URL="$srcdir/$pkgbase-libdvdnav-$_libdvdnav_version.tar.gz" \
+ -Dlibdvdread_URL="$srcdir/$pkgbase-libdvdread-$_libdvdread_version.tar.gz" \
-DFFMPEG_URL="$srcdir/$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz" \
- ../"xbmc-$pkgver-$_codename"/project/cmake
- make
+ -DFMT_URL="$srcdir/$pkgbase-fmt-$_fmt_version.tar.gz" \
+ -DCROSSGUID_URL="$srcdir/$pkgbase-crossguid-$_crossguid_version.tar.gz" \
+ -DFSTRCMP_URL="$srcdir/$pkgbase-fstrcmp-$_fstrcmp_version.tar.gz" \
+ -DFLATBUFFERS_URL="$srcdir/$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz" \
+ ../"xbmc-$pkgver-$_codename"
+ make
make preinstall
}
@@ -97,11 +122,12 @@
package_kodi() {
pkgdesc="A software media player and entertainment hub for digital media"
depends=(
- 'bluez-libs' 'desktop-file-utils' 'freetype2' 'fribidi'
+ 'bluez-libs' 'curl' 'desktop-file-utils' 'freetype2' 'fribidi'
'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'mariadb-libs'
'libmicrohttpd' 'libpulse' 'libssh' 'libva' 'libvdpau' 'libxrandr'
'libxslt' 'lzo' 'mesa' 'python2-pillow' 'python2-simplejson' 'smbclient'
- 'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl'
+ 'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libbluray'
+ 'libnfs' 'lirc' 'libcec'
)
optdepends=(
'afpfs-ng: Apple shares support'
@@ -109,9 +135,6 @@
'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'
@@ -135,13 +158,6 @@
-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
@@ -148,7 +164,7 @@
}
# kodi-eventclients
-# 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-kodi-send
package_kodi-eventclients() {
pkgdesc="Kodi Event Clients"
@@ -158,7 +174,7 @@
_components=(
'kodi-eventclients-common'
'kodi-eventclients-ps3'
- 'kodi-eventclients-xbmc-send'
+ 'kodi-eventclients-kodi-send'
)
cd kodi-build
Modified: cheat-sse-build.patch
===================================================================
--- cheat-sse-build.patch 2019-02-24 21:30:24 UTC (rev 435557)
+++ cheat-sse-build.patch 2019-02-24 21:30:37 UTC (rev 435558)
@@ -1,5 +1,5 @@
---- a/project/cmake/modules/FindSSE.cmake 2017-08-22 09:29:22.000000000 +0200
-+++ b/project/cmake/modules/FindSSE.cmake 2018-01-06 19:36:32.716303559 +0100
+--- a/cmake/modules/FindSSE.cmake 2017-08-22 09:29:22.000000000 +0200
++++ b/cmake/modules/FindSSE.cmake 2018-01-06 19:36:32.716303559 +0100
@@ -4,7 +4,7 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
More information about the arch-commits
mailing list