diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-23 07:35:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-23 07:35:42 +0100 |
| commit | bc934c9e037950a59375befc838b17bb12605c20 (patch) | |
| tree | 7cdb475c034383d1299d55376040edb2eee1a456 | |
| parent | e73de827e71240d6e720487c48491d8193b2a15d (diff) | |
| parent | c66e4117d3ac4d561718a8b17066dc8b04a02027 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/pulseaudio/Makefile | 5 | ||||
| -rw-r--r-- | package/xbmc/patches/002-defaultsutf8.patch | 14 |
2 files changed, 3 insertions, 16 deletions
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index eba650096..4c7247c5c 100644 --- a/package/pulseaudio/Makefile +++ b/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 \ diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch index 466dc83bb..fad88800d 100644 --- a/package/xbmc/patches/002-defaultsutf8.patch +++ b/package/xbmc/patches/002-defaultsutf8.patch @@ -12,20 +12,6 @@ diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/lan </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 |