jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2012-05-20 23:11:51 +02:00
commit b0377155f1
4 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch vendored Normal file
View File

@ -0,0 +1,35 @@
From c7cd9b614762103a95f3da27783e03ce115d43fb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
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

2
packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
View File

@ -31,5 +31,5 @@
<setting id="SAMBA_PASSWORD" value="openelec" />
<setting id="UPDATE_AUTO" value="manual" />
<setting id="X11_KEYMAP" value="us" />
<setting id="X11_KEYMAP2" value="" />
<setting id="X11_KEYMAP2" value="-none-" />
</settings>

2
packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
View File

@ -6,7 +6,7 @@
<setting label="2010" type="lsep"/>
<setting type="sep" />
<setting id="X11_KEYMAP" type="labelenum" label="2011" values="ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default="us"/>
<setting id="X11_KEYMAP2" type="labelenum" label="2012" values="|ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default=""/>
<setting id="X11_KEYMAP2" type="labelenum" label="2012" values="-none-|ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default="-none-"/>
<setting label="2020" type="lsep"/>
<setting type="sep" />
<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manual|auto" sort="yes" default="manual" />

6
packages/x11/app/setxkbmap/scripts/xkb-setup
View File

@ -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\""