Date: Tuesday, July 13, 2021 @ 17:15:24 Author: idevolder Revision: 976798
upgpkg: kodi 19.1-4 Modified: kodi/trunk/PKGBUILD ----------+ PKGBUILD | 117 +++++++++++++++++++------------------------------------------ 1 file changed, 38 insertions(+), 79 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-13 17:13:48 UTC (rev 976797) +++ PKGBUILD 2021-07-13 17:15:24 UTC (rev 976798) @@ -18,12 +18,9 @@ # for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD pkgbase=kodi -pkgname=( - 'kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm' - 'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev' -) +pkgname=('kodi' 'kodi-eventclients' 'kodi-tools-texturepacker' 'kodi-dev') pkgver=19.1 -pkgrel=1 +pkgrel=4 arch=('x86_64') url="https://kodi.tv" license=('GPL2') @@ -58,7 +55,7 @@ _libudfread_version="1.1.0" source=( - "$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/refs/tags/v$pkgver.tar.gz" + "$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" @@ -70,7 +67,7 @@ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz" "$pkgbase-libudfread-$_libudfread_version.tar.gz::http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz" 'cheat-sse-build.patch' - '0001-allow-separate-windowing-binaries-being-launched-fro.patch' + 'https://github.com/xbmc/xbmc/pull/19885.patch' ) noextract=( "$pkgbase-libdvdcss-$_libdvdcss_version.tar.gz" @@ -84,7 +81,7 @@ "$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz" "$pkgbase-libudfread-$_libudfread_version.tar.gz" ) -sha512sums=('725cbc270259ef5d3b79f9bc271b789dc8ef6616a6d4038e0cd449755ca4ed25198ad6e854b304aedc1fb911ecb98a0aad1b3e469857f8aed54fc4634193eb75' +sha512sums=('e9725a61828fa59502fdbb42d689c4948af792522049dadae136b5e90f53ee6fff570e6adb818dcce2ce54e957b0a31796b59aefd87fc55356531e2379ac6289' '5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e' '11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72' 'b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7' @@ -96,17 +93,17 @@ '8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063' '340a03fe90d26a8a5c78e1e4f558a0b448a14332a661494f44af7de3e6c98cd219125e19f69d2a611ecb4870648a5d5b55d794e665eb8ec4192c0b499a0701ed' '91409cc66959a30f2d0dbf8d28e47dd2acbac560efb8961550c5928ae8546a32d1f156f8e55f073f953b114230117ec96c224212d28c1c1d752540c836c9ae1a' - '372eb5ef438458a3fd2d38c20ad9385e208d670bdc8e5ffb62c5bde2e3e93a3548704118aced33e6a956e12ae70a42316afafa482cf16e171dd0f07330de3509') + 'f338fef7c34073cd9f57ddc3038c00dc56ba0dc4f2c8b2cb78819a6667fb8d75aa9b99f78df41daff88716e1256b37a6fbc1cc1028cced60119afba57b2c0df9') prepare() { [[ -d kodi-build ]] && rm -rf kodi-build mkdir "$srcdir/kodi-build" - cd "xbmc-$pkgver" + cd "xbmc-$pkgver-$_codename" [[ "$_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" + patch -p1 -i "$srcdir/19885.patch" } build() { @@ -113,11 +110,32 @@ cd "$srcdir/kodi-build" _cmake_common_args=( + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DUSE_LTO=ON -DENABLE_LDGOLD=OFF + -DENABLE_AIRTUNES=ON + -DENABLE_ALSA=ON + -DENABLE_AVAHI=ON + -DENABLE_BLURAY=ON + -DENABLE_CEC=ON + -DENABLE_DBUS=ON + -DENABLE_DVDCSS=ON + -DENABLE_EGL=ON -DENABLE_EVENTCLIENTS=ON + -DENABLE_MICROHTTPD=ON + -DENABLE_MYSQLCLIENT=ON + -DENABLE_NFS=ON + -DENABLE_OPTICAL=ON + -DENABLE_PULSEAUDIO=ON + -DENABLE_SMBCLIENT=ON + -DENABLE_UDEV=ON + -DENABLE_UPNP=ON + -DENABLE_VAAPI=ON + -DENABLE_VDPAU=ON + -DENABLE_XSLT=ON + -DENABLE_LIRCCLIENT=ON -DENABLE_INTERNAL_FFMPEG=ON -DENABLE_INTERNAL_FMT=ON -DENABLE_INTERNAL_SPDLOG=ON @@ -125,7 +143,6 @@ -DENABLE_INTERNAL_FSTRCMP=ON -DENABLE_INTERNAL_FLATBUFFERS=ON -DENABLE_INTERNAL_UDFREAD=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" @@ -137,41 +154,27 @@ -DFLATBUFFERS_URL="$srcdir/$pkgbase-flatbuffers-$_flatbuffers_version.tar.gz" -DUDFREAD_URL="$srcdir/$pkgbase-libudfread-$_libudfread_version.tar.gz" -DAPP_RENDER_SYSTEM=gl + -DCORE_PLATFORM_NAME="x11 wayland gbm" ) - echo "building kodi-wayland" + echo "building kodi" cmake \ ${_cmake_common_args[@]} \ - -DCORE_PLATFORM_NAME=wayland \ - ../"xbmc-$pkgver" + ../"xbmc-$pkgver-$_codename" make - - echo "building kodi-gbm" - cmake \ - ${_cmake_common_args[@]} \ - -DCORE_PLATFORM_NAME=gbm \ - ../"xbmc-$pkgver" - make - - # build x11 version last that will make it fallback in the launcher script - echo "building kodi-x11" - cmake \ - ${_cmake_common_args[@]} \ - -DCORE_PLATFORM_NAME=x11 \ - ../"xbmc-$pkgver" - make } # kodi # components: kodi -package_kodi-common() { +package_kodi() { pkgdesc="A software media player and entertainment hub for digital media" depends=( 'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs' - 'libplist' 'libpulse' 'libva' 'libxslt' 'lirc' 'mariadb-libs' 'mesa' - 'python-pillow' 'python-pycryptodomex' 'python-simplejson' + 'libplist' 'libpulse' 'libva' 'libvdpau' 'libxslt' 'lirc' 'mariadb-libs' + 'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson' 'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml' + 'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput' ) optdepends=( 'afpfs-ng: Apple shares support' @@ -180,6 +183,8 @@ 'pulseaudio: PulseAudio support' 'upower: Display battery level' ) + provides=('kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm') + replaces=('kodi-common' 'kodi-x11' 'kodi-wayland' 'kodi-gbm') _components=( 'kodi' @@ -192,54 +197,8 @@ -DCMAKE_INSTALL_COMPONENT="$_cmp" \ -P cmake_install.cmake done - - # remove windowing specific binaries - rm -f "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr,kodi-wayland,kodi-gbm} } -# kodi-x11 -# components: kodi-bin -package_kodi-x11() { - pkgdesc="x11 kodi binary" - provides=('kodi') - replaces=('kodi') - depends=( - 'kodi-common' 'libxrandr' - ) - - cd kodi-build - install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11" - install -Dm755 kodi-xrandr "$pkgdir/usr/lib/kodi/kodi-xrandr" -} - -# kodi-wayland -# components: kodi-bin -package_kodi-wayland() { - pkgdesc="wayland kodi binary" - provides=('kodi') - replaces=('kodi') - depends=( - 'kodi-common' 'libxkbcommon' 'waylandpp' - ) - - cd kodi-build - install -Dm755 kodi-wayland "$pkgdir/usr/lib/kodi/kodi-wayland" -} - -# kodi-gbm -# components: kodi-bin -package_kodi-gbm() { - pkgdesc="gbm kodi binary" - provides=('kodi') - replaces=('kodi') - depends=( - 'kodi-common' 'libxkbcommon' 'libinput' - ) - - cd kodi-build - install -Dm755 kodi-gbm "$pkgdir/usr/lib/kodi/kodi-gbm" -} - # kodi-eventclients # components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-kodi-send package_kodi-eventclients() {