diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-19 20:52:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-19 20:52:15 +0200 |
| commit | 753383bdf29033a1c7244e31c42c2f5d9906010f (patch) | |
| tree | 76f468b30d786cd2a37d565e93fda8f57069719c /package/kodi/patches | |
| parent | a54b226832e9b6e957d1db9b8c081adeb4ef09df (diff) | |
| parent | 4404645c4b980a135411b7e4b13546b15a48d49e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/kodi/patches')
| -rw-r--r-- | package/kodi/patches/patch-configure_in | 10 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_Application_cpp | 10 |
2 files changed, 10 insertions, 10 deletions
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); |