From 8414d8e0b69d454afaa7507ac6ca1571c75136e3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 7 Jul 2011 22:01:15 +0200 Subject: [PATCH 1/7] projects/*/options: remove all references to LIBDRM_MASTER and MESA_MASTER, not needed actually Signed-off-by: Stephan Raue --- packages/graphics/libdrm/meta | 5 ----- projects/ATV/options | 6 ------ projects/Fusion/options | 6 ------ projects/Generic/options | 6 ------ projects/ION/options | 6 ------ projects/Intel/options | 6 ------ projects/Ultra/options | 6 ------ 7 files changed, 41 deletions(-) diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index 33f5a84839..10e34c1e1e 100644 --- a/packages/graphics/libdrm/meta +++ b/packages/graphics/libdrm/meta @@ -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 diff --git a/projects/ATV/options b/projects/ATV/options index 76641feb70..b594293d38 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -165,12 +165,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" diff --git a/projects/Fusion/options b/projects/Fusion/options index 96e682a210..227eab0ace 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -165,12 +165,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" diff --git a/projects/Generic/options b/projects/Generic/options index 32dbc3134e..c1b555348c 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -165,12 +165,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" diff --git a/projects/ION/options b/projects/ION/options index f07f9fe601..834f7e2b22 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -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" diff --git a/projects/Intel/options b/projects/Intel/options index 017a56bf36..0247808ff8 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -165,12 +165,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" diff --git a/projects/Ultra/options b/projects/Ultra/options index 05cb12f8c5..3b8297b4d3 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -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" From 56ae900e5088c33ce0701f2f6bc137c7bd417499 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 8 Jul 2011 14:38:19 +0200 Subject: [PATCH 2/7] Mesa: update to Mesa-7.11-b0a4f34 Signed-off-by: Stephan Raue --- packages/graphics/Mesa/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 3ab1ac090d..f06a63325e 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -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" From 268bed238a834d4cd8206bcaa675d298978672f4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 8 Jul 2011 14:39:23 +0200 Subject: [PATCH 3/7] ccache: add option to let set cache size (default now 10GB) Signed-off-by: Stephan Raue --- config/options | 7 +++++++ packages/toolchain/devel/ccache/build | 3 +++ 2 files changed, 10 insertions(+) diff --git a/config/options b/config/options index d2a955d098..18d9a875e0 100644 --- a/config/options +++ b/config/options @@ -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" diff --git a/packages/toolchain/devel/ccache/build b/packages/toolchain/devel/ccache/build index 62b1844030..b09965c025 100755 --- a/packages/toolchain/devel/ccache/build +++ b/packages/toolchain/devel/ccache/build @@ -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 < Date: Fri, 8 Jul 2011 14:40:42 +0200 Subject: [PATCH 4/7] ccache: move script to display stats to /scripts/ccache_stats Signed-off-by: Stephan Raue --- packages/toolchain/devel/ccache/stats => scripts/ccache_stats | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/toolchain/devel/ccache/stats => scripts/ccache_stats (100%) diff --git a/packages/toolchain/devel/ccache/stats b/scripts/ccache_stats similarity index 100% rename from packages/toolchain/devel/ccache/stats rename to scripts/ccache_stats From 211554cf472f3c6d37e5211c4de2a200f165d509 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 8 Jul 2011 16:41:02 +0200 Subject: [PATCH 5/7] projects/*/linux: add support for Zydracon Remotes Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 2 +- projects/Fusion/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.i386.conf | 2 +- projects/ION/linux/linux.x86_64.conf | 2 +- projects/Intel/linux/linux.i386.conf | 2 +- projects/Intel/linux/linux.x86_64.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 138cad2ba5..483b598a31 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1969,7 +1969,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 diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index b111eb1487..87511beef2 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -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 diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 0680d66ef5..f132edb1f1 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -2343,7 +2343,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 diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index b71c681676..c530b498cc 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -2196,7 +2196,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 diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index c2c82d58f4..7c267b5ed0 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2132,7 +2132,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 diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 4eda11d5d9..803a042e26 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -2246,7 +2246,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 diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 5be293c4e2..2ddb55dad6 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2187,7 +2187,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 diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 8897323ef1..270ba1a5b3 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -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 From 1feb22abbd65a44c179d6f78811711eb0d404137 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 8 Jul 2011 21:58:20 +0200 Subject: [PATCH 6/7] eventlircd: add initial support for Zydacron HID remotes (13ec:0006) Signed-off-by: Stephan Raue --- .../eventlircd/evmap/03_13ec_0006.evmap | 46 +++++++++++++++++++ .../eventlircd/udev.d/98-eventlircd.rules | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap diff --git a/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap b/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap new file mode 100644 index 0000000000..a4d96a9bc3 --- /dev/null +++ b/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap @@ -0,0 +1,46 @@ +# Remote 13ec:0006 + + KEY_POWER = 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_MENU # Menu diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index 73e42ce990..e248b688fc 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -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" From 94b6323fa35186c6294a120faa16d54bfdf12b16 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 8 Jul 2011 22:53:14 +0200 Subject: [PATCH 7/7] eventlircd: fix some keymappings for Zydacron HID remotes Signed-off-by: Stephan Raue --- packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap b/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap index a4d96a9bc3..0433596c13 100644 --- a/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap +++ b/packages/sysutils/remote/eventlircd/evmap/03_13ec_0006.evmap @@ -1,6 +1,6 @@ # Remote 13ec:0006 - KEY_POWER = KEY_POWER # Power + KEY_SLEEP = KEY_POWER # Power KEY_1 = KEY_NUMERIC_1 # 1 KEY_2 = KEY_NUMERIC_2 # 2 @@ -43,4 +43,4 @@ KEY_VIDEO = KEY_VIDEO # Videos KEY_DVD = KEY_DVD # DVD/VCD - KEY_MENU = KEY_MENU # Menu + KEY_MENU = KEY_EPG # Menu (used for XBMC's context menu)