From 392234751c1ef148d564b9cba5d053ea5708265e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 20 May 2012 15:31:34 +0300 Subject: [PATCH 1/2] xbmc-addon-settings: another keymap fix --- .../xbmc-addon-settings/config/default_settings.xml | 2 +- .../xbmc-addon-settings/source/resources/settings.xml | 2 +- packages/x11/app/setxkbmap/scripts/xkb-setup | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 8bf4abbde6..cc29433eba 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -31,5 +31,5 @@ - + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index f09078cb27..f9b0662d7b 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -6,7 +6,7 @@ - + diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/scripts/xkb-setup index 7acd7f2a68..a2498b336a 100755 --- a/packages/x11/app/setxkbmap/scripts/xkb-setup +++ b/packages/x11/app/setxkbmap/scripts/xkb-setup @@ -24,12 +24,14 @@ . /var/config/settings.conf if [ -z $X11_KEYMAP ]; then - XKBLAYOUT="us" + X11_KEYMAP="us" fi -if [ ! -z $X11_KEYMAP2 ]; then +if [ ! "$X11_KEYMAP2" == "-none-" ]; then XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2" XKBOPTIONS="grp:alt_shift_toggle" +else + XKBLAYOUT="$X11_KEYMAP" fi echo "XKBMODEL=\"pc105\"" From 9fa050029360699f484fb40f8c90ca22f929f211 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 20 May 2012 16:08:30 +0300 Subject: [PATCH 2/2] vdr-iptv: re-add -skip_header_processing.patch --- ...dr-iptv-0.5.2-skip_header_processing.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch new file mode 100644 index 0000000000..38d0e738ff --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch @@ -0,0 +1,35 @@ +From c7cd9b614762103a95f3da27783e03ce115d43fb Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Sun, 20 May 2012 16:05:51 +0300 +Subject: [PATCH] vdr-iptv: skip header processing + +--- + protocolhttp.c | 12 +----------- + 1 files changed, 1 insertions(+), 11 deletions(-) + +diff --git a/protocolhttp.c b/protocolhttp.c +index de50f64..45c5425 100644 +--- a/protocolhttp.c ++++ b/protocolhttp.c +@@ -140,17 +140,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void) + memset(buf, '\0', sizeof(buf)); + if (!GetHeaderLine(buf, sizeof(buf), lineLength)) + return false; +- if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) { +- error("Expected HTTP header not found\n"); +- continue; +- } +- else +- responseFound = true; +- // Allow only 'OK' and 'Partial Content' +- if ((response != 200) && (response != 206)) { +- error("Invalid HTTP response (%d): %s\n", response, buf); +- return false; +- } ++ responseFound = true; + } + return true; + } +-- +1.7.2.5 +