Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/pulseaudio/Makefile

@@ -36,8 +36,9 @@ CONFIGURE_ARGS+=	--disable-systemd \
 			--disable-lirc \
 			--disable-openssl \
 			--disable-orc \
-			--disable-libwrap \
-			--disable-oss \
+			--disable-tcpwrap \
+			--disable-oss-output \
+			--disable-oss-wrapper \
 			--disable-esound \
 			--disable-jack \
 			--disable-gconf \

package/xbmc/patches/002-defaultsutf8.patch

@@ -11,20 +11,6 @@ diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/lan
 +    <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