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 remote-tracking branch 'upstream/master' into openelec-settings

Browse Source 
Conflicts:
	packages/sysutils/busybox/install
This commit is contained in:
Stefan Saraev 2013-01-28 23:59:04 +02:00
commit 09ee5e5382
13 changed files with 91 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/linux-drivers/linux-tbs-drivers/build
View File

@ -27,4 +27,6 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers
[ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh
[ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh
LDFLAGS="" make DIR=$(kernel_path) prepare
sed -i -e "s|^CONFIG_IR_LIRC_CODEC=.*$|# CONFIG_IR_LIRC_CODEC is not set|" v4l/.config
LDFLAGS="" make DIR=$(kernel_path)

2
packages/sysutils/e2fsprogs/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="e2fsprogs"
PKG_VERSION="1.42.6"
PKG_VERSION="1.42.7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/sysutils/ntfs-3g_ntfsprogs/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="ntfs-3g_ntfsprogs"
PKG_VERSION="2012.1.15"
PKG_VERSION="2013.1.13"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

8
packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch
View File

@ -1,14 +1,12 @@
diff --git a/udev/lircd_helper.in b/udev/lircd_helper.in
index f580cc6..6befeed 100644
index f580cc6..d4d7f3f 100644
--- a/udev/lircd_helper.in
+++ b/udev/lircd_helper.in
@@ -41,7 +41,11 @@ case "${ACTION}" in
daemon="${daemon} --uinput"
- daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}"
- daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid"
daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}"
daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid"
- daemon="${daemon} ${lircd_conf}"
+ daemon="${daemon} --output=@localstatedir@/run/lirc/lircd"
+ daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid"
+ if test -e "/storage/.config/lircd.conf" ; then
+ daemon="${daemon} /storage/.config/lircd.conf"
+ else

20
packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
View File

@ -20,6 +20,11 @@ SUBSYSTEM=="lirc", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf"
### Microsoft Xbox DVD dongle
SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
#-------------------------------------------------------------------------------
# Ask lircd_helper to handle USB devices that do not show up as lirc devices
# and are supported by lircd. Remote controls that are USB HID devices that show
@ -36,21 +41,6 @@ ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \
ENV{lircd_driver}="dvico", \
ENV{lircd_conf}="/etc/lirc/lircd.conf"
### Microsoft Xbox DVD dongle
ENV{ID_VENDOR_ID}=="045e", ENV{ID_MODEL_ID}=="0284", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
### Gamester Xbox DVD dongle
ENV{ID_VENDOR_ID}=="040b", ENV{ID_MODEL_ID}=="6521", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
### Chinese Manufacturers Xbox DVD dongle
ENV{ID_VENDOR_ID}=="ffff", ENV{ID_MODEL_ID}=="ffff", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
# Enable wake-on-usb for the USB remotes.
ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="wakeup_enable"

94
packages/sysutils/remote/lirc/config/lircd.conf.xbox
View File

@ -1,43 +1,63 @@
# Please make this file available to others
# by sending it to <lirc@bartelmus.de>
#
# this config file was automatically generated
# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013
#
# contributed by
#
# brand: xbox.conf
# model no. of remote control:
# devices being controlled by this remote:
#
begin remote
name XboxDVDDongle
bits 8
eps 30
aeps 100
name xbox.conf
bits 8
eps 30
aeps 100
one 0 0
zero 0 0
gap 163983
toggle_bit_mask 0x0
one 0 0
zero 0 0
gap 63985
min_repeat 13
# suppress_repeat 13
# uncomment to suppress unwanted repeats
# toggle_bit_mask 0x72
toggle_bit_mask 0xE1
begin codes
LEFT 0xA9
UP 0xA6
RIGHT 0xA8
DOWN 0xA7
SELECT 0x0B
1 0xCE
2 0xCD
3 0xCC
4 0xCB
5 0xCA
6 0xC9
7 0xC8
8 0xC7
9 0xC6
0 0xCF
MENU 0xF7
DISPLAY 0xD5
REVERSE 0xE2
FORWARD 0xE3
PLAY 0xEA
PAUSE 0xE6
STOP 0xE0
SKIP- 0xDD
SKIP+ 0xDF
TITLE 0xE5
INFO 0xC3
BACK 0xD8
end codes
begin codes
KEY_OK 0xEA
KEY_STOP 0xE0
KEY_PAUSE 0xE6
KEY_NEXT 0xDF
KEY_PREVIOUS 0xDD
KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2
KEY_PROG1 0xD5
KEY_TITLE 0xE5
KEY_INFO 0xC3
KEY_OK 0x0B
KEY_UP 0xA6
KEY_DOWN 0xA7
KEY_LEFT 0xA9
KEY_RIGHT 0xA8
KEY_MENU 0xF7
KEY_BACK 0xD8
KEY_0 0xCF
KEY_1 0xCE
KEY_2 0xCD
KEY_3 0xCC
KEY_4 0xCB
KEY_5 0xCA
KEY_6 0xC9
KEY_7 0xC8
KEY_8 0xC7
KEY_9 0xC6
end codes
end remote

