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

packages/3rdparty/multimedia/vdr/init.d/42_vdr

@@ -1,38 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-(
-  progress "### Starting VDR ###"
-
-  PLUGINS=""
-  for file in /storage/.config/vdr/plugins.d/*; do
-    PLUGIN=""
-    OPTIONS=""
-    INITCMD=""
-    ENABLED=yes
-    . $file
-    [ "$ENABLED" = yes ] && PLUGINS="$PLUGINS -P'$PLUGIN $OPTIONS'"
-    [ -n "$INITCMD" ] && eval $INITCMD
-  done
-
-  VDRCMD="vdr -g /tmp -s /usr/bin/vdrshutdown --vfat --no-kbd $PLUGINS > /tmp/vdr.out 2>&1"
-
-  runvdr "$VDRCMD"
-)&

packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop

@@ -31,5 +31,5 @@ mkdir -p "$LOCKDIR"
 touch "$LOCKDIR/$LOCKFILE"
 
 if [ "$(pidof $ADDON_BIN)" ];then
-  killall $ADDON_BIN
+  killall -9 $ADDON_BIN
 fi

packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi.sample

@@ -0,0 +1,68 @@
+pcm.!default {
+        type plug
+        slave {
+                pcm "both"
+        }
+}
+
+pcm.both {
+        type route
+        slave {
+                pcm multi
+                channels 4
+        }
+        ttable.0.0 1.0
+        ttable.1.1 1.0
+        ttable.0.2 1.0
+        ttable.1.3 1.0
+}
+
+pcm.multi {
+        type multi
+        slaves.a {
+                pcm "hdmi_hw"
+                channels 2
+        }
+        slaves.b {
+                pcm "analog_hw"
+                channels 2
+        }
+        bindings.0.slave a
+        bindings.0.channel 0
+        bindings.1.slave a
+        bindings.1.channel 1
+        bindings.2.slave b
+        bindings.2.channel 0
+        bindings.3.slave b
+        bindings.3.channel 1
+}
+
+pcm.hdmi_hw {
+        type hw
+        card 1
+        device 9
+        channels 2
+}
+
+pcm.hdmi_formatted {
+        type plug
+        slave {
+                pcm hdmi_hw
+                rate 48000
+                channels 2
+        }
+}
+
+pcm.hdmi_complete {
+        type softvol
+        slave.pcm hdmi_formatted
+        control.name hdmi_volume
+        control.card 1
+}
+
+pcm.analog_hw {
+        type hw
+        card 0
+        device 0
+        channels 2
+}

projects/Fusion/linux/linux.i386.conf

@@ -1125,6 +1125,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Fusion/linux/linux.x86_64.conf

@@ -1083,6 +1083,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Generic/linux/linux.i386.conf

@@ -1178,6 +1178,9 @@ CONFIG_8139TOO_PIO=y
 CONFIG_8139TOO_TUNE_TWISTER=y
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Generic_OSS/linux/linux.i386.conf

@@ -1177,6 +1177,9 @@ CONFIG_8139TOO_PIO=y
 CONFIG_8139TOO_TUNE_TWISTER=y
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/ION/linux/linux.i386.conf

@@ -1130,6 +1130,9 @@ CONFIG_FORCEDETH=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/ION/linux/linux.x86_64.conf

@@ -1079,6 +1079,9 @@ CONFIG_FORCEDETH=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Intel/linux/linux.i386.conf

@@ -1139,6 +1139,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Intel/linux/linux.x86_64.conf

@@ -1089,6 +1089,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Ultra/linux/linux.x86_64.conf

@@ -1056,6 +1056,9 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Virtual/linux/linux.i386.conf

@@ -1147,6 +1147,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Virtual/linux/linux.x86_64.conf

@@ -1097,6 +1097,9 @@ CONFIG_SKY2=y
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
+CONFIG_R8168=y
+CONFIG_R8168_NAPI=y
+CONFIG_R8168_VLAN=y
 CONFIG_R8169=y
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set

projects/Virtual/options

@@ -299,5 +299,5 @@
   ADDON_SERVER_URL="http://addons.openelec.tv"
 
 # set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
+  ADDON_PATH="$ADDON_VERSION/Intel/$TARGET_ARCH"
   ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

scripts/create_addon

@@ -69,19 +69,19 @@ if [ -f $PKG_DIR/addon ]; then
     if [ -f $PKG_DIR/source/default.py ]; then
       cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
+      echo "*** WARNING: You *probably* need at least $PKG_DIR/source/default.py to make your addon work ***"
     fi
 
     if [ -f $PKG_DIR/icon/icon.png ]; then
       cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** WARNING: its recommended to have an $PKG_DIR/icon/icon.png ***"
+      echo "*** WARNING: It's recommended to have a $PKG_DIR/icon/icon.png file ***"
     fi
 
     if [ -f $PKG_DIR/changelog.txt ]; then
       cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
     else
-      echo "*** WARNING: its recommended to have an $PKG_DIR/changelog.txt ***"
+      echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***"
     fi
 
     if [ -d $ADDON_BUILD/mkimage ]; then