summaryrefslogtreecommitdiff
path: root/package/kodi/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/kodi/patches')
-rw-r--r--package/kodi/patches/patch-Makefile_include_in10
-rw-r--r--package/kodi/patches/patch-lib_cpluff_Makefile_am11
-rw-r--r--package/kodi/patches/patch-lib_cpluff_autogen_sh10
-rw-r--r--package/kodi/patches/patch-lib_cpluff_configure_ac11
-rw-r--r--package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am11
-rw-r--r--package/kodi/patches/patch-m4_ax_python_devel_m411
-rw-r--r--package/kodi/patches/patch-xbmc_Application_cpp41
7 files changed, 105 insertions, 0 deletions
diff --git a/package/kodi/patches/patch-Makefile_include_in b/package/kodi/patches/patch-Makefile_include_in
new file mode 100644
index 000000000..d73f62de2
--- /dev/null
+++ b/package/kodi/patches/patch-Makefile_include_in
@@ -0,0 +1,10 @@
+--- xbmc-13.1.orig/Makefile.include.in 2014-06-08 08:40:24.000000000 +0200
++++ xbmc-13.1/Makefile.include.in 2014-06-11 13:17:49.354722974 +0200
+@@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@
+ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
+ LDFLAGS+=@LDFLAGS@
+ LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
++INCLUDES+=@CPPFLAGS@
+ INCLUDES+=-I@abs_top_srcdir@/lib
+ INCLUDES+=-I@abs_top_srcdir@/xbmc
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
diff --git a/package/kodi/patches/patch-lib_cpluff_Makefile_am b/package/kodi/patches/patch-lib_cpluff_Makefile_am
new file mode 100644
index 000000000..fb70c6993
--- /dev/null
+++ b/package/kodi/patches/patch-lib_cpluff_Makefile_am
@@ -0,0 +1,11 @@
+--- xbmc-13.0rc1.orig/lib/cpluff/Makefile.am 2014-04-30 15:43:53.000000000 +0200
++++ xbmc-13.0rc1/lib/cpluff/Makefile.am 2014-05-05 13:03:15.329450196 +0200
+@@ -6,7 +6,7 @@
+
+ ACLOCAL_AMFLAGS = -I m4
+
+-SUBDIRS = libcpluff loader console po test docsrc doc
++SUBDIRS = libcpluff loader console test docsrc doc
+ DIST_SUBDIRS = $(SUBDIRS) examples
+
+ EXTRA_DIST = COPYRIGHT.txt INSTALL.txt ChangeLog.txt Roadmap.txt autogen.sh plugin.xsd
diff --git a/package/kodi/patches/patch-lib_cpluff_autogen_sh b/package/kodi/patches/patch-lib_cpluff_autogen_sh
new file mode 100644
index 000000000..24a84ea38
--- /dev/null
+++ b/package/kodi/patches/patch-lib_cpluff_autogen_sh
@@ -0,0 +1,10 @@
+--- xbmc-13.0rc1.orig/lib/cpluff/autogen.sh 2014-04-30 15:43:53.000000000 +0200
++++ xbmc-13.0rc1/lib/cpluff/autogen.sh 2014-05-05 12:15:29.307227206 +0200
+@@ -15,7 +15,6 @@ fi
+
+ # Generate files in top level directory
+ cd "$basedir"
+-autopoint
+ rm -f ABOUT-NLS
+ test -d auxliary || mkdir auxliary
+ libtoolize --automake -f
diff --git a/package/kodi/patches/patch-lib_cpluff_configure_ac b/package/kodi/patches/patch-lib_cpluff_configure_ac
new file mode 100644
index 000000000..d38754bfd
--- /dev/null
+++ b/package/kodi/patches/patch-lib_cpluff_configure_ac
@@ -0,0 +1,11 @@
+--- xbmc-13.0rc1.orig/lib/cpluff/configure.ac 2014-04-30 15:43:53.000000000 +0200
++++ xbmc-13.0rc1/lib/cpluff/configure.ac 2014-05-05 13:03:32.437577723 +0200
+@@ -46,8 +46,6 @@ AC_SUBST([CP_CXX_LIB_VERSION])
+ # -----------------------
+ AM_INIT_AUTOMAKE([foreign])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.16.1])
+
+ # C/C++ compiler settings
+ # -------------------
diff --git a/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am b/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am
new file mode 100644
index 000000000..ffa9a1529
--- /dev/null
+++ b/package/kodi/patches/patch-lib_cpluff_libcpluff_Makefile_am
@@ -0,0 +1,11 @@
+--- xbmc-13.0rc1.orig/lib/cpluff/libcpluff/Makefile.am 2014-04-30 15:43:53.000000000 +0200
++++ xbmc-13.0rc1/lib/cpluff/libcpluff/Makefile.am 2014-05-05 13:53:11.766461900 +0200
+@@ -6,7 +6,7 @@
+
+ SUBDIRS = docsrc
+
+-LIBS = @LIBS_LIBCPLUFF@ @LTLIBINTL@ @LIBS@
++LIBS = @LIBS_LIBCPLUFF@ @LIBS@
+
+ CPPFLAGS = @CPPFLAGS@
+ CPPFLAGS += -I. -DCP_C_API=CP_EXPORT -DCP_HOST="\"$(host)\"" -DCP_DATADIR="\"$(datadir)\""
diff --git a/package/kodi/patches/patch-m4_ax_python_devel_m4 b/package/kodi/patches/patch-m4_ax_python_devel_m4
new file mode 100644
index 000000000..ded81dbd5
--- /dev/null
+++ b/package/kodi/patches/patch-m4_ax_python_devel_m4
@@ -0,0 +1,11 @@
+--- xbmc-13.0rc1.orig/m4/ax_python_devel.m4 2014-04-30 15:43:58.000000000 +0200
++++ xbmc-13.0rc1/m4/ax_python_devel.m4 2014-05-02 08:03:10.000000000 +0200
+@@ -298,7 +298,7 @@ EOD`
+ # save current global flags
+ ac_save_LIBS="$LIBS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"
++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_LANG_PUSH([C])
+ AC_LINK_IFELSE([
diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp
new file mode 100644
index 000000000..906ba1222
--- /dev/null
+++ b/package/kodi/patches/patch-xbmc_Application_cpp
@@ -0,0 +1,41 @@
+--- xbmc-13.1.orig/xbmc/Application.cpp 2014-06-08 08:40:26.000000000 +0200
++++ xbmc-13.1/xbmc/Application.cpp 2014-06-08 09:42:40.232780377 +0200
+@@ -682,7 +682,7 @@ bool CApplication::Create()
+
+ if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.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_advancedSettings.m_logFolder).c_str());
+ return false;
+ }
+@@ -1085,10 +1085,13 @@ bool CApplication::InitDirectoriesLinux(
+ userName = "root";
+
+ CStdString userHome;
++ userHome = "/data/xbmc";
++/*
+ if (getenv("HOME"))
+ userHome = getenv("HOME");
+ else
+ userHome = "/root";
++*/
+
+ CStdString xbmcBinPath, xbmcPath;
+ CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
+@@ -1120,11 +1123,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");
+ if (getenv("XBMC_TEMP"))
+ strTempPath = getenv("XBMC_TEMP");
+ CSpecialProtocol::SetTempPath(strTempPath);