jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openelec-next

Browse Source
This commit is contained in:
Stephan Raue 2011-04-12 21:51:47 +02:00
commit ea0b369839
17 changed files with 284 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/graphics/libdrm/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libdrm"
PKG_VERSION="2.4.24"
PKG_VERSION="2.4.25"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

14
packages/linux/patches/linux-2.6.38.2-054_nuvoton_dont_fail_with_unsupported_chip_versions-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur linux-2.6.38.2/drivers/media/rc/nuvoton-cir.c linux-2.6.38.2.patch/drivers/media/rc/nuvoton-cir.c
--- linux-2.6.38.2/drivers/media/rc/nuvoton-cir.c 2011-03-27 20:37:20.000000000 +0200
+++ linux-2.6.38.2.patch/drivers/media/rc/nuvoton-cir.c 2011-04-11 21:02:39.897028275 +0200
@@ -250,9 +250,8 @@
if (chip_major != CHIP_ID_HIGH ||
(chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) {
- nvt_pr(KERN_ERR, "%s: unsupported chip, id: 0x%02x 0x%02x",
+ nvt_pr(KERN_WARNING, "warning %s: unsupported chip revision, id: 0x%02x 0x%02x, it may not work",
chip_id, chip_major, chip_minor);
- ret = -ENODEV;
}
nvt_efm_disable(nvt);

14
packages/linux/patches/linux-2.6.39-rc2-054_nuvoton_dont_fail_with_unsupported_chip_versions-0.1.diff Normal file
View File

@ -0,0 +1,14 @@
diff -Naur linux-2.6.38.2/drivers/media/rc/nuvoton-cir.c linux-2.6.38.2.patch/drivers/media/rc/nuvoton-cir.c
--- linux-2.6.38.2/drivers/media/rc/nuvoton-cir.c 2011-03-27 20:37:20.000000000 +0200
+++ linux-2.6.38.2.patch/drivers/media/rc/nuvoton-cir.c 2011-04-11 21:02:39.897028275 +0200
@@ -250,9 +250,8 @@
if (chip_major != CHIP_ID_HIGH ||
(chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) {
- nvt_pr(KERN_ERR, "%s: unsupported chip, id: 0x%02x 0x%02x",
+ nvt_pr(KERN_WARNING, "warning %s: unsupported chip revision, id: 0x%02x 0x%02x, it may not work",
chip_id, chip_major, chip_minor);
- ret = -ENODEV;
}
nvt_efm_disable(nvt);

2
packages/network/SABnzbd/config/sabnzbd-http.service
View File

@ -4,7 +4,7 @@
<name replace-wildcards="yes">SABnzbd Server on %h</name>
<service>
<type>_http._tcp</type>
<port>8080</port>
<port>8081</port>
<txt-record>path=/index.html</txt-record>
</service>
</service-group>

2
packages/network/SABnzbd/config/sabnzbd-https.service
View File

@ -4,7 +4,7 @@
<name replace-wildcards="yes">SABnzbd Server on %h (secured)</name>
<service>
<type>_http._tcp</type>
<port>8081</port>
<port>8082</port>
<txt-record>path=/index.html</txt-record>
</service>
</service-group>

4
packages/network/SABnzbd/config/sabnzbd.config
View File

@ -1,7 +1,7 @@
__version__ = 18
[misc]
queue_complete = ""
https_port = 8081
https_port = 8082
folder_rename = 1
allow_64bit_tools = 1
rss_rate = 60
@ -30,7 +30,7 @@ __version__ = 18
ionice = -c2 -n4
enable_unzip = 1
download_free = 1G
port = 8080
port = 8081
email_dir = ""
email_full = 0
log_dir = logs

28
packages/sysutils/busybox/config/busybox.conf
View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.18.4
# Sun Apr 3 16:13:37 2011
# Tue Apr 12 14:24:15 2011
#
CONFIG_HAVE_DOT_CONFIG=y
@ -720,19 +720,19 @@ CONFIG_FTPGET=y
CONFIG_FTPPUT=y
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
# CONFIG_FEATURE_HTTPD_RANGES is not set
# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
# CONFIG_FEATURE_HTTPD_CGI is not set
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
# CONFIG_FEATURE_HTTPD_PROXY is not set
# CONFIG_FEATURE_HTTPD_GZIP is not set
CONFIG_HTTPD=y
CONFIG_FEATURE_HTTPD_RANGES=y
CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
CONFIG_FEATURE_HTTPD_SETUID=y
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
CONFIG_FEATURE_HTTPD_AUTH_MD5=y
CONFIG_FEATURE_HTTPD_CGI=y
CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
CONFIG_FEATURE_HTTPD_GZIP=y
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP is not set

46
packages/sysutils/busybox/config/httpd.conf Normal file
View File

@ -0,0 +1,46 @@
# httpd.conf has the following format:
#
# H:/serverroot # define the server root. It will override -h
# A:172.20. # Allow address from 172.20.0.0/16
# A:10.0.0.0/25 # Allow any address from 10.0.0.0-10.0.0.127
# A:10.0.0.0/255.255.255.128 # Allow any address that previous set
# A:127.0.0.1 # Allow local loopback connections
# D:* # Deny from other IP connections
# E404:/path/e404.html # /path/e404.html is the 404 (not found) error page
# I:index.html # Show index.html when a directory is requested
#
# P:/url:[http://]hostname[:port]/new/path
# # When /urlXXXXXX is requested, reverse proxy
# # it to http://hostname[:port]/new/pathXXXXXX
#
# /cgi-bin:foo:bar # Require user foo, pwd bar on urls starting with /cgi-bin/
# /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/
# /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/
# .au:audio/basic # additional mime type for audio.au files
# *.php:/path/php # run xxx.php through an interpreter
#
# A/D may be as a/d or allow/deny - only first char matters.
# Deny/Allow IP logic:
# - Default is to allow all (Allow all (A:*) is a no-op).
# - Deny rules take precedence over allow rules.
# - "Deny all" rule (D:*) is applied last.
#
# Example:
# 1. Allow only specified addresses
# A:172.20 # Allow any address that begins with 172.20.
# A:10.10. # Allow any address that begins with 10.10.
# A:127.0.0.1 # Allow local loopback connections
# D:* # Deny from other IP connections
#
# 2. Only deny specified addresses
# D:1.2.3. # deny from 1.2.3.0 - 1.2.3.255
# D:2.3.4. # deny from 2.3.4.0 - 2.3.4.255
# A:* # (optional line added for clarity)
#
H:/usr/www # define the server root. It will override -h
A:* # Allow address from all ip's
E404:/usr/www/error/404.html # /path/e404.html is the 404 (not found) error page
I:index.html # Show index.html when a directory is requested
*.php:/usr/bin/php-cgi

29
packages/sysutils/busybox/init.d/55_httpd Normal file
View File

@ -0,0 +1,29 @@
################################################################################
# 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
################################################################################
#
# start httpd daemon
#
# runlevels: openelec, textmode
(
progress "Starting HTTP daemon"
httpd -p 80
)&

8
packages/sysutils/busybox/install
View File

@ -44,6 +44,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/profile $INSTALL/etc
cp $PKG_DIR/config/httpd.conf $INSTALL/etc
# /etc/fstab is needed by...
touch $INSTALL/etc/fstab
@ -62,3 +63,10 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
# add user modprobe.d dir
mkdir -p $INSTALL/usr/config/modprobe.d
# add webroot
mkdir -p $INSTALL/usr/www
echo "It works" > $INSTALL/usr/www/index.html
mkdir -p $INSTALL/usr/www/error
echo "404" > $INSTALL/usr/www/error/404.html

4
packages/sysutils/remote/eventlircd/evmap/topseed.evmap
View File

@ -24,7 +24,7 @@
KEY_RIGHT = KEY_RIGHT # Right Arrow
KEY_ENTER = KEY_OK # Enter & Ok
KEY_DELETE = KEY_DELETE # Delete/Clear
KEY_BACK = KEY_BACK # BACK
KEY_BACK = KEY_EXIT # BACK
KEY_ESC = KEY_DELETE # Delete/Clear
KEY_HOME = KEY_HOME # Home
@ -61,7 +61,7 @@
KEY_LANGUAGE = KEY_LANGUAGE # Language
KEY_ANGLE = KEY_ANGLE # Angle
KEY_PROPS = KEY_INFO # Info/EPG
KEY_MENU = KEY_MENU # DVD Menu
KEY_MENU = KEY_DVD # DVD Menu
KEY_RED = KEY_RED # Red
KEY_GREEN = KEY_GREEN # Green

76
packages/web/php/build Executable file
View File

@ -0,0 +1,76 @@
#!/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
strip_lto
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--disable-static \
--enable-shared \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-all \
--without-pear \
--with-config-file-path=/etc \
--localstatedir=/var \
--disable-cli \
--enable-cgi \
--enable-fastcgi \
--disable-sockets \
--disable-posix \
--disable-spl \
--disable-session \
--without-openssl \
--disable-libxml \
--disable-xml \
--disable-xmlreader \
--disable-xmlwriter \
--disable-simplexml \
--with-zlib=$SYSROOT_PREFIX/usr \
--disable-exif \
--disable-ftp \
--without-gettext \
--without-gmp \
--disable-json \
--without-readline \
--without-ncurses \
--disable-pcntl \
--disable-sysvmsg \
--disable-sysvsem \
--disable-sysvshm \
--disable-zip \
--disable-filter \
--disable-calendar \
--with-curl=$SYSROOT_PREFIX/usr \
--with-pcre-regex \
--without-sqlite \
--with-sqlite3=$SYSROOT_PREFIX/usr \
--enable-sqlite-utf8 \
--disable-pdo \
--without-pdo-sqlite \
--without-pdo-mysql \
make

37
packages/web/php/install Executable file
View File

@ -0,0 +1,37 @@
#!/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/sapi/cgi/php-cgi $INSTALL/usr/bin
mkdir -p $INSTALL/etc
cp $PKG_BUILD/php.ini-production $INSTALL/etc/php.ini
sed -e "s|^doc_root[[:space:]]*=.*$|doc_root = /usr/www|" \
-e "s|^.cgi.force_redirect[[:space:]]*=.*$|cgi.force_redirect = 0|" \
-i $INSTALL/etc/php.ini
mkdir -p $INSTALL/usr/www
echo "<?php" > $INSTALL/usr/www/test.php
echo "phpinfo();" >> $INSTALL/usr/www/test.php
echo "?>" >> $INSTALL/usr/www/test.php

36
packages/web/php/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="php"
PKG_VERSION="5.3.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OpenSource"
PKG_SITE="http://www.php.net"
PKG_URL="http://www.php.net/distributions/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="zlib pcre sqlite curl"
PKG_BUILD_DEPENDS="toolchain zlib pcre sqlite curl"
PKG_PRIORITY="optional"
PKG_SECTION="web"
PKG_SHORTDESC="php: Scripting language especially suited for Web development"
PKG_LONGDESC="PHP is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

2
packages/x11/driver/xf86-video-intel/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-intel"
PKG_VERSION="2.14.902"
PKG_VERSION="2.14.903"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"

2
packages/x11/driver/xf86-video-nvidia/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-nvidia"
PKG_VERSION="270.30"
PKG_VERSION="270.41.03"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"

2
projects/ATV/options
View File

@ -177,7 +177,7 @@
GRAPHIC_DRIVERS="nouveau"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="yes"
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="yes"