diff options
Diffstat (limited to 'package/kodi')
| -rw-r--r-- | package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 21 | ||||
| -rw-r--r-- | package/kodi/Config.in | 81 | ||||
| -rw-r--r-- | package/kodi/kodi.hash | 2 | ||||
| -rw-r--r-- | package/kodi/kodi.mk | 36 |
4 files changed, 41 insertions, 99 deletions
diff --git a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 641525cafc..2678a7839e 100644 --- a/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -17,14 +17,17 @@ diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmak index 76626ec..ffb8e1d 100644 --- a/project/cmake/kodi-config.cmake.in +++ b/project/cmake/kodi-config.cmake.in -@@ -4,12 +4,12 @@ SET(APP_NAME_UC @APP_NAME_UC@) - SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@) - SET(APP_VERSION_MINOR @APP_VERSION_MINOR@) - SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) --SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) --SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -+SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) -+SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) +@@ -7,15 +7,15 @@ + SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) + ENDIF() + IF(NOT @APP_NAME_UC@_INCLUDE_DIR) +- SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) ++ SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) + ENDIF() + IF(NOT @APP_NAME_UC@_LIB_DIR) +- SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) ++ SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) + ENDIF() IF(NOT WIN32) SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") ENDIF() @@ -32,7 +35,7 @@ index 76626ec..ffb8e1d 100644 +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON) - include(addon-helpers) + if(NOT CORE_SYSTEM_NAME) -- 2.5.0 diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 7d28882026..13955e4d47 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS -comment "kodi needs a toolchain w/ C++, threads, wchar, dynamic library" +comment "kodi needs a uClibc or (e)glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS + || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU config BR2_PACKAGE_KODI_EGL_GLES @@ -31,6 +33,15 @@ comment "kodi requires an OpenGL ES and EGL backend" menuconfig BR2_PACKAGE_KODI bool "kodi" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL + depends on BR2_USE_MMU # python + depends on BR2_USE_WCHAR + depends on !BR2_STATIC_LIBS # python + depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS select BR2_NEEDS_HOST_JAVA select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_THREAD @@ -42,11 +53,14 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JASPER select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO + select BR2_PACKAGE_LIBCROSSGUID select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBDCADEC select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL @@ -81,19 +95,10 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_TIFF select BR2_PACKAGE_TINYXML select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_LIBXMU if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL - depends on BR2_USE_MMU # python - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # python - depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS help Kodi is an award-winning free and open source (GPL) software media player and entertainment hub for digital media. @@ -112,7 +117,6 @@ config BR2_PACKAGE_KODI_ALSA_LIB config BR2_PACKAGE_KODI_AVAHI bool "avahi" - depends on !BR2_STATIC_LIBS # avahi select BR2_PACKAGE_AVAHI select BR2_PACKAGE_AVAHI_DAEMON help @@ -128,45 +132,20 @@ config BR2_PACKAGE_KODI_DBUS config BR2_PACKAGE_KODI_LIBBLURAY bool "blu-ray" select BR2_PACKAGE_LIBBLURAY - depends on !BR2_STATIC_LIBS help Enable Blu-ray input support. Select this if you want to play back Blu-ray content. -comment "libbluray support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_KODI_GOOM - bool "goom screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "goom needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - -config BR2_PACKAGE_KODI_RSXS - bool "rsxs screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "rsxs needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" - depends on !BR2_STATIC_LIBS # libcec depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # libcec select BR2_PACKAGE_LIBCEC help Enable CEC (Consumer Electronics Control) support. Select this if you want Kodi to support HDMI CEC. -comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 +comment "hdmi cec support needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_KODI_LIRC bool "lirc" @@ -199,21 +178,18 @@ config BR2_PACKAGE_KODI_RTMPDUMP config BR2_PACKAGE_KODI_LIBSHAIRPLAY bool "shairport" - depends on !BR2_STATIC_LIBS # libshairplay -> avahi select BR2_PACKAGE_LIBSHAIRPLAY help Enable Shairport support. Select this if you want to stream content from an Apple device. -comment "shairport support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -comment "samba support needs an (e)glibc toolchain w/ RPC" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_NATIVE_RPC +comment "samba support needs a (e)glibc or uClibc toolchain w/ RPC" + depends on (!BR2_TOOLCHAIN_USES_GLIBC && \ + !BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC config BR2_PACKAGE_KODI_LIBSMBCLIENT bool "samba" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_SAMBA4 @@ -243,20 +219,9 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" select BR2_PACKAGE_LIBVA - depends on !BR2_STATIC_LIBS help Enable libva support. -comment "libva support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_KODI_WAVPACK - bool "wavpack" - select BR2_PACKAGE_WAVPACK - help - Enable WAV input support. - Select this if you want to play back WV files. - config BR2_PACKAGE_KODI_OPTICALDRIVE bool @@ -304,10 +269,12 @@ menu "Screensavers" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-pingpong/Config.in" source "package/kodi-screensaver-pyro/Config.in" + source "package/kodi-screensaver-rsxs/Config.in" source "package/kodi-screensaver-stars/Config.in" endmenu menu "Visualisations" + source "package/kodi-visualisation-goom/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" source "package/kodi-visualisation-waveforhue/Config.in" diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 14af9afd16..229446b1ad 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 kodi-15.2-Isengard.tar.gz +sha256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 kodi-16.0-Jarvis.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index bf3aa7a064..94a8cd8a62 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VERSION = 15.2-Isengard +KODI_VERSION = 16.0-Jarvis KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPLv2 KODI_LICENSE_FILES = LICENSE.GPL @@ -12,8 +12,8 @@ KODI_LICENSE_FILES = LICENSE.GPL KODI_INSTALL_STAGING = YES KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-zip host-giflib \ host-libjpeg host-lzo host-nasm host-libpng host-swig -KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype jasper jpeg \ - libass libcdio libcurl libfribidi libgcrypt libmpeg2 \ +KODI_DEPENDENCIES += boost bzip2 expat ffmpeg fontconfig freetype giflib jasper jpeg \ + libass libcdio libcrossguid libcurl libdcadec libfribidi libgcrypt libmpeg2 \ libogg libplist libpng libsamplerate libsquish libvorbis libxml2 \ libxslt lzo ncurses openssl pcre python readline sqlite taglib tiff \ tinyxml yajl zlib @@ -32,7 +32,6 @@ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ --disable-joystick \ --disable-openmax \ - --disable-projectm \ --disable-pulse \ --disable-vdpau \ --disable-vtbdecoder \ @@ -88,24 +87,8 @@ ifeq ($(BR2_PACKAGE_KODI_GL),y) KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \ xlib_libXmu xlib_libXrandr xlib_libXt libdrm KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles -ifeq ($(BR2_PACKAGE_KODI_RSXS),y) -# fix rsxs compile -# gcc5: http://trac.kodi.tv/ticket/16006#comment:6 -# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4 -KODI_CONF_ENV += \ - ac_cv_type__Bool=yes \ - jm_cv_func_gettimeofday_clobber=no \ - mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \ - mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \ - mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \ - mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \ - mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`" -KODI_CONF_OPTS += --enable-rsxs else -KODI_CONF_OPTS += --disable-rsxs -endif -else -KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11 +KODI_CONF_OPTS += --disable-gl --disable-x11 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) KODI_DEPENDENCIES += libegl libgles KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`" @@ -116,12 +99,6 @@ KODI_CONF_OPTS += --disable-gles endif endif -ifeq ($(BR2_PACKAGE_KODI_GOOM),y) -KODI_CONF_OPTS += --enable-goom -else -KODI_CONF_OPTS += --disable-goom -endif - ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y) KODI_DEPENDENCIES += libusb-compat KODI_CONF_OPTS += --enable-libusb @@ -198,10 +175,6 @@ else KODI_CONF_OPTS += --disable-lirc endif -ifeq ($(BR2_PACKAGE_KODI_WAVPACK),y) -KODI_DEPENDENCIES += wavpack -endif - ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y) KODI_DEPENDENCIES += libtheora endif @@ -229,7 +202,6 @@ endef KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP define KODI_CLEAN_UNUSED_ADDONS - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes |
