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

Merge branch 'master' into openelec-pvr

Browse Source
This commit is contained in:
Gujs 2011-02-04 18:39:05 +01:00
commit feb56e14f0
25 changed files with 365 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/databases/sqlite/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="sqlite"
PKG_VERSION="autoconf-3070400"
PKG_VERSION="autoconf-3070500"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="PublicDomain"

2
packages/graphics/glew/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="glew"
PKG_VERSION="1.5.7"
PKG_VERSION="1.5.8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

0
packages/graphics/glew/patches/glew-1.5.7-010_crosscompiling.patch → packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch
View File

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

@ -22,4 +22,5 @@
<setting id="TRANSMISSION_USER" value="openelec" />
<setting id="TVHEADEND_START" value="false" />
<setting id="UPDATE_AUTO" value="manually" />
<setting id="X11_KEYMAP" value="us" />
</settings>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="os.openelec.settings"
name="OpenELEC OS Settings"
version="0.0.3"
version="0.0.4"
provider-name="openelec.tv">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>

2
packages/mediacenter/xbmc-addon-settings/source/default.py
View File

@ -27,7 +27,7 @@ __author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__svn_url__ = ""
__credits__ = ""
__version__ = "0.0.3"
__version__ = "0.0.4"
__XBMC_Revision__ = "22240"
__settings__ = xbmcaddon.Addon(id='os.openelec.settings')

17
packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
View File

@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- General -->
<string id="2000">Update</string>
<string id="2010">Update</string>
<string id="2011">Auto update</string>
<!-- System -->
<string id="2000">System</string>
<string id="2010">Toetsenbord</string>
<string id="2011">Toetsenbord layout</string>
<string id="2020">System Update</string>
<string id="2021">Auto update</string>
<string id="2050">LCD/VFD Driver</string>
<string id="2051">Te gebruiken LCD Driver</string>
<!-- Netwerk -->
<string id="2100">Netwerk</string>
@ -26,11 +30,6 @@
<string id="2153">WLAN beveiliging</string>
<string id="2154">WLAN wachtwoord</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>
<string id="3110">Driver</string>
<string id="3111">Te gebruiken LCD Driver</string>
<!-- TV_SERVER -->
<string id="4100">TV/PVR</string>
<string id="4110">Configuratie</string>

17
packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
View File

@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- General -->
<string id="2000">Update</string>
<string id="2010">Update</string>
<string id="2011">Auto update</string>
<!-- System -->
<string id="2000">System</string>
<string id="2010">Keyboard</string>
<string id="2011">Keyboardlayout</string>
<string id="2020">System Update</string>
<string id="2021">Auto update</string>
<string id="2050">LCD/VFD</string>
<string id="2051">LCD Driver to use</string>
<!-- Network -->
<string id="2100">Network</string>
@ -26,11 +30,6 @@
<string id="2153">WLAN Security</string>
<string id="2154">WLAN Passphrase</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>
<string id="3110">Driver</string>
<string id="3111">LCD Driver to use</string>
<!-- TV_SERVER -->
<string id="4100">TV/PVR</string>
<string id="4110">Boot</string>

15
packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
View File

@ -2,9 +2,13 @@
<strings>
<!-- General -->
<string id="2000">Mise à jour</string>
<string id="2010">Mise à jour</string>
<string id="2011">Mise à jour automatique</string>
<string id="2000">Système</string>
<string id="2010">Clavier</string>
<string id="2011">Clavier</string>
<string id="2020">Mise à jour du système</string>
<string id="2021">Mise à jour automatique</string>
<string id="2050">LCD/VFD</string>
<string id="2051">Pilote LCD</string>
<!-- Network -->
<string id="2100">Réseau</string>
@ -26,11 +30,6 @@
<string id="2153">Sécurité WIFI</string>
<string id="2154">Passphrase</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>
<string id="3110">Pilote</string>
<string id="3111">Pilote LCD</string>
<!-- TV_SERVER -->
<string id="4100">TV/PVR</string>
<string id="4110">Démarrage</string>

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

@ -1,11 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<!-- UPDATE -->
<!-- SYSTEM -->
<category label="2000">
<setting label="2010" type="lsep"/>
<setting type="sep" />
<setting id="UPDATE_AUTO" type="labelenum" label="2011" values="no|manually|auto" sort="yes" default="manually" />
<setting id="X11_KEYMAP" type="labelenum" label="2011" values="ch|de|fr|uk|us" sort="yes" default="us"/>
<setting label="2020" type="lsep"/>
<setting type="sep" />
<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manually|auto" sort="yes" default="manually" />
<setting label="2050" type="lsep"/>
<setting type="sep" />
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon" sort="yes" default="none" />
</category>
<!-- Network -->
@ -33,13 +39,6 @@
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
</category>
<!-- LCD -->
<category label="3100">
<setting label="3110" type="lsep"/>
<setting type="sep" />
<setting id="LCD_DRIVER" type="labelenum" label="3111" values="none|irtrans|imon" sort="yes" default="none" />
</category>
<!-- TV-SERVER -->
<category label="4100">
<setting label="4110" type="lsep"/>

