From 725b471cbf1e0341b5de2099473f51a7201aa6f2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 5 Nov 2013 16:24:01 +0100 Subject: fix compile with libiconv-tiny --- .../patches/patch-xbmc_utils_CharsetConverter_cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp diff --git a/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp b/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp new file mode 100644 index 000000000..3c5753033 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp @@ -0,0 +1,20 @@ +--- xbmc-12.2.orig/xbmc/utils/CharsetConverter.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/utils/CharsetConverter.cpp 2013-11-05 14:10:44.000000000 +0100 +@@ -140,7 +140,7 @@ static struct SCharsetMapping + #define ICONV_PREPARE(iconv) iconv=(iconv_t)-1 + #define ICONV_SAFE_CLOSE(iconv) if (iconv!=(iconv_t)-1) { iconv_close(iconv); iconv=(iconv_t)-1; } + +-size_t iconv_const (void* cd, const char** inbuf, size_t *inbytesleft, ++size_t iconv_const (iconv_t cd, const char** inbuf, size_t *inbytesleft, + char* * outbuf, size_t *outbytesleft) + { + struct iconv_param_adapter { +@@ -157,7 +157,7 @@ size_t iconv_const (void* cd, const char + const char** p; + }; + +- return iconv((iconv_t)cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft); ++ return iconv(cd, iconv_param_adapter(inbuf), inbytesleft, outbuf, outbytesleft); + } + + template -- cgit v1.2.3 From da41715f82af9f47cfe64a5c71fb998ba3ebc335 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 5 Nov 2013 21:18:41 +0100 Subject: set to 4kb pagesize --- target/mips/sys-available/qemu-mips64 | 1 + target/mips/sys-available/qemu-mips64el | 1 + 2 files changed, 2 insertions(+) diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64 index d5335caa9..ce0e1298c 100644 --- a/target/mips/sys-available/qemu-mips64 +++ b/target/mips/sys-available/qemu-mips64 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64 select ADK_big select ADK_qemu_mips64 select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_KERNEL_CPU_BIG_ENDIAN select ADK_CPU_MIPS64 select ADK_HARDWARE_QEMU diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el index 05b6ed834..37c6be164 100644 --- a/target/mips/sys-available/qemu-mips64el +++ b/target/mips/sys-available/qemu-mips64el @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL select ADK_little select ADK_qemu_mips64el select ADK_KERNEL_MIPS_MALTA + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_KERNEL_CPU_LITTLE_ENDIAN select ADK_KERNEL_CPU_MIPS64 select ADK_KERNEL_CPU_MIPS64_R1 -- cgit v1.2.3