diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index e04de2055..c932f9890 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ -# Version : $Revision: 1.5 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -84,6 +84,8 @@ GTK_DIR = ${TOOLS_DIR}/gtk+ GTK_VERSION = gtk+-2.6.1 GTKMM_DIR = ${TOOLS_DIR}/gtkmm GTKMM_VERSION = gtkmm-2.5.5 +GSTREAMER_DIR = ${TOOLS_DIR}/gstreamer +GSTREAMER_VERSION = gstreamer-0.8.10 ICU_DIR = ${TOOLS_DIR}/icu ICU_VERSION = icu-3.0 CURL_DIR = ${TOOLS_DIR}/curl @@ -177,6 +179,7 @@ ${TMP_DIR}/tools_setup.stamp: ${HELIX_DIR}/${HELIX_VERSION}/bin/install.sh ${GTK_DIR}/${GTK_VERSION}/bin/install.sh ${GTKMM_DIR}/${GTKMM_VERSION}/bin/install.sh + ${GSTREAMER_DIR}/${GSTREAMER_VERSION}/bin/install.sh ${LIBXMLXX_DIR}/${LIBXMLXX_VERSION}/bin/install.sh ${ICU_DIR}/${ICU_VERSION}/bin/install.sh ${CURL_DIR}/${CURL_VERSION}/bin/install.sh diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh new file mode 100755 index 000000000..6de8114a5 --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/install.sh @@ -0,0 +1,74 @@ +#!/bin/sh +#------------------------------------------------------------------------------- +# Copyright (c) 2004 Media Development Loan Fund +# +# This file is part of the LiveSupport project. +# http://livesupport.campware.org/ +# To report bugs, send an e-mail to bugs@campware.org +# +# LiveSupport 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 of the License, or +# (at your option) any later version. +# +# LiveSupport 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 LiveSupport; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# Author : $Author: maroy $ +# Version : $Revision: 1.1 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/gstreamer/gstreamer-0.8.10/bin/Attic/install.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# Run this script to install gstreamer into the development system usr +# environment. +# To read more about gstreamer, see http://gstreamer.freedesktop.org/ +#------------------------------------------------------------------------------- +product=gstreamer-0.8.10 +plugins=gst-plugins-0.8.9 + +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd;` +installdir=`cd $basedir/../../../usr; pwd;` +tmpdir=$basedir/tmp +etcdir=$basedir/etc +gstreamer_tar=$basedir/src/$product.tar.bz2 +plugins_tar=$basedir/src/$plugins.tar.bz2 + +export PATH=$installdir/bin:$PATH +export LD_LIBRARY_PATH=$installdir/lib:$LD_LIBRARY_PATH +export PKG_CONFIG_PATH=$installdir/lib/pkgconfig + + +mkdir -p $tmpdir + +echo "installing $product from $basedir to $installdir" + +cd $tmpdir +tar xfj $gstreamer_tar +cd $product +./configure --prefix=$installdir +make install + + +echo "installing $plugins from $basedir to $installdir" + +cd $tmpdir +tar xfj $plugins_tar +cd $plugins +patch -p1 < $etcdir/adder-fix.diff +# --disable-spc is a workaround for gst-plugins-0.8.9, as some APU.c file +# is missing from there. remove this when later versions come around +./configure --disable-spc --prefix=$installdir +make install + + +cd $basedir +rm -rf tmp + diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/adder-fix.diff b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/adder-fix.diff new file mode 100644 index 000000000..f8b6a3352 --- /dev/null +++ b/livesupport/tools/gstreamer/gstreamer-0.8.10/etc/adder-fix.diff @@ -0,0 +1,25 @@ +--- gst-plugins-0.8.9/gst/adder/gstadder.c 2005-05-25 13:30:00.000000000 +0200 ++++ gst-plugins-0.8.9-livesupport/gst/adder/gstadder.c 2005-05-27 15:12:38.000000000 +0200 +@@ -151,21 +151,7 @@ + + if (otherpad != pad) { + ret = gst_pad_try_set_caps (otherpad, caps); +- if (GST_PAD_LINK_FAILED (ret)) { +- return ret; +- } +- } +- pads = g_list_next (pads); +- } +- +- +- pads = gst_element_get_pad_list (GST_ELEMENT (adder)); +- while (pads) { +- GstPad *otherpad = GST_PAD (pads->data); +- +- if (otherpad != pad) { +- ret = gst_pad_try_set_caps (otherpad, caps); +- if (GST_PAD_LINK_FAILED (ret)) { ++ if (ret == GST_PAD_LINK_REFUSED) { + return ret; + } + } diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gst-plugins-0.8.9.tar.bz2 b/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gst-plugins-0.8.9.tar.bz2 new file mode 100644 index 000000000..fe054bcd0 Binary files /dev/null and b/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gst-plugins-0.8.9.tar.bz2 differ diff --git a/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gstreamer-0.8.10.tar.bz2 b/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gstreamer-0.8.10.tar.bz2 new file mode 100644 index 000000000..2e0177cad Binary files /dev/null and b/livesupport/tools/gstreamer/gstreamer-0.8.10/src/gstreamer-0.8.10.tar.bz2 differ