Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Charset conversion fix when using ARMhf Linaro toolchains

Currently supported toolchains:

Linaro 2013.04
Linaro 2013.05
Linaro 2013.06
Linaro 2013.07
Linaro 2013.08

This is partial fix. Other part involves actual fonts and
their integration in XBMC itself.

Basically, subtitle decoding works, doesn't crash :)

Stane1983:
Update: XBMC doesn't really have any issues, you just have to be clever enough to change character set of subtitles... :D
  • Loading branch information...
commit 8be22b0db136403ee55c84bf093366808d65dc3f 1 parent c9dd31c
@Stane1983 authored croniccorey committed
View
1  configs/mx_linux_g02-g18-mx2_defconfig
@@ -8,6 +8,7 @@ BR2_BOARD_TYPE_AMLOGIC_M6=y
BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04=y
+BR2_TOOLCHAIN_EXTERNAL_LINARO_GCONV=y
BR2_PACKAGE_HOST_GDB=y
BR2_EXT_TOOL_DIRS_EXTRA="/usr/share/zoneinfo"
BR2_TARGET_GENERIC_HOSTNAME="MX_LINUX"
View
3  package/thirdparty/xbmc/etc/init.d/S95xbmc
@@ -6,7 +6,8 @@
case "$1" in
start)
echo "Starting XBMC..."
- export LD_LIBRARY_PATH=/usr/lib:/usr/lib/mysql:/lib
+ export LD_LIBRARY_PATH=/usr/lib:/usr/lib/mysql:/lib
+ export GCONV_PATH=/usr/lib/gconv
export XBMC_HOME=/usr/share/xbmc
REMOTECONF=/etc/xbmc/remote.conf
if [ -f /root/.xbmc/remote.conf ]; then
View
13 toolchain/helpers.mk
@@ -81,6 +81,19 @@ copy_toolchain_lib_root = \
\
echo -n
+# Function for Linaro toolchains that copies gconv libs to target
+# TODO: Part of path (usr/lib/arm-linux-gnueabihf) is hardcoded. Rewrite it ASAP!
+# Expects 1 param:
+# $1: toolchain root
+copy_toolchain_gconv = \
+ BASE_DIR="$(strip $1)"; \
+ if [ -d $${BASE_DIR}usr/lib/arm-linux-gnueabihf/gconv ] ; then \
+ mkdir -p $(TARGET_DIR)/usr/lib/gconv ; \
+ cp -r $${BASE_DIR}usr/lib/arm-linux-gnueabihf/gconv/* $(TARGET_DIR)/usr/lib/gconv ; \
+ fi; \
+ \
+ echo -n
+
#
# Copy the full external toolchain sysroot directory to the staging
# dir. The operation of this function is rendered a little bit
View
8 toolchain/toolchain-external/Config.in
@@ -885,6 +885,14 @@ config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
bool
select BR2_TOOLCHAIN_USES_UCLIBC
+config BR2_TOOLCHAIN_EXTERNAL_LINARO_GCONV
+ bool "Copy GCONV libraries to target"
+ depends on BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_04 \
+ || BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_05 \
+ || BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_06 \
+ || BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_07 \
+ || BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_08
+
if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
choice
View
4 toolchain/toolchain-external/ext-tool.mk
@@ -473,6 +473,10 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
echo "No such directory '$${d}' while trying to copy from toolchain"; \
fi; \
done; \
+ if test "$(BR2_TOOLCHAIN_EXTERNAL_LINARO_GCONV)" = "y" ; then \
+ $(call MESSAGE,"Copying external toolchain gconv to target...") ; \
+ $(call copy_toolchain_gconv,$${SYSROOT_DIR}) ; \
+ fi ; \
$(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \
$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \
if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
Please sign in to comment.
Something went wrong with that request. Please try again.