5
packages/network/transmission/meta
View File

@ -19,13 +19,12 @@
################################################################################
PKG_NAME="transmission"
PKG_VERSION="11666"
PKG_VERSION="2.20b3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"
#PKG_URL="http://download.m0k.org/transmission/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib openssl curl libevent connman"
PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent"
PKG_PRIORITY="optional"

62
packages/sysutils/busybox/patches/busybox-1.18.2-buildsys.patch Normal file
View File

@ -0,0 +1,62 @@
--- busybox-1.18.2/loginutils/Config.src
+++ busybox-1.18.2-buildsys/loginutils/Config.src
@@ -186,7 +186,6 @@ config GETTY
config LOGIN
bool "login"
default y
- select FEATURE_SUID
select FEATURE_SYSLOG
help
login is used when signing onto a system.
@@ -229,7 +228,6 @@ config FEATURE_SECURETTY
config PASSWD
bool "passwd"
default y
- select FEATURE_SUID
select FEATURE_SYSLOG
help
passwd changes passwords for user and group accounts. A normal user
@@ -265,7 +263,6 @@ config CHPASSWD
config SU
bool "su"
default y
- select FEATURE_SUID
select FEATURE_SYSLOG
help
su is used to become another user during a login session.
@@ -295,7 +292,6 @@ config SULOGIN
config VLOCK
bool "vlock"
default y
- select FEATURE_SUID
help
Build the "vlock" applet which allows you to lock (virtual) terminals.
--- busybox-1.18.2/miscutils/Config.src
+++ busybox-1.18.2-buildsys/miscutils/Config.src
@@ -170,7 +170,6 @@ config FEATURE_CROND_DIR
config CRONTAB
bool "crontab"
default y
- select FEATURE_SUID
help
Crontab manipulates the crontab for a particular user. Only
the superuser may specify a different user and/or crontab directory.
--- busybox-1.18.2/util-linux/Config.src
+++ busybox-1.18.2-buildsys/util-linux/Config.src
@@ -354,7 +354,6 @@ config FEATURE_HWCLOCK_ADJTIME_FHS
config IPCRM
bool "ipcrm"
default y
- select FEATURE_SUID
help
The ipcrm utility allows the removal of System V interprocess
communication (IPC) objects and the associated data structures
@@ -364,7 +363,6 @@ config IPCS
bool "ipcs"
default y
depends on PLATFORM_LINUX
- select FEATURE_SUID
help
The ipcs utility is used to provide information on the currently
allocated System V interprocess (IPC) objects in the system.

34
packages/sysutils/busybox/patches/busybox-1.18.2-hush.patch Normal file
View File

@ -0,0 +1,34 @@
--- busybox-1.18.2/shell/hush.c
+++ busybox-1.18.2-hush/shell/hush.c
@@ -4123,15 +4123,26 @@ static struct pipe *parse_stream(char **
&& dest.length == 0 && !dest.has_quoted_part
) {
/* This newline can be ignored. But...
- * without the below check, interactive shell
- * will ignore even lines with bare <newline>,
- * and show the continuation prompt:
+ * Without check #1, interactive shell
+ * ignores even bare <newline>,
+ * and shows the continuation prompt:
* ps1_prompt$ <enter>
- * ps2> _ <=== wrong prompt, should be ps1
+ * ps2> _ <=== wrong, should be ps1
+ * Without check #2, "cmd & <newline>"
+ * is similarly mistreated.
+ * (BTW, this makes "cmd & cmd"
+ * and "cmd && cmd" non-orthogonal.
+ * Really, ask yourself, why
+ * "cmd && <newline>" doesn't start
+ * cmd but waits for more input?
+ * No reason...)
*/
struct pipe *pi = ctx.list_head;
- if (pi->num_cmds != 0)
+ if (pi->num_cmds != 0 /* check #1 */
+ && pi->followup != PIPE_BG /* check #2 */
+ ) {
continue;
+ }
}
/* Treat newline as a command separator. */
done_pipe(&ctx, PIPE_SEQ);

10
packages/sysutils/busybox/patches/busybox-1.18.2-libbb.patch Normal file
View File

@ -0,0 +1,10 @@
--- busybox-1.18.2/libbb/vfork_daemon_rexec.c
+++ busybox-1.18.2-libbb/libbb/vfork_daemon_rexec.c
@@ -52,6 +52,7 @@ pid_t FAST_FUNC spawn(char **argv)
* Interested party can wait on pid and learn exit code.
* If 111 - then it (most probably) failed to exec */
if (failed) {
+ safe_waitpid(pid, NULL, 0); /* prevent zombie */
errno = failed;
return -1;
}

19
packages/sysutils/busybox/patches/busybox-1.18.2-modprobe-small.patch Normal file
View File