2
packages/sysutils/systemd/build
View File

@ -74,7 +74,7 @@ ac_cv_func_malloc_0_nonnull=yes \
--disable-localed \
--disable-coredump \
--enable-gudev \
--disable-keymap \
--enable-keymap \
--disable-manpages \
--enable-split-usr \
--with-firmware-path="/storage/.config/firmware:/lib/firmware" \

10
packages/sysutils/systemd/install
View File

@ -54,10 +54,20 @@ mkdir -p $INSTALL/lib/systemd
done
cp $PKG_BUILD/mtd_probe $INSTALL/lib/udev
cp $PKG_BUILD/.libs/keymap $INSTALL/lib/udev
cp $PKG_BUILD/src/udev/keymap/findkeyboards $INSTALL/lib/udev
cp $PKG_BUILD/src/udev/keymap/keyboard-force-release.sh $INSTALL/lib/udev
mkdir -p $INSTALL/lib/udev/keymaps
cp $PKG_BUILD/keymaps/* $INSTALL/lib/udev/keymaps
mkdir -p $INSTALL/lib/udev/keymaps/force-release
cp $PKG_BUILD/keymaps-force-release/* $INSTALL/lib/udev/keymaps/force-release
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/*.rules $INSTALL/lib/udev/rules.d
rm -rf $INSTALL/lib/udev/rules.d/80-net-name-slot.rules
rm -rf $INSTALL/lib/udev/rules.d/99-systemd.rules
cp $PKG_BUILD/src/udev/keymap/*.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/lib/udev/hwdb.d
cp $PKG_BUILD/hwdb/*.hwdb $INSTALL/lib/udev/hwdb.d

4
packages/sysutils/systemd/udev.d/80-clock.rules
View File

@ -1,2 +1,2 @@
ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k"
ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k"
ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k"
ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k"

2
packages/x11/app/xkbcomp/build
View File

@ -24,10 +24,10 @@
cd $PKG_BUILD
ac_cv_file___xkbparse_c=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--with-xkb-config-root=$XORG_PATH_XKB \
make

3
packages/x11/data/xkeyboard-config/build
View File

@ -34,10 +34,11 @@ XKBCOMP="/usr/bin/xkbcomp" \
--sysconfdir=/etc \
--without-xsltproc \
--enable-compat-rules \
--enable-runtime-deps \
--enable-nls \
--disable-rpath \
--with-xkb-base=$XORG_PATH_XKB \
--without-xkb-rules-symlink \
--with-xkb-rules-symlink=xorg \
--with-gnu-ld \
make

1
packages/x11/lib/libX11/build
View File

@ -42,7 +42,6 @@ cd $PKG_BUILD
--disable-xcms \
--enable-xlocale \
--enable-xkb \
--disable-xlocaledir \
--disable-xf86bigfont \
--enable-malloc0returnsnull \
--disable-specs \

6
packages/x11/lib/libX11/install
View File

@ -25,3 +25,9 @@
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libX11*.so*T
mkdir -p $INSTALL/usr/share/X11
cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11
mkdir -p $INSTALL/usr/lib/X11
cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11