From 5edfb8067ec793a2a0361fe215a1498902b14a1a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 15 Jan 2014 17:20:57 +0100
Subject: fix xbmc youtube addon, now plays fine. python2-sqlite needed, and
 bios param start_x=1

---
 package/xbmc/Makefile                       |  6 ++---
 package/xbmc/files/xbmc.init                |  2 +-
 package/xbmc/patches/002-defaultsutf8.patch | 42 +++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 package/xbmc/patches/002-defaultsutf8.patch

(limited to 'package/xbmc')

diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 9f45cd633..05026e12b 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,18 +5,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
+PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 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+=		libbluray libgpg-error libudev
+PKG_DEPENDS+=		libbluray libgpg-error libudev python2-mod-sqlite
 PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
index ed8a49bd6..afb1fd9ac 100644
--- a/package/xbmc/files/xbmc.init
+++ b/package/xbmc/files/xbmc.init
@@ -15,7 +15,7 @@ start)
 	xbmc &
 	;;
 stop)
-	kill $(pgrep -f /usr/bin/xbmc)
+	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch
new file mode 100644
index 000000000..466dc83bb
--- /dev/null
+++ b/package/xbmc/patches/002-defaultsutf8.patch
@@ -0,0 +1,42 @@
+diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/English/langinfo.xml	2014-01-14 19:34:44.869490320 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
+diff -Nur "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml" "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"
+--- "xbmc-12.3-Frodo.orig/language/English (US)/langinfo.xml"	2013-12-12 22:47:49.000000000 +0100
++++ "xbmc-12.3-Frodo/language/English (US)/langinfo.xml"	2014-01-14 19:35:02.117560629 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
+diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/German/langinfo.xml	2014-01-14 19:34:20.997392956 +0100
+@@ -2,8 +2,8 @@
+ <language locale="de">
+ 
+   <charsets>
+-    <gui unicodefont="false">CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui unicodefont="false">UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
-- 
cgit v1.2.3