@ -0,0 +1,19 @@
--- busybox-1.18.2/modutils/modprobe-small.c
+++ busybox-1.18.2-modprobe-small/modutils/modprobe-small.c
@@ -205,6 +205,7 @@ static void parse_module(module_info *in
/* Read (possibly compressed) module */
len = 64 * 1024 * 1024; /* 64 Mb at most */
module_image = xmalloc_open_zipped_read_close(pathname, &len);
+ /* module_image == NULL is ok here, find_keyword handles it */
//TODO: optimize redundant module body reads
/* "alias1 symbol:sym1 alias2 symbol:sym2" */
@@ -845,6 +846,8 @@ int modprobe_main(int argc UNUSED_PARAM,
len = MAXINT(ssize_t);
map = xmalloc_open_zipped_read_close(*argv, &len);
+ if (!map)
+ bb_perror_msg_and_die("can't read '%s'", *argv);
if (init_module(map, len,
IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")

20
packages/sysutils/busybox/patches/busybox-1.18.2-modprobe.patch Normal file
View File

@ -0,0 +1,20 @@
--- busybox-1.18.2/modutils/modutils.c
+++ busybox-1.18.2-modprobe/modutils/modutils.c
@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_opt
optlen = 0;
while (*++argv) {
options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
- /* Older versions were enclosing space-containing *argv in "",
- * but both modprobe and insmod from module-init-tools 3.11.1
- * don't do this anymore. (As to extra trailing space,
- * insmod adds it but modprobe does not. We do in both cases)
- */
- optlen += sprintf(options + optlen, "%s ", *argv);
+ /* Spaces handled by "" pairs, but no way of escaping quotes */
+//TODO: module-init-tools version 3.11.1 quotes only value:
+//it generates var="val with spaces", not "var=val with spaces"
+//(and it won't quote var *name* even if it has spaces)
+ optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
}
return options;
}

41
packages/sysutils/busybox/patches/busybox-1.18.2-wc.patch Normal file
View File

@ -0,0 +1,41 @@
--- busybox-1.18.2/coreutils/wc.c
+++ busybox-1.18.2-wc/coreutils/wc.c
@@ -81,11 +81,11 @@
* column order in "wc -cmlwL" output:
*/
enum {
- WC_LINES = 0,
- WC_WORDS = 1,
- WC_UNICHARS = 2,
- WC_CHARS = 3,
- WC_LENGTH = 4,
+ WC_LINES = 0, /* -l */
+ WC_WORDS = 1, /* -w */
+ WC_UNICHARS = 2, /* -m */
+ WC_BYTES = 3, /* -c */
+ WC_LENGTH = 4, /* -L */
NUM_WCS = 5,
};
@@ -104,10 +104,10 @@ int wc_main(int argc UNUSED_PARAM, char
init_unicode();
- print_type = getopt32(argv, "lwcmL");
+ print_type = getopt32(argv, "lwmcL");
if (print_type == 0) {
- print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
+ print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_BYTES);
}
argv += optind;
@@ -157,7 +157,7 @@ int wc_main(int argc UNUSED_PARAM, char
}
/* Cater for -c and -m */
- ++counts[WC_CHARS];
+ ++counts[WC_BYTES];
if (unicode_status != UNICODE_ON /* every byte is a new char */
|| (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */
) {

2
packages/toolchain/devel/ccache/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="ccache"
PKG_VERSION="3.1.3"
PKG_VERSION="3.1.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

31
packages/x11/app/setxkbmap/build Executable file
View File

@ -0,0 +1,31 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
make

43
packages/x11/app/setxkbmap/init.d/72_keyboard Normal file
View File

@ -0,0 +1,43 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# setup keyboard layout
#
# runlevels: openelec
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
(
if [ -f "$OPENELEC_SETTINGS" ]; then
X11_KEYMAP=`grep X11_KEYMAP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
progress "setup keyboard layout"
if [ -z $X11_KEYMAP ]; then
X11_KEYMAP="us"
fi
# waiting for Xorg to start
wait_for_xorg
# setup keymap
setxkbmap -display $DISPLAY $X11_KEYMAP
fi
)&

27
packages/x11/app/setxkbmap/install Executable file
View File

@ -0,0 +1,27 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/$1 $INSTALL/usr/bin

36
packages/x11/app/setxkbmap/meta Normal file
View File

@ -0,0 +1,36 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="setxkbmap"
PKG_VERSION="1.2.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.X.org"
PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libX11"
PKG_BUILD_DEPENDS="toolchain libX11"
PKG_PRIORITY="optional"
PKG_SECTION="x11/app"
PKG_SHORTDESC="setxkbmap: Sets the keyboard using the X Keyboard Extension"
PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

2
packages/x11/lib/libpciaccess/install
View File

@ -26,5 +26,5 @@ mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/src/.libs/libpciaccess.so* $INSTALL/usr/lib
mkdir -p $INSTALL/usr/bin
cp -P $PKG_BUILD/src/.libs/scanpci $INSTALL/usr/bin
cp -P $PKG_BUILD/scanpci/.libs/scanpci $INSTALL/usr/bin

2
packages/x11/lib/libpciaccess/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libpciaccess"
PKG_VERSION="0.12.0"
PKG_VERSION="0.12.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

2
packages/x11/xserver/xorg-server/meta
View File

@ -56,4 +56,4 @@ fi
done
# Tools
PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr"
PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"