Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/linux-drivers/bcm_sta/build

@@ -27,4 +27,4 @@ cd $PKG_BUILD
 [ "$TARGET_ARCH" = "i386" ] && cd x86-32
 [ "$TARGET_ARCH" = "x86_64" ] && cd x86-64
 
-KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd`
+KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$ARCH

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-002-Makefile.patch

@@ -1,19 +1,8 @@
+diff --git a/x86-32/Makefile b/x86-32/Makefile
+index bf30b03..d835350 100644
 --- a/x86-32/Makefile
 +++ b/x86-32/Makefile
-@@ -113,6 +113,12 @@ ifeq ($(APIFINAL),WEXT)
+@@ -125,7 +125,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
-   $(info Using Wireless Extension API)
- endif
- 
-+ifeq ($(shell dpkg --print-architecture),amd64)
-+BINARCH = x86_64
-+else
-+BINARCH = i386
-+endif
-+
- obj-m              += wl.o
- 
- wl-objs            := 
-@@ -125,7 +131,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
  EXTRA_CFLAGS       += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
  #EXTRA_CFLAGS       += -DBCMDBG_ASSERT
  
@@ -22,23 +11,11 @@
  
  KBASE              ?= /lib/modules/`uname -r`
  KBUILD_DIR         ?= $(KBASE)/build
-
+diff --git a/x86-64/Makefile b/x86-64/Makefile
+index bf30b03..d835350 100644
 --- a/x86-64/Makefile
 +++ b/x86-64/Makefile
-@@ -113,6 +113,12 @@ ifeq ($(APIFINAL),WEXT)
+@@ -125,7 +125,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
-   $(info Using Wireless Extension API)
- endif
- 
-+ifeq ($(shell dpkg --print-architecture),amd64)
-+BINARCH = x86_64
-+else
-+BINARCH = i386
-+endif
-+
- obj-m              += wl.o
- 
- wl-objs            := 
-@@ -125,7 +131,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
  EXTRA_CFLAGS       += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
  #EXTRA_CFLAGS       += -DBCMDBG_ASSERT
  

packages/linux-drivers/tbs-linux-drivers/build

@@ -28,7 +28,6 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers
 [ "$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
 
 find . -iname *.c | xargs sed -i -e "s|__devinit||"
 find . -iname *.h | xargs sed -i -e "s|__devinit||"

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

@@ -2,15 +2,17 @@ diff --git a/udev/lircd_helper.in b/udev/lircd_helper.in
 index f580cc6..d4d7f3f 100644
 --- a/udev/lircd_helper.in
 +++ b/udev/lircd_helper.in
-@@ -41,7 +41,11 @@ case "${ACTION}" in
+@@ -41,7 +41,13 @@
              daemon="${daemon} --uinput"
              daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}"
              daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid"
 -            daemon="${daemon} ${lircd_conf}"
 +            if test -e "/storage/.config/lircd.conf" ; then
 +                daemon="${daemon} /storage/.config/lircd.conf"
-+            else
++            elif test -e "${lircd_conf}" ; then
 +                daemon="${daemon} ${lircd_conf}"
++            else
++                exit 1
 +            fi
              ${daemon}
              for devlink in ${DEVLINKS} ; do

projects/ARCTIC_MC/linux/linux.x86_64.conf

@@ -1911,7 +1911,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/ATV/linux/linux.i386.conf

@@ -1819,7 +1819,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Fusion/linux/linux.i386.conf

@@ -2038,7 +2038,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Fusion/linux/linux.x86_64.conf

@@ -1994,7 +1994,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Generic/linux/linux.i386.conf

@@ -2120,7 +2120,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Generic/linux/linux.x86_64.conf

@@ -2079,7 +2079,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Generic_OSS/linux/linux.i386.conf

@@ -2118,7 +2118,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/ION/linux/linux.i386.conf

@@ -2046,7 +2046,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/ION/linux/linux.x86_64.conf

@@ -1984,7 +1984,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Intel/linux/linux.i386.conf

@@ -2064,7 +2064,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Intel/linux/linux.x86_64.conf

@@ -2003,7 +2003,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/RPi/linux/linux.arm.conf

@@ -1502,7 +1502,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Ultra/linux/linux.x86_64.conf

@@ -1897,7 +1897,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Virtual/linux/linux.i386.conf

@@ -2120,7 +2120,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m

projects/Virtual/linux/linux.x86_64.conf

@@ -2079,7 +2079,7 @@ CONFIG_RC_CORE=m
 CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
-# CONFIG_IR_LIRC_CODEC is not set
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m