summaryrefslogtreecommitdiff
path: root/package/kodi
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-10-11 01:35:40 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2014-10-12 12:44:16 -0500
commit0004d94b568dd0277b3c9dfddd7e3ab0f5d53260 (patch)
tree8cdd7614f6bf11cd6c755e885c87c038454b4aeb /package/kodi
parentd988816b237fc80ee66430aa928c396d77fb5a92 (diff)
update kodi and rpi-userland
Diffstat (limited to 'package/kodi')
-rw-r--r--package/kodi/Makefile4
-rw-r--r--package/kodi/patches/patch-configure_in10
-rw-r--r--package/kodi/patches/patch-xbmc_Application_cpp10
3 files changed, 12 insertions, 12 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 3b9dbeafa..09e627974 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,8 +5,8 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
PKG_VERSION:= 14.0alpha4
-PKG_RELEASE:= 4
-PKG_MD5SUM:= ac54bdac1f5c6dd2a2c75818391740a4
+PKG_RELEASE:= 5
+PKG_MD5SUM:= 88a68db6e653b2029efddbfa0a855e1c
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv
diff --git a/package/kodi/patches/patch-configure_in b/package/kodi/patches/patch-configure_in
index bfe90410a..3db5985c7 100644
--- a/package/kodi/patches/patch-configure_in
+++ b/package/kodi/patches/patch-configure_in
@@ -1,11 +1,11 @@
---- kodi-14.0alpha4.orig/configure.in 2014-09-05 14:09:58.000000000 +0200
-+++ kodi-14.0alpha4/configure.in 2014-09-21 10:23:38.000000000 +0200
-@@ -1004,7 +1004,7 @@ if test "$use_gles" = "yes"; then
+--- kodi-14.0alpha4.orig/configure.in 2014-10-06 11:34:24.000000000 -0500
++++ kodi-14.0alpha4/configure.in 2014-10-08 01:40:53.444436000 -0500
+@@ -1011,7 +1011,7 @@ if test "$use_gles" = "yes"; then
AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
-- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
-+ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm"
+- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
++ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lkhrn_static -lpthread -lm"
else
AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp
index b8a942c03..a90c36f89 100644
--- a/package/kodi/patches/patch-xbmc_Application_cpp
+++ b/package/kodi/patches/patch-xbmc_Application_cpp
@@ -1,6 +1,6 @@
---- kodi-14.0alpha4.orig/xbmc/Application.cpp 2014-09-05 14:09:59.000000000 +0200
-+++ kodi-14.0alpha4/xbmc/Application.cpp 2014-09-05 15:48:59.475115902 +0200
-@@ -679,7 +679,7 @@ bool CApplication::Create()
+--- kodi-14.0alpha4.orig/xbmc/Application.cpp 2014-10-06 11:34:37.000000000 -0500
++++ kodi-14.0alpha4/xbmc/Application.cpp 2014-10-08 01:25:47.880436000 -0500
+@@ -642,7 +642,7 @@ bool CApplication::Create()
if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()))
{
@@ -9,7 +9,7 @@
CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str());
return false;
}
-@@ -1090,10 +1090,13 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1064,10 +1064,13 @@ bool CApplication::InitDirectoriesLinux(
userName = "root";
CStdString userHome;
@@ -23,7 +23,7 @@
CStdString xbmcBinPath, xbmcPath;
CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-@@ -1125,11 +1128,11 @@ bool CApplication::InitDirectoriesLinux(
+@@ -1099,11 +1102,11 @@ bool CApplication::InitDirectoriesLinux(
// map our special drives
CSpecialProtocol::SetXBMCBinPath(xbmcBinPath);
CSpecialProtocol::SetXBMCPath(xbmcPath);