[Buildroot] [git commit branch/next] package/kodi: bump version to 15.0 Isengard
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Thu Jul 30 07:29:23 UTC 2015
commit: http://git.buildroot.net/buildroot/commit/?id=cd18114d650b77c1d22c4560b0364e57c95fa4e6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
- added libsquish as new dependency
https://github.com/xbmc/xbmc/commit/f73653d62b09db8cab7662ae7c4b2dab596b4ab0#diff-3b3a6ec97232deb43dc14319a73872c1R2207
- updated build procedure for host version of texturepacker
- removed SDL dependencies
http://kodi.wiki/view/Kodi_v15_%28Isengard%29_changelog#Linux_Specific
"Removed dependencies of SDL (Simple DirectMedia Layer) for everything
but hardware abstraction for input devices"
- added mips support:
https://github.com/xbmc/xbmc/commit/5d1746ad5b2272ba5f906ad9a49a87b650bda14a
[Thomas:
- don't do a manual fixup of kodi-config.cmake, and instead patch it
to use CMAKE_FIND_ROOT_PATH. This will also avoid having to pass
-DCMAKE_MODULE_PATH to all Kodi add-ons .mk files.]
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
package/kodi/0001-Fixup-include-path.patch | 48 --------------
package/kodi/0002-texturepacker.patch | 16 +++++
...0003-ALSA-fix-device-change-event-support.patch | 67 ++++++++++++++++++++
....cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 38 +++++++++++
package/kodi/Config.in | 10 +---
package/kodi/kodi.mk | 31 +++++-----
6 files changed, 138 insertions(+), 72 deletions(-)
diff --git a/package/kodi/0001-Fixup-include-path.patch b/package/kodi/0001-Fixup-include-path.patch
index be99bd6..9298981 100644
--- a/package/kodi/0001-Fixup-include-path.patch
+++ b/package/kodi/0001-Fixup-include-path.patch
@@ -14,34 +14,6 @@ Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian at gmail.com>
lib/timidity/configure.in | 6 +++---
4 files changed, 6 insertions(+), 12 deletions(-)
-diff --git a/lib/enca/configure b/lib/enca/configure
-index c839a51..7af5a09 100644
---- a/lib/enca/configure
-+++ b/lib/enca/configure
-@@ -12011,9 +12011,6 @@ fi
- if test "$prefix" = "NONE"; then
- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
--else
-- LDFLAGS="$LDFLAGS -L$prefix/lib"
-- CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
-
-
-diff --git a/lib/enca/configure.ac b/lib/enca/configure.ac
-index 41434df..47d5367 100644
---- a/lib/enca/configure.ac
-+++ b/lib/enca/configure.ac
-@@ -100,9 +100,6 @@ dnl Dirty path hack. Helps some people with badly set up search paths.
- if test "$prefix" = "NONE"; then
- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib"
- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
--else
-- LDFLAGS="$LDFLAGS -L$prefix/lib"
-- CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
-
- dnl Checks for libraries.
diff --git a/lib/libdvd/libdvdread/misc/dvdread-config.sh b/lib/libdvd/libdvdread/misc/dvdread-config.sh
index e170c7e..25ee893 100644
--- a/lib/libdvd/libdvdread/misc/dvdread-config.sh
@@ -59,23 +31,3 @@ index e170c7e..25ee893 100644
-fi
+ echo $dvdreadlib
+fi
-diff --git a/lib/timidity/configure.in b/lib/timidity/configure.in
-index 9f2835b..733470a 100644
---- a/lib/timidity/configure.in
-+++ b/lib/timidity/configure.in
-@@ -100,9 +100,9 @@ done
-
- # add $prefix if specified.
- if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then
-- LDFLAGS="-L$prefix/lib $LDFLAGS"
-- SHLDFLAGS="-L$prefix/lib $SHLDFLAGS"
-- CPPFLAGS="-I$prefix/include $CPPFLAGS"
-+ LDFLAGS="$LDFLAGS"
-+ SHLDFLAGS="$SHLDFLAGS"
-+ CPPFLAGS="$CPPFLAGS"
- fi
-
- dnl add --with-includes, --with-libraries
---
-1.8.5.2
-
diff --git a/package/kodi/0002-texturepacker.patch b/package/kodi/0002-texturepacker.patch
new file mode 100644
index 0000000..8830b4c
--- /dev/null
+++ b/package/kodi/0002-texturepacker.patch
@@ -0,0 +1,16 @@
+Fix host compile
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile
+--- xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile 2015-01-25 09:00:48.000000000 +0100
++++ xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile 2015-01-25 13:03:23.606140953 +0100
+@@ -36,7 +36,7 @@
+ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ cd $(PLATFORM); cp -a $(SOURCE)/* .
+ cd $(PLATFORM); ./autogen.sh
+- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+
+
+ $(APP): $(PLATFORM)
diff --git a/package/kodi/0003-ALSA-fix-device-change-event-support.patch b/package/kodi/0003-ALSA-fix-device-change-event-support.patch
new file mode 100644
index 0000000..b5f37b9
--- /dev/null
+++ b/package/kodi/0003-ALSA-fix-device-change-event-support.patch
@@ -0,0 +1,67 @@
+Patch sent upstream:
+
+https://github.com/xbmc/xbmc/pull/7551
+
+
+From a6d6a1a36ff2dff2586fbad2a068e7df14b55fdc Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls at t-online.de>
+Date: Sun, 19 Jul 2015 14:12:03 +0200
+Subject: [PATCH 1/1] ALSA: fix device change event support
+
+Current uClibc version 0.9.33.2 does not support eventfd_read/write.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+---
+ configure.ac | 5 ++++-
+ xbmc/linux/FDEventMonitor.cpp | 12 ++++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d321f7d..4c6c750 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -911,7 +911,7 @@ AC_FUNC_STRFTIME
+ AC_FUNC_STRTOD
+ AC_FUNC_UTIME_NULL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r])
++AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r eventfd_read eventfd_write])
+
+ # Check for various sizes
+ AC_CHECK_SIZEOF([int])
+@@ -2064,6 +2064,9 @@ fi
+ if test "$use_alsa" = "yes"; then
+ USE_ALSA=1
+ AC_DEFINE([USE_ALSA],[1],["Define to 1 if alsa is installed"])
++ if test "$ac_cv_func_eventfd_read" = "yes" -a "$ac_cv_func_eventfd_write" = "yes"; then
++ AC_DEFINE([HAVE_EVENTFD],[1],["Define to 1 if eventfd is installed"])
++ fi
+ final_message="$final_message\n ALSA:\t\tYes"
+ else
+ USE_ALSA=0
+diff --git a/xbmc/linux/FDEventMonitor.cpp b/xbmc/linux/FDEventMonitor.cpp
+index 4a41477..84efeb9 100644
+--- a/xbmc/linux/FDEventMonitor.cpp
++++ b/xbmc/linux/FDEventMonitor.cpp
+@@ -28,6 +28,18 @@
+
+ #include "FDEventMonitor.h"
+
++#ifndef HAVE_EVENTFD
++static int eventfd_read(int __fd, eventfd_t *__value)
++{
++ return read(__fd, __value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
++}
++
++static int eventfd_write(int __fd, eventfd_t __value)
++{
++ return write(__fd, &__value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
++}
++#endif
++
+ CFDEventMonitor::CFDEventMonitor() :
+ CThread("FDEventMonitor"),
+ m_nextID(0),
+--
+1.7.10.4
+
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
new file mode 100644
index 0000000..641525c
--- /dev/null
+++ b/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
@@ -0,0 +1,38 @@
+From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+Date: Wed, 29 Jul 2015 23:13:33 +0200
+Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
+ cross-compilation
+
+When cross-compiling, the location at build time of the libraries is
+not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
+is here to handle this difference, so use it in kodi-config.cmake.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+---
+ project/cmake/kodi-config.cmake.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
+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 at _PREFIX @APP_PREFIX@)
+-SET(@APP_NAME_UC at _INCLUDE_DIR @APP_INCLUDE_DIR@)
+-SET(@APP_NAME_UC at _LIB_DIR @APP_LIB_DIR@)
++SET(@APP_NAME_UC at _INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
++SET(@APP_NAME_UC at _LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
+ IF(NOT WIN32)
+ SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
+ ENDIF()
+-LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@)
++LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
+ ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
+
+ include(addon-helpers)
+--
+2.5.0
+
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index ea4b449..e8c9244 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_KODI_ARCH_SUPPORTS
bool
- default y if (BR2_arm || BR2_i386 || BR2_x86_64) && BR2_PACKAGE_BOOST_ARCH_SUPPORTS
-
+ 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"
depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
@@ -52,14 +51,12 @@ menuconfig BR2_PACKAGE_KODI
select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL
select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL
select BR2_PACKAGE_LIBGCRYPT
- select BR2_PACKAGE_LIBID3TAG
- select BR2_PACKAGE_LIBMAD
- select BR2_PACKAGE_LIBMODPLUG
select BR2_PACKAGE_LIBMPEG2
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPLIST
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_LIBSAMPLERATE
+ select BR2_PACKAGE_LIBSQUISH
select BR2_PACKAGE_LIBVORBIS
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBXSLT
@@ -79,9 +76,6 @@ menuconfig BR2_PACKAGE_KODI
select BR2_PACKAGE_PYTHON_UNICODEDATA
select BR2_PACKAGE_PYTHON_ZLIB
select BR2_PACKAGE_READLINE
- select BR2_PACKAGE_SDL if BR2_PACKAGE_KODI_GL
- select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_KODI_GL
- select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_KODI_GL
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_TAGLIB
select BR2_PACKAGE_TIFF
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 6052f15..e5304ab 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -4,22 +4,19 @@
#
################################################################################
-KODI_VERSION = 14.2-Helix
+KODI_VERSION = 15.0-Isengard
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
KODI_LICENSE = GPLv2
KODI_LICENSE_FILES = LICENSE.GPL
-# needed for audioencoder addons
+# needed for binary addons
KODI_INSTALL_STAGING = YES
-# Kodi needs host-sdl_image (and therefore host-sdl) for a host tools it builds
-# called TexturePacker. It is responsible to take all the images used in the
-# GUI and pack them in a blob.
-# http://wiki.xbmc.org/index.php?title=TexturePacker
-KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip host-lzo \
- host-nasm host-sdl_image host-swig
+KODI_DEPENDENCIES = host-gawk host-gettext host-gperf host-infozip 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 libmad libmodplug libmpeg2 \
- libogg libplist libpng libsamplerate libvorbis libxml2 libxslt lzo ncurses \
- openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib
+ libass libcdio libcurl libfribidi libgcrypt libmpeg2 \
+ libogg libplist libpng libsamplerate libsquish libvorbis libxml2 \
+ libxslt lzo ncurses openssl pcre python readline sqlite taglib tiff \
+ tinyxml yajl zlib
KODI_CONF_ENV = \
PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \
@@ -33,8 +30,6 @@ KODI_CONF_ENV = \
KODI_CONF_OPTS += \
--with-ffmpeg=shared \
- --disable-crystalhd \
- --disable-hal \
--disable-joystick \
--disable-openmax \
--disable-projectm \
@@ -91,13 +86,15 @@ endif
# GL means X11, and under X11, Kodi needs libdrm; libdrm is forcefully selected
# by a modular Xorg server, which Kodi already depends on.
ifeq ($(BR2_PACKAGE_KODI_GL),y)
-KODI_DEPENDENCIES += libglew libglu libgl sdl_image xlib_libX11 xlib_libXext \
+KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
xlib_libXmu xlib_libXrandr xlib_libXt libdrm
-KODI_CONF_OPTS += --enable-gl --enable-sdl --enable-x11 --enable-xrandr --disable-gles
+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`" \
@@ -109,7 +106,7 @@ else
KODI_CONF_OPTS += --disable-rsxs
endif
else
-KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
+KODI_CONF_OPTS += --disable-gl --disable-rsxs --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`"
@@ -213,6 +210,8 @@ endif
# Add HOST_DIR to PATH for codegenerator.mk to find swig
define KODI_BOOTSTRAP
+ $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/JsonSchemaBuilder
+ $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/TexturePacker
cd $(@D) && PATH=$(BR_PATH) ./bootstrap
endef
KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
More information about the buildroot
mailing list