diff options
| -rw-r--r-- | .SRCINFO | 122 | ||||
| -rw-r--r-- | 0001-allow-separate-windowing-binaries-being-launched-fro.patch | 67 | ||||
| -rw-r--r-- | PKGBUILD | 152 |
3 files changed, 164 insertions, 177 deletions
@@ -1,6 +1,6 @@ pkgbase = kodi-devel pkgver = 19.0 - pkgrel = 1 + pkgrel = 2 url = https://kodi.tv arch = x86_64 license = GPL2 @@ -28,7 +28,7 @@ pkgbase = kodi-devel makedepends = libplist makedepends = libpulse makedepends = libva - makedepends = libvdpau + makedepends = libva-vdpau-driver makedepends = libxrandr makedepends = libxslt makedepends = lirc @@ -48,9 +48,9 @@ pkgbase = kodi-devel makedepends = giflib makedepends = rapidjson makedepends = ghostscript - makedepends = git makedepends = meson makedepends = gtest + makedepends = graphviz makedepends = wayland-protocols makedepends = waylandpp makedepends = libxkbcommon @@ -60,10 +60,10 @@ pkgbase = kodi-devel noextract = libdvdread-6.0.0-Leia-Alpha-3.tar.gz noextract = ffmpeg-4.3.1-Matrix-Beta1.tar.gz noextract = fmt-6.1.2.tar.gz + noextract = spdlog-1.5.0.tar.gz noextract = crossguid-8f399e8bd4.tar.gz noextract = fstrcmp-0.7.D001.tar.gz noextract = flatbuffers-1.11.0.tar.gz - noextract = spdlog-1.5.0.tar.gz source = kodi-19.0-Matrix.tar.gz::https://github.com/xbmc/xbmc/archive/19.0-Matrix.tar.gz source = libdvdcss-1.4.2-Leia-Beta-5.tar.gz::https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz source = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz @@ -75,6 +75,7 @@ pkgbase = kodi-devel source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.0.tar.gz source = cheat-sse-build.patch + source = 0001-allow-separate-windowing-binaries-being-launched-fro.patch b2sums = 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2 b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 @@ -86,34 +87,14 @@ pkgbase = kodi-devel b2sums = 69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96 b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0 + b2sums = 9745854bab7e7ddf1cb816e536f303513d8792b5431c62d042894e6d2e702939bc1f9a965e7c59207cca832a297cc3c187c9435fc6e3029a3ddc0b13d11c7451 -pkgname = kodi-devel +pkgname = kodi-devel-common pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media - depends = desktop-file-utils - depends = hicolor-icon-theme - depends = mesa - depends = python-pycryptodomex - depends = python-pillow - depends = python-simplejson - depends = xorg-xdpyinfo - depends = shairplay - depends = KODI-DEVEL-BIN - depends = libplist - optdepends = afpfs-ng: Apple shares support - optdepends = bluez: Blutooth support - optdepends = python-pybluez: Bluetooth support - optdepends = pulseaudio: PulseAudio support - optdepends = upower: Display battery level - provides = xbmc - provides = kodi=19.0 - conflicts = xbmc - conflicts = kodi - replaces = xbmc - -pkgname = kodi-devel-x11 - pkgdesc = x11 kodi binary depends = bluez-libs depends = curl + depends = desktop-file-utils + depends = hicolor-icon-theme depends = lcms2 depends = libass depends = libbluray @@ -121,83 +102,58 @@ pkgname = kodi-devel-x11 depends = libcec depends = libmicrohttpd depends = libnfs + depends = libplist depends = libpulse depends = libva - depends = libvdpau - depends = libxrandr depends = libxslt depends = lirc depends = mariadb-libs + depends = mesa depends = python + depends = python-pillow + depends = python-pycryptodomex + depends = python-simplejson + depends = shairplay depends = smbclient depends = taglib - depends = libplist depends = tinyxml - depends = dav1d - depends = kodi-devel - provides = KODI-DEVEL-BIN - provides = kodi-x11=19.0 - conflicts = kodi-x11 - replaces = kodi-bin + optdepends = afpfs-ng: Apple shares support + optdepends = bluez: Blutooth support + optdepends = python-pybluez: Bluetooth support + optdepends = pulseaudio: PulseAudio support + optdepends = upower: Display battery level + provides = kodi-common=19.0 + conflicts = kodi-common + replaces = kodi-common + +pkgname = kodi-devel-x11 + pkgdesc = x11 kodi binary + depends = kodi-devel-common + depends = libva-vdpau-driver + depends = libxrandr + provides = kodi=19.0 + replaces = kodi pkgname = kodi-devel-wayland pkgdesc = wayland kodi binary - depends = bluez-libs - depends = curl - depends = lcms2 - depends = libass - depends = libbluray - depends = libcdio - depends = libcec - depends = libmicrohttpd - depends = libnfs - depends = libpulse - depends = libva + depends = kodi-devel-common depends = libxkbcommon - depends = libxslt - depends = lirc - depends = mariadb-libs - depends = python - depends = smbclient - depends = taglib - depends = tinyxml depends = waylandpp - depends = kodi-devel - provides = KODI-DEVEL-BIN - provides = kodi-wayland=19.0 + provides = kodi=19.0 conflicts = kodi-wayland + replaces = kodi pkgname = kodi-devel-gbm pkgdesc = gbm kodi binary - depends = bluez-libs - depends = curl - depends = lcms2 - depends = libass - depends = libbluray - depends = libcdio - depends = libcec - depends = libinput - depends = libmicrohttpd - depends = libnfs - depends = libpulse - depends = libva + depends = kodi-devel-common depends = libxkbcommon - depends = libxslt - depends = lirc - depends = mariadb-libs - depends = python - depends = smbclient - depends = taglib - depends = libplist - depends = tinyxml - depends = dav1d - depends = kodi-devel - provides = KODI-DEVEL-BIN - provides = kodi-gbm=19.0 + provides = kodi=19.0 conflicts = kodi-gbm + replaces = kodi pkgname = kodi-devel-eventclients pkgdesc = Kodi Event Clients + optdepends = kodi: local machine eventclient use optdepends = python: most eventclients are implemented in python provides = kodi-eventclients=19.0 conflicts = kodi-eventclients @@ -213,7 +169,7 @@ pkgname = kodi-devel-tools-texturepacker pkgname = kodi-devel-dev pkgdesc = Kodi dev files - depends = kodi-devel + depends = kodi-devel-common provides = kodi-dev=19.0 conflicts = kodi-dev diff --git a/0001-allow-separate-windowing-binaries-being-launched-fro.patch b/0001-allow-separate-windowing-binaries-being-launched-fro.patch new file mode 100644 index 000000000000..df983480594d --- /dev/null +++ b/0001-allow-separate-windowing-binaries-being-launched-fro.patch @@ -0,0 +1,67 @@ +From 5b75228b51c3422644468050debbc495f5195585 Mon Sep 17 00:00:00 2001 +From: BlackEagle <ike.devolder@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@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 + @@ -1,6 +1,7 @@ # vim:set ts=2 sw=2 et: -# Maintainer: Marcin (CTRL) Wieczorek <marcin@marcin.co> # Maintainer graysky <graysky AT archlinux DOT us> +# Maintainer: Marcin (CTRL) Wieczorek <marcin@marcin.co> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: DonVla <donvla@users.sourceforge.net> # Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de> @@ -19,12 +20,12 @@ pkgbase=kodi-devel pkgname=( - "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm" + "$pkgbase-common" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev" ) pkgver=19.0 #_major=18.7.1 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://kodi.tv" license=('GPL2') @@ -33,10 +34,10 @@ makedepends=( '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' - 'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson' - 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig' - 'upower' 'giflib' 'rapidjson' 'ghostscript' 'git' 'meson' 'gtest' + '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' # gbm @@ -81,6 +82,7 @@ source=( "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz" cheat-sse-build.patch + 0001-allow-separate-windowing-binaries-being-launched-fro.patch ) noextract=( "libdvdcss-$_libdvdcss_version.tar.gz" @@ -88,10 +90,10 @@ noextract=( "libdvdread-$_libdvdread_version.tar.gz" "ffmpeg-$_ffmpeg_version.tar.gz" "fmt-$_fmt_version.tar.gz" + "spdlog-$_spdlog_version.tar.gz" "crossguid-$_crossguid_version.tar.gz" "fstrcmp-$_fstrcmp_version.tar.gz" "flatbuffers-$_flatbuffers_version.tar.gz" - "spdlog-$_spdlog_version.tar.gz" ) b2sums=('543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2' '283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da' @@ -103,17 +105,15 @@ b2sums=('543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb 'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e' '69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96' 'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28' - '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0') + '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0' + '9745854bab7e7ddf1cb816e536f303513d8792b5431c62d042894e6d2e702939bc1f9a965e7c59207cca832a297cc3c187c9435fc6e3029a3ddc0b13d11c7451') prepare() { - [[ -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 + [[ -d kodi-build ]] && rm -rf kodi-build + mkdir "$srcdir/kodi-build" cd "xbmc-$_tag" [[ "$_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" # needed for `git apply` ... if you know how to avoid this let me know #git init @@ -136,7 +136,8 @@ prepare() { } build() { - export PATH="$srcdir/path:$PATH" + cd kodi-build + ### Optionally uncomment and setup to your liking # export CFLAGS+=" -march=native" # export CXXFLAGS="${CFLAGS}" @@ -145,68 +146,51 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DUSE_LTO=$(nproc) + -DAPP_RENDER_SYSTEM=gl + -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_INTERNAL_SPDLOG=ON -DENABLE_MYSQLCLIENT=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" + -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" - -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" ) echo "building kodi-x11" - cd "$srcdir/kodi-build-x11" - _args+=( - -DCORE_PLATFORM_NAME=x11 - -DAPP_RENDER_SYSTEM=gl - ) - - cmake "${_args[@]}" ../"xbmc-$_tag" + cmake "${_args[@]}" -DCORE_PLATFORM_NAME=x11 ../"xbmc-$_tag" make - make preinstall echo "building kodi-wayland" - cd "$srcdir/kodi-build-wayland" - _args+=( - -DCORE_PLATFORM_NAME=wayland - -DAPP_RENDER_SYSTEM=gl - ) - - cmake "${_args[@]}" ../"xbmc-$_tag" + cmake "${_args[@]}" -DCORE_PLATFORM_NAME=wayland ../"xbmc-$_tag" make - make preinstall echo "building kodi-gbm" - cd "$srcdir/kodi-build-gbm" - _args+=( - -DCORE_PLATFORM_NAME=gbm - -DAPP_RENDER_SYSTEM=gl - ) - - cmake "${_args[@]}" ../"xbmc-$_tag" + cmake "${_args[@]}" -DCORE_PLATFORM_NAME=gbm ../"xbmc-$_tag" make - make preinstall } # kodi # components: kodi -package_kodi-devel() { +package_kodi-devel-common() { pkgdesc="Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media" depends=( - 'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex' - 'python-pillow' 'python-simplejson' 'xorg-xdpyinfo' 'shairplay' - 'KODI-DEVEL-BIN' 'libplist' + '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' @@ -215,18 +199,16 @@ package_kodi-devel() { 'pulseaudio: PulseAudio support' 'upower: Display battery level' ) - provides=('xbmc' "kodi=${pkgver}") - conflicts=('xbmc' 'kodi') - replaces=('xbmc') + provides=("kodi-common=${pkgver}") + conflicts=('kodi-common') + replaces=('kodi-common') _components=( 'kodi' '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 \ @@ -234,8 +216,8 @@ package_kodi-devel() { -P cmake_install.cmake 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 @@ -243,17 +225,13 @@ package_kodi-devel() { package_kodi-devel-x11() { pkgdesc="x11 kodi binary" - provides=('KODI-DEVEL-BIN' "kodi-x11=${pkgver}") - conflicts=('kodi-x11') - replaces=('kodi-bin') + provides=("kodi=${pkgver}") + replaces=('kodi') depends=( - 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' - 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr' - 'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'libplist' - 'tinyxml' 'dav1d' "$pkgbase" + 'kodi-devel-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" } @@ -263,16 +241,14 @@ package_kodi-devel-x11() { package_kodi-devel-wayland() { pkgdesc="wayland kodi binary" - provides=('KODI-DEVEL-BIN' "kodi-wayland=${pkgver}") + provides=("kodi=${pkgver}") conflicts=('kodi-wayland') + replaces=('kodi') depends=( - 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' - 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt' - 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'tinyxml' - 'waylandpp' "$pkgbase" + 'kodi-devel-common' 'libxkbcommon' 'waylandpp' ) - cd kodi-build-wayland + cd kodi-build install -Dm755 kodi-wayland "$pkgdir/usr/lib/kodi/kodi-wayland" } @@ -281,27 +257,28 @@ package_kodi-devel-wayland() { package_kodi-devel-gbm() { pkgdesc="gbm kodi binary" - provides=('KODI-DEVEL-BIN' "kodi-gbm=${pkgver}") + provides=("kodi=${pkgver}") conflicts=('kodi-gbm') + replaces=('kodi') depends=( - 'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' - 'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' - 'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'libplist' - 'tinyxml' 'dav1d' "$pkgbase" + 'kodi-devel-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-devel-eventclients() { pkgdesc="Kodi Event Clients" provides=("kodi-eventclients=${pkgver}") conflicts=('kodi-eventclients') - optdepends=('python: most eventclients are implemented in python') + optdepends=( + 'kodi: local machine eventclient use' + 'python: most eventclients are implemented in python' + ) _components=( 'kodi-eventclients-common' @@ -309,9 +286,7 @@ package_kodi-devel-eventclients() { '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 \ @@ -333,7 +308,7 @@ package_kodi-devel-tools-texturepacker() { 'kodi-tools-texturepacker' ) - cd kodi-build-x11 + cd kodi-build # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ @@ -343,31 +318,20 @@ package_kodi-devel-tools-texturepacker() { } # 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-devel-dev() { pkgdesc="Kodi dev files" - depends=("$pkgbase") + depends=('kodi-devel-common') provides=("kodi-dev=${pkgver}") conflicts=('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' ) - export PATH="$srcdir/path:$PATH" - - cd kodi-build-x11 + cd kodi-build # install eventclients for _cmp in ${_components[@]}; do DESTDIR="$pkgdir" /usr/bin/cmake \ |