diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-05 21:23:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-05 21:23:42 +0100 |
| commit | d2081213352e456f7596f22e0b37b682204c4cfe (patch) | |
| tree | 8b1444fa072bb46f4483f0a8f114c955b6fb987f | |
| parent | 4bef9a612a73c5b18bad38c1ef4ae4924c719ecc (diff) | |
| parent | 0d26df21995dc2f25041974fb6faf3ec31be6467 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/xbmc/patches/patch-xbmc_utils_CharsetConverter_cpp | 20 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64 | 1 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64el | 1 |
3 files changed, 22 insertions, 0 deletions
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<class INPUT,class OUTPUT> 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 |