diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index a1787c9d41..7b4bfb6efe 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -81,9 +81,6 @@ # Default Skin (Estuary) SKIN_DEFAULT="Estuary" -# Select whether to use default (upstream xbmc/xbmc) repo, or specific vendor repo - KODI_VENDOR="default" - # install extra subtitle Fonts for KODI (yes / no) KODI_EXTRA_FONTS="yes" diff --git a/distributions/LibreELEC/show_config b/distributions/LibreELEC/show_config index c3f6c61dbc..afa3f71aed 100644 --- a/distributions/LibreELEC/show_config +++ b/distributions/LibreELEC/show_config @@ -18,7 +18,6 @@ show_distro_config() { config_message+="\n\n Kodi Software configuration:" config_message+="\n $dashes$dashes" - config_message+="\n - Kodi Vendor:\t\t\t\t $KODI_VENDOR" config_message+="\n - Kodi Blu-ray support:\t\t $KODI_BLURAY_SUPPORT" if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then config_message+="\n - Blu-ray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT" diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 8ae6c8a69a..6e858b7ae6 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,29 +3,15 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" +PKG_VERSION="19.0a1-Matrix" +PKG_SHA256="3c66715448e18f95bc5e8a3075f95e643f3b2c0bae3957f2abb5b567b7e7eceb" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" +PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog" PKG_LONGDESC="A free and open source cross-platform media player." PKG_BUILD_FLAGS="+speed" -PKG_PATCH_DIRS="$KODI_VENDOR" - -case $KODI_VENDOR in - raspberrypi) - PKG_VERSION="newclock5_20200419" - PKG_SHA256="f50ea08a4f7f4dc2083c8470115063eaeb67c9b8682ecc6bfaf42dafcb69fd5c" - PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz" - PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz" - ;; - *) - PKG_VERSION="19.0a1-Matrix" - PKG_SHA256="3c66715448e18f95bc5e8a3075f95e643f3b2c0bae3957f2abb5b567b7e7eceb" - PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" - PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz" - ;; -esac - configure_package() { # Single threaded LTO is very slow so rely on Kodi for parallel LTO support if [ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug; then diff --git a/projects/Amlogic/options b/projects/Amlogic/options index d61cd46be2..797409085e 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -52,9 +52,6 @@ # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" - # Use a vendor specific KODI repo - KODI_VENDOR="amlogic" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" diff --git a/projects/RPi/options b/projects/RPi/options index 53335e6ee9..2d2fa3e9d9 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -87,9 +87,6 @@ # e.g. GRAPHIC_DRIVERS="vc4" GRAPHIC_DRIVERS="vc4" - # Use a vendor specific KODI repo - KODI_VENDOR="default" - # KODI Player implementation to use (default / bcm2835-driver / mesa) KODIPLAYER_DRIVER="mesa" diff --git a/projects/Samsung/options b/projects/Samsung/options index 9acea6ab83..177a08c8ea 100644 --- a/projects/Samsung/options +++ b/projects/Samsung/options @@ -54,9 +54,6 @@ # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" - # Use a vendor specific KODI repo - KODI_VENDOR="samsung" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"