Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr

This commit is contained in:
Stephan Raue 2011-07-09 00:04:29 +02:00
commit 528628e436
21 changed files with 70 additions and 51 deletions

View File

@ -57,6 +57,13 @@ fi
# multi-processor computer (like hyperthreading SMP CPU)
CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
# cache size for ccache
# Set the maximum size of the files stored in the cache. You can specify a
# value in gigabytes, megabytes or kilobytes by appending a G, M or K to the
# value. The default is gigabytes. The actual value stored is rounded down to
# the nearest multiple of 16 kilobytes.
CCACHE_CACHE_SIZE="10G"
# forcing install of all packages (yes/no)
FORCE_INSTALL="no"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="Mesa"
PKG_VERSION="7.11-b90c710"
PKG_VERSION="7.11-b0a4f34"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -34,8 +34,3 @@ PKG_LONGDESC="The userspace interface library to kernel DRM services."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$LIBDRM_MASTER" = "yes" ]; then
PKG_VERSION="5cb554a"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
fi

View File

@ -0,0 +1,46 @@
# Remote 13ec:0006
KEY_SLEEP = KEY_POWER # Power
KEY_1 = KEY_NUMERIC_1 # 1
KEY_2 = KEY_NUMERIC_2 # 2
KEY_3 = KEY_NUMERIC_3 # 3
KEY_4 = KEY_NUMERIC_4 # 4
KEY_5 = KEY_NUMERIC_5 # 5
KEY_6 = KEY_NUMERIC_6 # 6
KEY_7 = KEY_NUMERIC_7 # 7
KEY_8 = KEY_NUMERIC_8 # 8
KEY_9 = KEY_NUMERIC_9 # 9
KEY_0 = KEY_NUMERIC_0 # 0
KEY_UP = KEY_UP # Up Arrow
KEY_DOWN = KEY_DOWN # Down Arrow
KEY_LEFT = KEY_LEFT # Left Arrow
KEY_RIGHT = KEY_RIGHT # Right Arrow
KEY_BACKSPACE = KEY_EXIT # Backspace
KEY_ENTER = KEY_OK # Enter
KEY_PLAYPAUSE = KEY_PLAY # Play/Pause
KEY_STOPCD = KEY_STOP # Stop
KEY_RECORD = KEY_RECORD # Record
KEY_PREVIOUSSONG = KEY_PREVIOUS # Prev
KEY_NEXTSONG = KEY_NEXT # Next
KEY_REWIND = KEY_REWIND # Rev
KEY_FASTFORWARD = KEY_FASTFORWARD # Fwd
KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol -
KEY_VOLUMEUP = KEY_VOLUMEUP # Vol +
KEY_MUTE = KEY_MUTE # Mute
KEY_CHANNELUP = KEY_CHANNELUP # CH/PG up
KEY_CHANNELDOWN = KEY_CHANNELDOWN # CH/PG down
KEY_PVR = KEY_PROG1 # Home
KEY_TV = KEY_TV # Live TV
KEY_AUDIO = KEY_AUDIO # Audio
KEY_AUX = KEY_CAMERA # Photo
KEY_VIDEO = KEY_VIDEO # Videos
KEY_DVD = KEY_DVD # DVD/VCD
KEY_MENU = KEY_EPG # Menu (used for XBMC's context menu)

View File

@ -119,6 +119,10 @@ ENV{ID_VENDOR_ID}=="0755", ENV{ID_MODEL_ID}=="2626", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
ENV{ID_VENDOR_ID}=="13ec", ENV{ID_MODEL_ID}=="0006", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
ENV{ID_VENDOR_ID}=="147a", ENV{ID_MODEL_ID}=="e02d", \
ENV{eventlircd_enable}="true", \
ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"

View File

@ -34,6 +34,9 @@ make
mkdir -p $ROOT/$TOOLCHAIN/bin
cp -f ccache $ROOT/$TOOLCHAIN/bin
# setup ccache
$ROOT/$TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE
cat > $HOST_CC <<EOF
#!/bin/sh
$ROOT/$TOOLCHAIN/bin/ccache $LOCAL_CC "\$@"

View File

@ -1973,7 +1973,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -168,12 +168,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nouveau"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="yes"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"

View File

@ -2149,7 +2149,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -168,12 +168,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
GRAPHIC_DRIVERS="fglrx"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="no"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"

View File

@ -2347,7 +2347,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -168,12 +168,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965 r200 r300 fglrx nvidia vmware"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="no"
# Use VDPAU video# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"

View File

@ -2200,7 +2200,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -2136,7 +2136,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -168,12 +168,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="no"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"

View File

@ -2250,7 +2250,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -2191,7 +2191,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -168,12 +168,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="i965"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="no"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"

View File

@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/x86_64 3.0.0-rc5 Kernel Configuration
# Linux/x86_64 3.0.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@ -2015,7 +2015,7 @@ CONFIG_HID_TOPSEED=y
# CONFIG_HID_THRUSTMASTER is not set
# CONFIG_HID_WACOM is not set
# CONFIG_HID_ZEROPLUS is not set
# CONFIG_HID_ZYDACRON is not set
CONFIG_HID_ZYDACRON=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y

View File

@ -165,12 +165,6 @@
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia"
# use libdrm-master (latest git) instead latest released version
LIBDRM_MASTER="no"
# use Mesa-master (latest git) instead latest released version
MESA_MASTER="no"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"