diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-09 17:21:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-09 17:21:31 +0200 |
| commit | af7ff722d227eb374dc035f7bf890ee4db8cdf11 (patch) | |
| tree | 6e16ac2783c9f4de30516603a5ff8453c8c221cf /package/xbmc | |
| parent | 72e736015f94d62211643ad1bedeeeacc77497db (diff) | |
fix usb keyboard support, startup xbmc without read-write root, add bluray support
Diffstat (limited to 'package/xbmc')
| -rw-r--r-- | package/xbmc/Makefile | 5 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-xbmc_Application_cpp | 41 |
2 files changed, 45 insertions, 1 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 3712c7336..1eb77d9c1 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -16,12 +16,13 @@ PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd +PKG_DEPENDS+= omxplayer libusb-compat libbluray PKG_BUILDDEP:= boost ffmpeg python2 MesaLib libglew libass PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd -PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus +PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus libusb-compat libbluray PKG_URL:= http://xbmc.org/ PKG_SITES:= http://mirrors.xbmc.org/releases/source/ @@ -45,6 +46,8 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-ssh \ --disable-samba \ --disable-mysql \ + --enable-libusb \ + --enable-libbluray \ --enable-external-libraries \ --enable-player=omxplayer \ --enable-gles \ diff --git a/package/xbmc/patches/patch-xbmc_Application_cpp b/package/xbmc/patches/patch-xbmc_Application_cpp new file mode 100644 index 000000000..587456a07 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_Application_cpp @@ -0,0 +1,41 @@ +--- xbmc-12.2.orig/xbmc/Application.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/Application.cpp 2013-10-08 13:55:01.000000000 +0200 +@@ -615,7 +615,7 @@ bool CApplication::Create() + + if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str())) + { +- fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n", ++ fprintf(stderr,"Could not init logging classes. Permission errors on %s\n", + CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str()); + return false; + } +@@ -966,10 +966,13 @@ bool CApplication::InitDirectoriesLinux( + userName = "root"; + + CStdString userHome; ++ userHome = "/etc/xbmc"; ++/* + if (getenv("HOME")) + userHome = getenv("HOME"); + else + userHome = "/root"; ++*/ + + CStdString xbmcBinPath, xbmcPath; + CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME"); +@@ -1001,11 +1004,11 @@ bool CApplication::InitDirectoriesLinux( + // map our special drives + CSpecialProtocol::SetXBMCBinPath(xbmcBinPath); + CSpecialProtocol::SetXBMCPath(xbmcPath); +- CSpecialProtocol::SetHomePath(userHome + "/.xbmc"); +- CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata"); ++ CSpecialProtocol::SetHomePath(userHome); ++ CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata"); + +- CStdString strTempPath = userHome; +- strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp"); ++ CStdString strTempPath = "/tmp"; ++ strTempPath = URIUtils::AddFileToFolder(strTempPath, "/.xbmc/temp"); + if (getenv("XBMC_TEMP")) + strTempPath = getenv("XBMC_TEMP"); + CSpecialProtocol::SetTempPath(strTempPath); |