diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh index 6c73a81e6..94677ada7 100755 --- a/livesupport/bin/copyInstall.sh +++ b/livesupport/bin/copyInstall.sh @@ -21,8 +21,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ -# Version : $Revision: 1.11 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.12 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -46,6 +46,7 @@ tmpdir=$basedir/tmp toolsdir=$basedir/tools modules_dir=$basedir/modules products_dir=$basedir/products +gstreamer_lib_dir=$modules_dir/gstreamerElements/lib usrdir=`cd $basedir/usr; pwd;` @@ -161,6 +162,19 @@ cp -pPR $usrdir/lib/* $install_lib cp -pPR $usrdir/etc/* $install_etc +#------------------------------------------------------------------------------- +# Copy our gstreamer elements and create the gstreamer registry +#------------------------------------------------------------------------------- +gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` + +cp -pPR $modules_dir/gstreamerElements/lib/lib*.so $gstreamer_dir + +export LD_LIBRARY_PATH=$install_lib +export GST_REGISTRY=$install_etc/gst-registry.xml +export GST_PLUGIN_PATH=$gstreamer_dir +$usrdir/bin/gst-register > /dev/null 2>&1 + + #------------------------------------------------------------------------------- # Copy scheduler related files #------------------------------------------------------------------------------- diff --git a/livesupport/products/gLiveSupport/bin/gLiveSupport.sh b/livesupport/products/gLiveSupport/bin/gLiveSupport.sh index 03134d4ab..da22478d2 100755 --- a/livesupport/products/gLiveSupport/bin/gLiveSupport.sh +++ b/livesupport/products/gLiveSupport/bin/gLiveSupport.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.2 $ +# Version : $Revision: 1.3 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/bin/gLiveSupport.sh,v $ #------------------------------------------------------------------------------- @@ -46,9 +46,13 @@ tmpdir=$basedir/tmp #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- +gstreamer_dir=`find $libdir -type d -name "gstreamer-*"` + export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH export GDK_PIXBUF_MODULE_FILE=$etcdir/gtk-2.0/gdk-pixbuf.loaders export PANGO_RC_FILE=$etcdir/pango/pango.rc +export GST_REGISTRY=$etcdir/gst-registry.xml +export GST_PLUGIN_PATH=$gstreamer_dir gLiveSupport_exe=$bindir/gLiveSupport config_file=$etcdir/gLiveSupport.xml diff --git a/livesupport/products/scheduler/bin/scheduler.sh b/livesupport/products/scheduler/bin/scheduler.sh index 523f22305..3ae8ebf95 100755 --- a/livesupport/products/scheduler/bin/scheduler.sh +++ b/livesupport/products/scheduler/bin/scheduler.sh @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/bin/scheduler.sh,v $ #------------------------------------------------------------------------------- @@ -43,7 +43,11 @@ libdir=$basedir/lib #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- +gstreamer_dir=`find $libdir -type d -name "gstreamer-*"` + export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH +export GST_REGISTRY=$etcdir/gst-registry.xml +export GST_PLUGIN_PATH=$gstreamer_dir scheduler_exe=$bindir/scheduler config_file=$etcdir/scheduler.xml