[arch-commits] Commit in kodi/trunk (2 files)
Ike Devolder
idevolder at archlinux.org
Sun Feb 28 17:17:22 UTC 2021
Date: Sunday, February 28, 2021 @ 17:17:21
Author: idevolder
Revision: 875897
upgpkg: kodi 19.0-6
Added:
kodi/trunk/0001-allow-separate-windowing-binaries-being-launched-fro.patch
Modified:
kodi/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-allow-separate-windowing-binaries-being-launched-fro.patch | 67 ++
PKGBUILD | 254 +++-------
2 files changed, 161 insertions(+), 160 deletions(-)
Added: 0001-allow-separate-windowing-binaries-being-launched-fro.patch
===================================================================
--- 0001-allow-separate-windowing-binaries-being-launched-fro.patch (rev 0)
+++ 0001-allow-separate-windowing-binaries-being-launched-fro.patch 2021-02-28 17:17:21 UTC (rev 875897)
@@ -0,0 +1,67 @@
+From 5b75228b51c3422644468050debbc495f5195585 Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder at gmail.com>
+Date: Thu, 25 Feb 2021 15:24:21 +0100
+Subject: [PATCH] allow separate windowing binaries being launched from kodi
+ wrapper
+
+Signed-off-by: BlackEagle <ike.devolder at gmail.com>
+---
+ tools/Linux/kodi.sh.in | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
+index 108c0b0..38a49e0 100644
+--- a/tools/Linux/kodi.sh.in
++++ b/tools/Linux/kodi.sh.in
+@@ -28,6 +28,7 @@ LIBDIR="@libdir@"
+ APP_BINARY=$LIBDIR/${bin_name}/@APP_BINARY@
+ CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME}
+ KODI_DATA=${KODI_DATA:-"${HOME}/.${bin_name}"} # mapped to special://home/
++WINDOWING=${WINDOWING:-"auto"}
+
+ # Workaround for high CPU load with nvidia GFX
+ export __GL_YIELD=USLEEP
+@@ -43,13 +44,39 @@ do
+ LIBDIR="$2"
+ shift; shift
+ ;;
++ --windowing)
++ WINDOWING="$2"
++ echo "$SAVED_ARGS" | sed "s/--windowing[ ]*$2//g"
++ shift; shift
++ ;;
+ *)
+ shift
+ ;;
+ esac
+ done
+
+-KODI_BINARY=${APP_BINARY}
++# Note: by default only one of those binaries exists
++# To be able to select a different one, if has to be compiled specifically
++# Your distribution might provide extra packages for those
++if [ "$WINDOWING" = "auto" ]; then
++ # Wayland
++ if [ -n "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-wayland ]; then
++ KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-wayland
++ # X11
++ elif echo $DISPLAY | grep -qE ":[0-9]+" && [ -x $LIBDIR/${bin_name}/${bin_name}-x11 ]; then
++ KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-x11
++ # GBM/DRM
++ elif [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-gbm ]; then
++ KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-gbm
++ # Default kodi.bin
++ else
++ KODI_BINARY=${APP_BINARY}
++ fi
++elif [ -n "$WINDOWING" ]; then
++ KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-${WINDOWING}
++else
++ KODI_BINARY=${APP_BINARY}
++fi
+
+ if [ ! -x ${KODI_BINARY} ]; then
+ echo "Error: ${KODI_BINARY} not found"
+--
+2.30.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-28 16:58:12 UTC (rev 875896)
+++ PKGBUILD 2021-02-28 17:17:21 UTC (rev 875897)
@@ -19,11 +19,11 @@
pkgbase=kodi
pkgname=(
- 'kodi' 'kodi-x11' 'kodi-wayland' 'kodi-gbm'
+ 'kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm'
'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev'
)
-pkgver=18.9
-pkgrel=3
+pkgver=19.0
+pkgrel=6
arch=('x86_64')
url="https://kodi.tv"
license=('GPL2')
@@ -32,9 +32,9 @@
'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-pycryptodomex' 'python2-pillow6' 'python2-pybluez'
- 'python2-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
+ 'libva-vdpau-driver' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
+ 'python-pycryptodomex' 'python-pillow' 'python-pybluez'
+ 'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz'
# wayland
'wayland-protocols' 'waylandpp' 'libxkbcommon'
@@ -42,18 +42,19 @@
'libinput'
)
-_codename=Leia
+_codename=Matrix
_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.4-$_codename-18.4"
-_fmt_version="5.1.0"
+_libdvdcss_version="1.4.2-Leia-Beta-5"
+_libdvdnav_version="6.0.0-Leia-Alpha-3"
+_libdvdread_version="6.0.0-Leia-Alpha-3"
+_ffmpeg_version="4.3.1-$_codename-Beta1"
+_fmt_version="6.1.2"
+_spdlog_version="1.5.0"
_crossguid_version="8f399e8bd4"
_fstrcmp_version="0.7.D001"
-_flatbuffers_version="1.9.0"
+_flatbuffers_version="1.11.0"
source=(
"$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
@@ -62,11 +63,12 @@
"$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-spdlog-$_spdlog_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_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'
- '17804.patch'
+ '0001-allow-separate-windowing-binaries-being-launched-fro.patch'
)
noextract=(
"$pkgbase-libdvdcss-$_libdvdcss_version.tar.gz"
@@ -74,139 +76,106 @@
"$pkgbase-libdvdread-$_libdvdread_version.tar.gz"
"$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz"
"$pkgbase-fmt-$_fmt_version.tar.gz"
+ "$pkgbase-spdlog-$_spdlog_version.tar.gz"
"$pkgbase-crossguid-$_crossguid_version.tar.gz"
"$pkgbase-fstrcmp-$_fstrcmp_version.tar.gz"
"$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz"
)
-sha512sums=('72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353'
+sha512sums=('d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422'
'5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e'
'11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72'
'b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7'
- 'c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078'
- 'b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6'
+ 'ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac'
+ '8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7'
+ '78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34'
'2682d63609d3dcdfcd8136be632e45df26ad88ce93b9c49745cf728bbd2e6254a7b05c8b059ab581d532372e504206a525a52564b64d076dfdae9c965a09fd16'
'aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c'
- '0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696'
+ 'e4a6fbc5813041194ac66d2d019aea711dad72239f52731f292675cd21248cba139768aa80f044c3a11cae2d308ae95b4b45de914d207b5b1d3d5d18620c8882'
'91409cc66959a30f2d0dbf8d28e47dd2acbac560efb8961550c5928ae8546a32d1f156f8e55f073f953b114230117ec96c224212d28c1c1d752540c836c9ae1a'
- '69e477773bf6f4160288e445c7c2492e4de7054960bfcd6833f206e5c994c6b7a7995c51c1a45c702c34343063912c4c61590129f87181b21738ba7e489cd01d')
+ '372eb5ef438458a3fd2d38c20ad9385e208d670bdc8e5ffb62c5bde2e3e93a3548704118aced33e6a956e12ae70a42316afafa482cf16e171dd0f07330de3509')
prepare() {
- # force python 'binary' as python2
- [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
- mkdir "$srcdir/path"
- ln -s /usr/bin/python2 "$srcdir/path/python"
+ [[ -d kodi-build ]] && rm -rf kodi-build
+ mkdir "$srcdir/kodi-build"
- [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
- mkdir kodi-build-x11
- [[ -d kodi-build-wayland ]] && rm -rf kodi-build-wayland
- mkdir kodi-build-wayland
- [[ -d kodi-build-gbm ]] && rm -rf kodi-build-gbm
- mkdir kodi-build-gbm
-
cd "xbmc-$pkgver-$_codename"
- patch -p1 -i "$srcdir/17804.patch"
+ [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
- [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
+ patch -p1 -i "$srcdir/0001-allow-separate-windowing-binaries-being-launched-fro.patch"
}
build() {
- export PATH="$srcdir/path:$PATH"
+ cd "$srcdir/kodi-build"
+ _cmake_common_args=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib
+ -DUSE_LTO=ON
+ -DENABLE_LDGOLD=OFF
+ -DENABLE_EVENTCLIENTS=ON
+ -DENABLE_INTERNAL_FFMPEG=ON
+ -DENABLE_INTERNAL_FMT=ON
+ -DENABLE_INTERNAL_SPDLOG=ON
+ -DENABLE_INTERNAL_CROSSGUID=ON
+ -DENABLE_INTERNAL_FSTRCMP=ON
+ -DENABLE_INTERNAL_FLATBUFFERS=ON
+ -DENABLE_MYSQLCLIENT=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"
+ -DSPDLOG_URL="$srcdir/$pkgbase-spdlog-$_spdlog_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"
+ )
+
echo "building kodi-x11"
- cd "$srcdir/kodi-build-x11"
- 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 \
+ cmake \
+ ${_cmake_common_args[@]} \
+ -DCORE_PLATFORM_NAME=x11 \
+ -DAPP_RENDER_SYSTEM=gl \
../"xbmc-$pkgver-$_codename"
make
- make preinstall
echo "building kodi-wayland"
- cd "$srcdir/kodi-build-wayland"
- 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" \
+ cmake \
+ ${_cmake_common_args[@]} \
-DCORE_PLATFORM_NAME=wayland \
- -DWAYLAND_RENDER_SYSTEM=gl \
+ -DAPP_RENDER_SYSTEM=gl \
../"xbmc-$pkgver-$_codename"
make
- make preinstall
echo "building kodi-gbm"
- cd "$srcdir/kodi-build-gbm"
- 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" \
+ cmake \
+ ${_cmake_common_args[@]} \
-DCORE_PLATFORM_NAME=gbm \
- -DGBM_RENDER_SYSTEM=gles \
+ -DAPP_RENDER_SYSTEM=gl \
../"xbmc-$pkgver-$_codename"
make
- make preinstall
}
# kodi
# components: kodi
-package_kodi() {
+package_kodi-common() {
pkgdesc="A software media player and entertainment hub for digital media"
depends=(
- 'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodomex'
- 'python2-pillow6' 'python2-simplejson' 'xorg-xdpyinfo'
- 'KODI-BIN'
+ 'bluez-libs' 'curl' 'desktop-file-utils' 'hicolor-icon-theme' 'lcms2'
+ 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs' 'libplist'
+ 'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa' 'python'
+ 'python-pillow' 'python-pycryptodomex' 'python-simplejson' 'shairplay'
+ 'smbclient' 'taglib' 'tinyxml'
)
optdepends=(
'afpfs-ng: Apple shares support'
'bluez: Blutooth support'
- 'python2-pybluez: Bluetooth support'
- 'libplist: AirPlay support'
+ 'python-pybluez: Bluetooth support'
'pulseaudio: PulseAudio support'
- 'shairplay: AirPlay support'
'upower: Display battery level'
)
- provides=('xbmc')
- conflicts=('xbmc')
- replaces=('xbmc')
_components=(
'kodi'
@@ -213,9 +182,7 @@
'kodi-bin'
)
- export PATH="$srcdir/path:$PATH"
-
- cd kodi-build-x11
+ cd kodi-build
# install eventclients
for _cmp in ${_components[@]}; do
DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -223,13 +190,8 @@
-P cmake_install.cmake
done
- # python2 is being used
- cd "$pkgdir"
- grep -lR '#!.*python' * | \
- while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
-
- # remove x11 binaries
- rm "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr}
+ # remove windowing specific binaries
+ rm -f "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr,kodi-wayland,kodi-gbm}
}
# kodi-x11
@@ -237,16 +199,13 @@
package_kodi-x11() {
pkgdesc="x11 kodi binary"
- provides=('KODI-BIN')
- replaces=('kodi-bin')
+ provides=('kodi')
+ replaces=('kodi')
depends=(
- 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
- 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
- 'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
- 'tinyxml' 'kodi'
+ 'kodi-common' 'libva-vdpau-driver' 'libxrandr'
)
- cd kodi-build-x11
+ cd kodi-build
install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11"
install -Dm755 kodi-xrandr "$pkgdir/usr/lib/kodi/kodi-xrandr"
}
@@ -256,15 +215,13 @@
package_kodi-wayland() {
pkgdesc="wayland kodi binary"
- provides=('KODI-BIN')
+ provides=('kodi')
+ replaces=('kodi')
depends=(
- 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
- 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
- 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib' 'tinyxml'
- 'waylandpp' 'kodi'
+ 'kodi-common' 'libxkbcommon' 'waylandpp'
)
- cd kodi-build-wayland
+ cd kodi-build
install -Dm755 kodi-wayland "$pkgdir/usr/lib/kodi/kodi-wayland"
}
@@ -273,25 +230,25 @@
package_kodi-gbm() {
pkgdesc="gbm kodi binary"
- provides=('KODI-BIN')
+ provides=('kodi')
+ replaces=('kodi')
depends=(
- 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
- 'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
- 'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
- 'tinyxml' 'kodi'
+ 'kodi-common' 'libxkbcommon'
)
- cd kodi-build-gbm
+ cd kodi-build
install -Dm755 kodi-gbm "$pkgdir/usr/lib/kodi/kodi-gbm"
}
# kodi-eventclients
-# components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-wiiremote kodi-eventclients-kodi-send
+# components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-kodi-send
package_kodi-eventclients() {
pkgdesc="Kodi Event Clients"
- conflicts=('kodi-eventclients')
- optdepends=('python2: most eventclients are implemented in python2')
+ optdepends=(
+ 'kodi: local machine eventclient use'
+ 'python: most eventclients are implemented in python'
+ )
_components=(
'kodi-eventclients-common'
@@ -299,9 +256,7 @@
'kodi-eventclients-kodi-send'
)
- export PATH="$srcdir/path:$PATH"
-
- cd kodi-build-x11
+ cd kodi-build
# install eventclients
for _cmp in ${_components[@]}; do
DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -308,11 +263,6 @@
-DCMAKE_INSTALL_COMPONENT="$_cmp" \
-P cmake_install.cmake
done
-
- # python2 is being used
- cd "$pkgdir"
- grep -lR '#!.*python' * | \
- while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
}
# kodi-tools-texturepacker
@@ -326,7 +276,7 @@
'kodi-tools-texturepacker'
)
- cd kodi-build-x11
+ cd kodi-build
# install eventclients
for _cmp in ${_components[@]}; do
DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -336,29 +286,18 @@
}
# kodi-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
+# components: kodi-addon-dev kodi-eventclients-dev
package_kodi-dev() {
pkgdesc="Kodi dev files"
- depends=('kodi')
+ depends=('kodi-common')
_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'
)
- export PATH="$srcdir/path:$PATH"
-
- cd kodi-build-x11
+ cd kodi-build
# install eventclients
for _cmp in ${_components[@]}; do
DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -365,9 +304,4 @@
-DCMAKE_INSTALL_COMPONENT="$_cmp" \
-P cmake_install.cmake
done
-
- # python2 is being used
- cd "$pkgdir"
- grep -lR '#!.*python' * | \
- while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
}
More information about the arch-commits
mailing list