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

packages/3rdparty/driver/dvbhdhomerun/meta

@@ -1,35 +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
-################################################################################
-
-PKG_NAME="dvbhdhomerun"
-PKG_VERSION="0.0.10"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
-PKG_URL="http://downloads.sourceforge.net/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libhdhomerun"
-PKG_PRIORITY="optional"
-PKG_SECTION="driver/dvb"
-PKG_SHORTDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)."
-PKG_LONGDESC="A linux DVB driver and userspace application for the HDHomeRun TV tuner (http://www.silicondust.com)."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"

packages/addons/driver/hdhomerun/addon

@@ -24,10 +24,3 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
   cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $ADDON_BUILD/$PKG_ADDON_ID/bin/
-  cp -Pa $BUILD/libhdhomerun_*/hdhomerun_config $ADDON_BUILD/$PKG_ADDON_ID/bin/
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -Pa $BUILD/libhdhomerun_*/libhdhomerun.so $ADDON_BUILD/$PKG_ADDON_ID/lib/

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,7 @@
+2.1.4
+- binary files are stored with OpenELEC image
+  addon is used to start userspace program
+
 2.1.3
 - bump addon version for new kernel
 

packages/addons/driver/hdhomerun/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="2.0"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libhdhomerun dvbhdhomerun"
+PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -54,8 +54,6 @@ if [ -z "$(pidof userhdhomerun)" ]; then
   mkdir -p /var/log/
   rm -f /var/log/dvbhdhomerun.log
   
-  export LD_LIBRARY_PATH=$ADDON_DIR/lib
-
   userhdhomerun -f
   # how much time should we wait?
   usleep 1000000

packages/linux-drivers/dvbhdhomerun/build

@@ -31,3 +31,8 @@ cd $PKG_BUILD/userhdhomerun
   sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" hdhomerun_tuner.cpp
 
   make LDFLAGS="-lpthread"
+  $STRIP build/userhdhomerun
+  
+cd ../kernel
+  LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path)
+  fix_module_depends dvb_hdhomerun_core.ko "dvb_core"

packages/linux-drivers/dvbhdhomerun/install

@@ -22,9 +22,14 @@
 
 . config/options $1
 
-$SCRIPTS/unpack dvbhdhomerun
+KERNEL_VER=$(ls $BUILD/linux*/modules/lib/modules)
 
+mkdir -p $INSTALL/lib/modules/$KERNEL_VER/hdhomerun
+  cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$KERNEL_VER/hdhomerun/
 
-cd $BUILD/dvbhdhomerun-*/kernel
+mkdir -p $INSTALL/usr/sbin
-  LDFLAGS="" make dvb_hdhomerun KERNEL_DIR=$(kernel_path)
+  cp -Pa $BUILD/dvbhdhomerun-*/userhdhomerun/build/userhdhomerun $INSTALL/usr/sbin
-  fix_module_depends dvb_hdhomerun_core.ko "dvb_core"
+  cp -Pa $BUILD/libhdhomerun_*/hdhomerun_config $INSTALL/usr/sbin
+
+mkdir -p $INSTALL/lib/
+  cp -Pa $BUILD/libhdhomerun_*/libhdhomerun.so $INSTALL/lib/

packages/linux-drivers/dvbhdhomerun/meta

@@ -18,15 +18,15 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="hdhomerun-driver"
+PKG_NAME="dvbhdhomerun"
-PKG_VERSION="0.0.10"
+PKG_VERSION="20120831"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
-PKG_URL=""
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain linux"
+PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun TV tuner (http://www.silicondust.com)."

packages/linux-drivers/hdhomerun-driver/install

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      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
-################################################################################
-
-. config/options $1
-
-VER=`ls $BUILD/linux*/modules/lib/modules`
-
-mkdir -p $INSTALL/lib/modules/$VER/hdhomerun
-  cp $BUILD/dvbhdhomerun-*/kernel/*.ko $INSTALL/lib/modules/$VER/hdhomerun/

projects/ATV/options

@@ -158,7 +158,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Fusion/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Generic/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Generic_OSS/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/ION/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Intel/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/RPi/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Ultra/options

@@ -157,7 +157,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU"
+  ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"

projects/Virtual/options

@@ -152,7 +152,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU vboxguest"
+  ADDITIONAL_DRIVERS="RTL8192CU vboxguest dvbhdhomerun"
 
 # build with network support (yes / no)
   NETWORK="yes"