Merge pull request #101 from magister52/master

Setup LD_LIBRARY_PATH globally.

packages/addons/service/multimedia/boblightd/addon

@@ -28,9 +28,9 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $PKG_BUILD/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin/boblightd.bin
+  cp -P $PKG_BUILD/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin/boblight-constant.bin
+  cp -P $PKG_BUILD/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin/boblight-X11.bin
+  cp -P $PKG_BUILD/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp -R $PKG_DIR/config/*.sample $ADDON_BUILD/$PKG_ADDON_ID/config

packages/addons/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,6 @@
+2.0.3
+- Removed LD_LIBRARY_PATH dependencies
+
 2.0.2
 - Renamed to boblightd to avoid conflicts
 

packages/addons/service/multimedia/boblightd/config/boblight.conf.sample

@@ -10,7 +10,7 @@ type            momo
 output          /dev/ttyACM0
 channels        75
 prefix		41 64 61 00 18 4D
-interval        10000
+interval        20000
 rate            115200
 debug           off #turn this on to see what it's doing with the serial port
 delayafteropen	1000000

packages/addons/service/multimedia/boblightd/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="2.0.2"
+PKG_VERSION="2.0.3"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"

packages/addons/service/multimedia/boblightd/source/bin/boblight-constant

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.boblightd"
-
-chmod +x $ADDON_DIR/lib/*
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" boblight-constant.bin $@

packages/addons/service/multimedia/boblightd/source/bin/boblightd

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. /etc/profile
-
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.boblightd"
-
-chmod +x $ADDON_DIR/lib/*
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" boblightd.bin $@

packages/addons/service/multimedia/boblightd/source/bin/boblightd.service

@@ -37,8 +37,6 @@ BOBLIGHT_CONFIG="$ADDON_HOME/boblight.conf"
 # Flag file to start boblight-x11 daemon
 BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
 
-export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
-
 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
 
 if [ -e $BOBLIGHT_CONFIG ]; then
@@ -47,7 +45,7 @@ if [ -e $BOBLIGHT_CONFIG ]; then
 	wait_for_xorg
 	
 	# Start the boblight daemon
-	$ADDON_DIR/bin/boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
+	boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
 
 fi
 
@@ -57,6 +55,6 @@ if [ -e $BOBLIGHT_X11 ]; then
         wait_for_xorg
 
         # Start the boblight daemon
-        $ADDON_DIR/bin/boblight-X11 -f >> $LOG_FILE 2>&1
+        boblight-X11 -f >> $LOG_FILE 2>&1
 
 fi

packages/addons/service/multimedia/boblightd/unpack

@@ -4,6 +4,8 @@
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
 #
+#  Boblightd addon maintained by Adam Boeglin: adamrb@gmail.com
+#
 #  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)

packages/mediacenter/xbmc-pvr/init.d/93_xbmc

@@ -36,6 +36,9 @@ fi
 # hack: make addon-bins executable
   chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
 
+# hack: make addon-libs executable
+  chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1
+
 # hack to support user installed fonts
   SUBFONTS="/storage/.xbmc/userdata/fonts"
   if [ -d "$SUBFONTS" ]; then

packages/mediacenter/xbmc/init.d/93_xbmc

@@ -36,6 +36,9 @@ fi
 # hack: make addon-bins executable
   chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
 
+# hack: make addon-libs executable
+  chmod +x /storage/.xbmc/addons/*/lib/* > /dev/null 2>&1
+
 # hack to support user installed fonts
   SUBFONTS="/storage/.xbmc/userdata/fonts"
   if [ -d "$SUBFONTS" ]; then

packages/sysutils/busybox/profile.d/librarypath.conf

@@ -1,9 +1,9 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
 #
+#  Added by Adam Boeglin: adamrb@gmail.com
+#
 #  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)
@@ -19,11 +19,17 @@
 #  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
+# Core (PATH) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
 
-. /etc/profile
+LD_LIBRARY_PATH="/usr/lib:/lib"
 
-ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.boblightd"
+# hack: add addons to $LD_LIBRARY_PATH
+  for i in `find /storage/.xbmc/addons/* -name lib -type d`; do
+    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$i"
+  done
 
-chmod +x $ADDON_DIR/lib/*
+export LD_LIBRARY_PATH
-
-LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" boblight-X11.bin $@