package/kodi: bump version to 15.0 Isengard

 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

-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

Fix host compile

Signed-off-by: Bernd Kuhls <bernd.kuhls@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)

Patch sent upstream:

https://github.com/xbmc/xbmc/pull/7551

From a6d6a1a36ff2dff2586fbad2a068e7df14b55fdc Mon Sep 17 00:00:00 2001

From: Bernd Kuhls <bernd.kuhls@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@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

From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@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@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@_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@)

 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

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

	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

	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