summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/kodi/17804.patch25
-rw-r--r--libre/kodi/PKGBUILD229
-rw-r--r--libre/kodi/cheat-sse-build.patch11
-rw-r--r--libre/kodi/libre.patch17
4 files changed, 174 insertions, 108 deletions
diff --git a/libre/kodi/17804.patch b/libre/kodi/17804.patch
new file mode 100644
index 000000000..9ed7098e9
--- /dev/null
+++ b/libre/kodi/17804.patch
@@ -0,0 +1,25 @@
+From 977af616e53f21df97668ca4b76ceb20737df9f3 Mon Sep 17 00:00:00 2001
+From: nl6720 <nl6720@gmail.com>
+Date: Tue, 5 May 2020 12:21:55 +0300
+Subject: [PATCH] [kodi-standalone.sh] Replace which with command -v
+
+The which utility is not guaranteed to be installed. Use the portable shell builtin command -v.
+---
+ tools/Linux/kodi-standalone.sh.pulse | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/Linux/kodi-standalone.sh.pulse b/tools/Linux/kodi-standalone.sh.pulse
+index c4d556434427..5273094b5574 100644
+--- a/tools/Linux/kodi-standalone.sh.pulse
++++ b/tools/Linux/kodi-standalone.sh.pulse
+@@ -1,8 +1,8 @@
+-PULSE_START="$(which start-pulseaudio-x11)"
++PULSE_START="$(command -v start-pulseaudio-x11)"
+ if [ -n "$PULSE_START" ]; then
+ $PULSE_START
+ else
+- PULSE_SESSION="$(which pulse-session)"
++ PULSE_SESSION="$(command -v pulse-session)"
+ if [ -n "$PULSE_SESSION" ]; then
+ XBMC="$PULSE_SESSION $XBMC"
+ fi
diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD
index ce7d13fd4..cba28ab17 100644
--- a/libre/kodi/PKGBUILD
+++ b/libre/kodi/PKGBUILD
@@ -1,101 +1,107 @@
-# vim:set ts=2 sw=2 et:
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Contributor (Arch): graysky <graysky AT archlinux DOT us>
-# Contributor (Arch): DonVla <donvla@users.sourceforge.net>
-# Contributor (Arch): Ulf Winkelvos <ulf [at] winkelvos [dot] de>
-# Contributor (Arch): Ralf Barth <archlinux dot org at haggy dot org>
-# Contributor (Arch): B & monty - Thanks for your hints :)
-# Contributor (Arch): marzoul
-# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
-# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com>
-# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor (arch): graysky <graysky AT archlinux DOT us>
+# Contributor (arch): DonVla <donvla@users.sourceforge.net>
+# Contributor (arch): Ulf Winkelvos <ulf [at] winkelvos [dot] de>
+# Contributor (arch): Ralf Barth <archlinux dot org at haggy dot org>
+# Contributor (arch): B & monty - Thanks for your hints :)
+# Contributor (arch): marzoul
+# Contributor (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (arch): Brad Fanella <bradfanella@archlinux.us>
+# Contributor (arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor (arch): Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor (arch): Maxime Gauduin <alucryd@gmail.com>
+# Contributor: André Silva <emulatorman@hyperbola.info>
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
# Contributor: Isaac David <isacdaavid () isacdaavid!info>
-#
-# Original credits go to Edgar Hucek <gimli at dark-green dot com>
-# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
+# Contributor: bill-auger <bill-auger@programmer.net>
+# Contributor: Edgar Hucek <gimli at dark-green dot com>
+
+
+# parabola changes and rationale:
+# - replace non-free addons
+# - remove RAR decompression
+
_pkgbase=kodi-libre
pkgbase=kodi
pkgname=(
- 'kodi' 'kodi-bin' 'kodi-wayland' 'kodi-gbm'
+ 'kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm'
'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev'
)
-pkgver=18.3
-pkgrel=1
-pkgrel+=.par2
+pkgver=18.9
+pkgrel=3
+pkgrel+=.parabola1
arch=('x86_64')
-arch+=('i686' 'armv7h')
+arch+=('armv7h' 'i686')
url="https://kodi.tv"
license=('GPL2')
-
-# Attention!
-# Don't repeat libvdpau in makedepends=(), it will break the armv7h build
-makedepends_i686=('libvdpau')
-makedepends_x86_64=('libvdpau')
makedepends=(
- 'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew'
+ 'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
- 'python2-pycryptodome' 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
- 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
- 'upower' 'giflib' 'rapidjson' 'ghostscript'
+ 'python2-pycryptodomex' 'python2-pillow6' 'python2-pybluez'
+ 'python2-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
+ 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
# wayland
'wayland-protocols' 'waylandpp' 'libxkbcommon'
# gbm
'libinput'
- 'ffmpeg' 'flatbuffers' 'fmt'
)
+[[ "${CARCH}" == 'armv7h' ]] && makedepends=(${makedepends[@]/libvdpau/})
_codename=Leia
+_sse_workaround=1
+
_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-18.2"
-#_fmt_version="5.1.0"
+_ffmpeg_version="4.0.4-$_codename-18.4"
+_fmt_version="5.1.0"
_crossguid_version="8f399e8bd4"
_fstrcmp_version="0.7.D001"
-#_flatbuffers_version="1.9.0"
+_flatbuffers_version="1.9.0"
+
source=(
"$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.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"
-# "$pkgbase-fmt-$_fmt_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
+ "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
+ "$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"
- 'libre.patch'
+ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
+ 'cheat-sse-build.patch'
+ '17804.patch'
)
+source+=(http://repo.parabola.nu/other/kodi-libre/addons/${_codename,,}/addons.xml.gz)
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"
-# "$pkgbase-fmt-$_fmt_version.tar.gz"
+ "$pkgbase-libdvdcss-$_libdvdcss_version.tar.gz"
+ "$pkgbase-libdvdnav-$_libdvdnav_version.tar.gz"
+ "$pkgbase-libdvdread-$_libdvdread_version.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"
+ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz"
)
-sha512sums=('4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec'
+sha512sums=('72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353'
'5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e'
'11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72'
'b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7'
-# 'b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2'
-# 'b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6'
+ 'c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078'
+ 'b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6'
'2682d63609d3dcdfcd8136be632e45df26ad88ce93b9c49745cf728bbd2e6254a7b05c8b059ab581d532372e504206a525a52564b64d076dfdae9c965a09fd16'
'aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c'
-# '0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696'
- '664167256a1d0ebadde7416ff57141532e47a6c18c4eb77a63a507deeed19af47027fee2098c3e43704c03ec897c5477641d22ea8ce728037d72a3eb8219b0a2')
+ '0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696'
+ '91409cc66959a30f2d0dbf8d28e47dd2acbac560efb8961550c5928ae8546a32d1f156f8e55f073f953b114230117ec96c224212d28c1c1d752540c836c9ae1a'
+ '69e477773bf6f4160288e445c7c2492e4de7054960bfcd6833f206e5c994c6b7a7995c51c1a45c702c34343063912c4c61590129f87181b21738ba7e489cd01d')
+sha512sums+=('4288afffc27debe4ebcff0eecb0f11a8bce15a2a4d72b64a57c245dd0d477f68bce0dcbb7614ebb7d016d17a3ddaa4f9fbb916477ef84ebab09aa84e1c68adb5')
prepare() {
# force python 'binary' as python2
@@ -111,55 +117,92 @@ prepare() {
mkdir kodi-build-gbm
cd "xbmc-$pkgver-$_codename"
- # patches
- msg2 "Use addons.xml from Parabola server (without nonfree addons support)"
- patch -Np1 -i ../libre.patch
+
+ patch -p1 -i "$srcdir/17804.patch"
+
+ [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
+
+ # replace default add-ons
+ sed -i 's|mirrors\.kodi\.tv/|repo.parabola.nu/other/kodi-libre/|' addons/repository.xbmc.org/addon.xml
+
+ # NOTE: this fails to build OOTB, with the vendored 'fmt'
+ # ... xbmc/utils/StringUtils.h:29:10: fatal error: fmt/format.h: No such file or directory
+ # it failed worse with the 'fmt' package installed - did this dirty trick instead:
+ # ln -s /build/kodi/src/kodi-build-x11/build/include/fmt /usr/include/fmt
}
build() {
export PATH="$srcdir/path:$PATH"
- msg2 "building kodi-x11"
+ echo "building kodi-x11"
cd "$srcdir/kodi-build-x11"
- local configure_options=(
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_INSTALL_LIBDIR=/usr/lib
- -DENABLE_EVENTCLIENTS=ON
- -DENABLE_INTERNAL_FFMPEG=OFF
- -DENABLE_INTERNAL_FMT=OFF
- -DENABLE_INTERNAL_CROSSGUID=ON
- -DENABLE_INTERNAL_FSTRCMP=ON
- -DENABLE_INTERNAL_FLATBUFFERS=OFF
- -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"
-# -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"
- )
- if [ "$CARCH" = "armv7h" ]; then
- configure_options+=(-DENABLE_VAAPI=OFF)
- fi
- cmake "${configure_options[@]}" \
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DENABLE_EVENTCLIENTS=ON \
+ -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" \
+ -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" \
+ -DX11_RENDER_SYSTEM=gl \
+ $( [[ "${CARCH}" == 'armv7h' ]] && echo '-DENABLE_VAAPI=OFF' ) \
../"xbmc-$pkgver-$_codename"
make
make preinstall
- msg2 "building kodi-wayland"
+ echo "building kodi-wayland"
cd "$srcdir/kodi-build-wayland"
- cmake "${configure_options[@]}" \
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DENABLE_EVENTCLIENTS=ON \
+ -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" \
+ -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" \
-DCORE_PLATFORM_NAME=wayland \
- -DWAYLAND_RENDER_SYSTEM=gl ../"xbmc-$pkgver-$_codename"
+ -DWAYLAND_RENDER_SYSTEM=gl \
+ ../"xbmc-$pkgver-$_codename"
make
make preinstall
- msg2 "building kodi-gbm"
+ echo "building kodi-gbm"
cd "$srcdir/kodi-build-gbm"
- cmake "${configure_options[@]}" \
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DENABLE_EVENTCLIENTS=ON \
+ -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" \
+ -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" \
-DCORE_PLATFORM_NAME=gbm \
- -DGBM_RENDER_SYSTEM=gles ../"xbmc-$pkgver-$_codename"
+ -DGBM_RENDER_SYSTEM=gles \
+ ../"xbmc-$pkgver-$_codename"
make
make preinstall
}
@@ -168,11 +211,12 @@ build() {
# components: kodi
package_kodi() {
- pkgdesc="A software media player and entertainment hub for digital media, without support for nonfree RAR decompression or nonfree addons"
+ pkgdesc="A software media player and entertainment hub for digital media"
+ pkgdesc+=", without nonfree addons or RAR decompression"
depends=(
- 'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodome'
- 'python2-pillow' 'python2-simplejson' 'xorg-xdpyinfo'
- 'kodi-bin'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodomex'
+ 'python2-pillow6' 'python2-simplejson' 'xorg-xdpyinfo'
+ 'KODI-BIN'
)
optdepends=(
'afpfs-ng: Apple shares support'
@@ -214,14 +258,17 @@ package_kodi() {
# kodi-x11
# components: kodi-bin
-package_kodi-bin() {
+package_kodi-x11() {
pkgdesc="x11 kodi binary"
+ provides=('KODI-BIN')
+ replaces=('kodi-bin')
depends=(
'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
'tinyxml' 'kodi'
)
+ [[ "${CARCH}" == 'armv7h' ]] && depends=(${depends[@]/libvdpau/})
cd kodi-build-x11
install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11"
@@ -233,7 +280,7 @@ package_kodi-bin() {
package_kodi-wayland() {
pkgdesc="wayland kodi binary"
- provides=('kodi-bin')
+ provides=('KODI-BIN')
depends=(
'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
@@ -250,7 +297,7 @@ package_kodi-wayland() {
package_kodi-gbm() {
pkgdesc="gbm kodi binary"
- provides=('kodi-bin')
+ provides=('KODI-BIN')
depends=(
'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
diff --git a/libre/kodi/cheat-sse-build.patch b/libre/kodi/cheat-sse-build.patch
new file mode 100644
index 000000000..df356d0fd
--- /dev/null
+++ b/libre/kodi/cheat-sse-build.patch
@@ -0,0 +1,11 @@
+--- 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")
+ if(CPU MATCHES "x86_64" OR CPU MATCHES "i.86")
+- exec_program(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
++ set(CPUINFO "sse sse2 pni ssse3 sse4_1 sse4_2 avx avx2")
+
+ string(REGEX REPLACE "^.*(sse).*$" "\\1" _SSE_THERE ${CPUINFO})
+ string(COMPARE EQUAL "sse" "${_SSE_THERE}" _SSE_TRUE)
diff --git a/libre/kodi/libre.patch b/libre/kodi/libre.patch
deleted file mode 100644
index 7b0df1f03..000000000
--- a/libre/kodi/libre.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xbmc-18.3-Leia.orig/addons/repository.xbmc.org/addon.xml 2019-06-19 04:18:07.000000000 -0500
-+++ xbmc-18.3-Leia/addons/repository.xbmc.org/addon.xml 2019-08-24 21:09:14.677670552 -0500
-@@ -8,10 +8,10 @@
- </requires>
- <extension point="xbmc.addon.repository">
- <!-- Do not forget to bump add-on version when changing paths to force a repo refresh -->
-- <info>http://mirrors.kodi.tv/addons/leia/addons.xml.gz</info>
-- <checksum verify="sha256">http://mirrors.kodi.tv/addons/leia/addons.xml.gz?sha256</checksum>
-- <datadir>https://mirrors.kodi.tv/addons/leia</datadir>
-- <artdir>http://mirrors.kodi.tv/addons/leia</artdir>
-+ <info>http://repo.parabola.nu/other/kodi-libre/addons/leia/addons.xml.gz</info>
-+ <checksum verify="sha256">http://repo.parabola.nu/other/kodi-libre/addons/leia/addons.xml.gz?sha256</checksum>
-+ <datadir>http://repo.parabola.nu/other/kodi-libre/addons/leia</datadir>
-+ <artdir>http://repo.parabola.nu/other/kodi-libre/addons/leia</artdir>
- <hashes>sha256</hashes>
- </extension>
- <extension point="xbmc.addon.metadata">