diff --git a/campcaster/doc/developmentTools.html b/campcaster/doc/developmentTools.html index be65676a0..e03e6f7e2 100644 --- a/campcaster/doc/developmentTools.html +++ b/campcaster/doc/developmentTools.html @@ -101,6 +101,7 @@ system:
  • libtar >= 1.2.11
  • gstreamer >= 0.10.17
    • including at least gst-plugins-good; also gst-plugins-ugly if you want mp3 playback +
  • libserial >= 0.5.2
    • diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index c547c64e4..e2a079c78 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -109,8 +109,6 @@ XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++ XMLRPCXX_VERSION = xmlrpc++-20040713 TAGLIB_DIR = ${TOOLS_DIR}/taglib TAGLIB_VERSION = taglib-1.4 -LIBSERIAL_DIR = ${TOOLS_DIR}/libserial -LIBSERIAL_VERSION = libserial-0.5.2 PEAR_DIR = ${TOOLS_DIR}/pear MODULES_DIR = ${SRC_DIR}/modules @@ -215,9 +213,6 @@ endif cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix} ${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install - cd ${LIBSERIAL_DIR}/${LIBSERIAL_VERSION} && ./configure --prefix=${prefix} - ${MAKE} -C ${LIBSERIAL_DIR}/${LIBSERIAL_VERSION} install - cd ${PEAR_DIR} && ./configure --prefix=${prefix} ${MAKE} -C ${PEAR_DIR} install @@ -230,7 +225,6 @@ endif -${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean -${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean -${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean - -${MAKE} -C ${LIBSERIAL_DIR}/${LIBSERIAL_VERSION} distclean ${RM} ${TMP_DIR}/tools_setup.stamp doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp diff --git a/campcaster/etc/configure.ac b/campcaster/etc/configure.ac index f12681ea8..edaae11c3 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -375,7 +375,6 @@ by Campcaster: libodbc++ 0.2.3 yes taglib 1.4 yes xmlrpc++ 2004-07-13 yes - libserial 0.5.2 yes using the following configuration settings: diff --git a/campcaster/etc/debian/control b/campcaster/etc/debian/control index ccb833d38..0b1663a4e 100644 --- a/campcaster/etc/debian/control +++ b/campcaster/etc/debian/control @@ -53,7 +53,8 @@ Build-Depends: debhelper (>= 4.0.0), php5-gd, postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1), postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1), - libgstreamer0.10-dev (>= 0.10.17) + libgstreamer0.10-dev (>= 0.10.17), + libserial-dev (>= 0.5.2) Standards-Version: 3.6.1 Package: campcaster-libs @@ -161,7 +162,8 @@ Depends: ${shlibs:Depends}, libicu34 | libicu36 | libicu38, libgtk2.0-0 (>= 2.6.10), libgtkmm-2.4-1c2a (>= 1:2.6.5), - libglademm-2.4-1c2a (>= 2.6.2) + libglademm-2.4-1c2a (>= 2.6.2), + libserial0 (>= 0.5.2) Description: A radio program automation and support tool. Campcaster is the first free and open radio management software that provides live studio broadcast capabilities as well as remote automation diff --git a/campcaster/src/products/gLiveSupport/etc/Makefile.in b/campcaster/src/products/gLiveSupport/etc/Makefile.in index 0a0e77604..69ca87416 100644 --- a/campcaster/src/products/gLiveSupport/etc/Makefile.in +++ b/campcaster/src/products/gLiveSupport/etc/Makefile.in @@ -186,6 +186,9 @@ GSTREAMER_LIBS=@GSTREAMER_LIBS@ GSTCONTROLLER_CFLAGS=@GSTCONTROLLER_CFLAGS@ GSTCONTROLLER_LIBS=@GSTCONTROLLER_LIBS@ +LIBSERIAL_CFLAGS=@LIBSERIAL_CFLAGS@ +LIBSERIAL_LIBS=@LIBSERIAL_LIBS@ + ICU_CFLAGS=@ICU_CFLAGS@ ICU_CXXFLAGS=@ICU_CXXFLAGS@ ICU_LIBS=@ICU_LIBS@ @@ -218,8 +221,9 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \ ${LIBXMLPP_CFLAGS} \ ${GTKMM_CFLAGS} \ ${LIBGLADEMM_CFLAGS} \ - ${GSTREAMER_CFLAGS} \ - ${GSTCONTROLLER_CFLAGS} \ + ${GSTREAMER_CFLAGS} \ + ${GSTCONTROLLER_CFLAGS} \ + ${LIBSERIAL_CFLAGS} \ -I${USR_INCLUDE_DIR} \ -I${CORE_INCLUDE_DIR} \ -I${AUTHENTICATION_INCLUDE_DIR} \ @@ -235,8 +239,9 @@ LDFLAGS = @LDFLAGS@ -pthread \ ${CURL_LIBS} \ ${GTKMM_LIBS} \ ${LIBGLADEMM_LIBS} \ - ${GSTREAMER_LIBS} \ - ${GSTCONTROLLER_LIBS} \ + ${GSTREAMER_LIBS} \ + ${GSTCONTROLLER_LIBS} \ + ${LIBSERIAL_LIBS} \ ${TAGLIB_LIBS} \ -L${USR_LIB_DIR} \ -L${CORE_LIB_DIR} \ @@ -307,7 +312,7 @@ G_LIVESUPPORT_EXE_LIBS = -l${PLAYLIST_EXECUTOR_LIB} \ -l${SCHEDULER_CLIENT_LIB} \ -l${CORE_LIB} \ ${BOOST_DATE_TIME_LIB} \ - -lxmlrpc++ -lssl -ltar -lserial + -lxmlrpc++ -lssl -ltar TEST_RUNNER_OBJS = ${G_LIVESUPPORT_OBJS} \ ${TMP_DIR}/TestRunner.o \ diff --git a/campcaster/src/products/gLiveSupport/etc/configure.ac b/campcaster/src/products/gLiveSupport/etc/configure.ac index 006c92195..59d825c78 100644 --- a/campcaster/src/products/gLiveSupport/etc/configure.ac +++ b/campcaster/src/products/gLiveSupport/etc/configure.ac @@ -113,6 +113,10 @@ PKG_CHECK_MODULES(GSTCONTROLLER,[gstreamer-controller-0.10 >= 0.10]) AC_SUBST(GSTCONTROLLER_CFLAGS) AC_SUBST(GSTCONTROLLER_LIBS) +PKG_CHECK_MODULES(LIBSERIAL,[libserial >= 0.5.2]) +AC_SUBST(LIBSERIAL_CFLAGS) +AC_SUBST(LIBSERIAL_LIBS) + AC_CHECK_CURL(7.12.3) AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/bin/autogen.sh b/campcaster/src/tools/libserial/libserial-0.5.2/bin/autogen.sh deleted file mode 100755 index 911f86819..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/bin/autogen.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the Campcaster project. -# http://campcaster.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# Campcaster 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. -# -# Campcaster 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 Campcaster; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Run this to set up the build system: configure, makefiles, etc. -# (based on the version in enlightenment's cvs) -#------------------------------------------------------------------------------- - -package="libserial" - -# assume we're in $basedir/bin -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -test -z "$basedir" && basedir=. -usrdir=`cd $basedir/../../../../usr; pwd;` - -bindir=$basedir/bin -etcdir=$basedir/etc -tmpdir=$basedir/tmp - -cd "$tmpdir" -DIE=0 - -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $package." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -echo "Generating configuration files for $package, please wait...." - -configure_ac=${etcdir}/configure.ac -configure=${tmpdir}/configure -aclocal_m4=${tmpdir}/aclocal.m4 - -# copy over configure.ac and acinlclude.m4 from etc to tmp, -# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to -# look for configure.ac in the current directory, and include acinclude.m4 -# in aclocal.m4 it without a directory path in front -#ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}" -#echo " aclocal $ACLOCAL_FLAGS" -#cp -f ${configure_ac} ${tmpdir} -#cp -f ${etcdir}/acinclude.m4 ${tmpdir} -#aclocal $ACLOCAL_FLAGS - -#echo " autoheader ${configure_ac}" -#autoheader ${configure_ac} - -echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}" -autoconf -I ${tmpdir} -o ${configure} ${configure_ac} - diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/bin/install-sh b/campcaster/src/tools/libserial/libserial-0.5.2/bin/install-sh deleted file mode 100755 index 387b7d18f..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/bin/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/bash -# install - install a program, script, or datafile - -scriptversion=2005-02-02.21 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/bin/prepare.sh b/campcaster/src/tools/libserial/libserial-0.5.2/bin/prepare.sh deleted file mode 100755 index f73ddb7d3..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/bin/prepare.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the Campcaster project. -# http://campcaster.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# Campcaster 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. -# -# Campcaster 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 Campcaster; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# Run this script to prepare libserial to be configured and compiled. -# For more information on libserial, see http://libserial.sourceforge.net/ -#------------------------------------------------------------------------------- -product=libserial-0.5.2 - -reldir=`dirname $0`/.. -basedir=`cd ${reldir}; pwd;` -bindir=${basedir}/bin -etcdir=${basedir}/etc -tmpdir=${basedir}/tmp - -tar=$basedir/src/$product.tar.gz - -mkdir -p ${tmpdir} - -# copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it -cp -r $bindir/install-sh $tmpdir - -cd ${tmpdir} -if [ ! -d $product ]; then - tar xfz ${tar} - cd $product - # see https://sourceforge.net/tracker/index.php?func=detail&aid=1642748&group_id=9432&atid=109432 - patch -p1 < $etcdir/libserial-gcc-4.0-fix.patch -fi - diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/configure b/campcaster/src/tools/libserial/libserial-0.5.2/configure deleted file mode 100755 index 03e54b0b4..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/configure +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the Campcaster project. -# http://campcaster.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# Campcaster 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. -# -# Campcaster 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 Campcaster; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# Run this script to configure the environment. -# -# This script in effect calls the real automake / autoconf configure script -#------------------------------------------------------------------------------- - -# assume we're in $basedir -reldir=`dirname $0` -basedir=`cd $reldir; pwd;` -test -z "$basedir" && basedir=. - -bindir=$basedir/bin -tmpdir=$basedir/tmp - - -autogen=$bindir/autogen.sh -configure=$tmpdir/configure - -if [ ! -x $configure ]; then - (cd $basedir && $autogen $*) -fi - -(cd $tmpdir && $configure $*) - diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/etc/Makefile.in b/campcaster/src/tools/libserial/libserial-0.5.2/etc/Makefile.in deleted file mode 100644 index 0fa74d69f..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/etc/Makefile.in +++ /dev/null @@ -1,85 +0,0 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2004 Media Development Loan Fund -# -# This file is part of the Campcaster project. -# http://campcaster.campware.org/ -# To report bugs, send an e-mail to bugs@campware.org -# -# Campcaster 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. -# -# Campcaster 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 Campcaster; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# -# Author : $Author$ -# Version : $Revision$ -# Location : $URL$ -#------------------------------------------------------------------------------- - -#------------------------------------------------------------------------------- -# General command definitions -#------------------------------------------------------------------------------- -MKDIR = mkdir -p -RM = rm -f -RMDIR = rm -rf -DOXYGEN = doxygen -DOXYTAG = doxytag -XSLTPROC = xsltproc -ECHO = @echo -FLAWFINDER = flawfinder - - -#------------------------------------------------------------------------------- -# Basic directory and file definitions -#------------------------------------------------------------------------------- -BASE_DIR = . -BIN_DIR = ${BASE_DIR}/bin -DOC_DIR = ${BASE_DIR}/doc -DOXYGEN_DIR = ${DOC_DIR}/doxygen -COVERAGE_DIR = ${DOC_DIR}/coverage -ETC_DIR = ${BASE_DIR}/etc -TMP_DIR = ${BASE_DIR}/tmp - -LIBSERIAL_VERSION = libserial-0.5.2 -LIBSERIAL_DIR = ${TMP_DIR}/${LIBSERIAL_VERSION} - -prefix = @prefix@ -# datadir will be defiend as ${prefix}/share, so we need to define ${prefix} -# above -docdir = @datadir@/doc/${LIBSERIAL_VERSION} - - -#------------------------------------------------------------------------------- -# Targets -#------------------------------------------------------------------------------- -all: ${TMP_DIR}/all.stamp -${TMP_DIR}/all.stamp: - ${MAKE} -C ${LIBSERIAL_DIR} - ${MAKE} -C ${LIBSERIAL_DIR} docs - touch ${TMP_DIR}/all.stamp - -install: all ${TMP_DIR}/install.stamp -${TMP_DIR}/install.stamp: - ${MAKE} -C ${LIBSERIAL_DIR} install - ${MKDIR} ${docdir} - cp -pPR ${LIBSERIAL_DIR}/doc/html ${docdir} - touch ${TMP_DIR}/install.stamp - -clean: - ${MAKE} -C ${LIBSERIAL_DIR} clean - ${RM} ${TMP_DIR}/*.stamp - -distclean: - ${RM} ${TMP_DIR}/*.stamp - ${RMDIR} ${LIBSERIAL_DIR} - ${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh - diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/etc/configure.ac b/campcaster/src/tools/libserial/libserial-0.5.2/etc/configure.ac deleted file mode 100644 index a76b50d4d..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/etc/configure.ac +++ /dev/null @@ -1,54 +0,0 @@ -dnl----------------------------------------------------------------------------- -dnl Copyright (c) 2004 Media Development Loan Fund -dnl -dnl This file is part of the Campcaster project. -dnl http://campcaster.campware.org/ -dnl To report bugs, send an e-mail to bugs@campware.org -dnl -dnl Campcaster is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl Campcaster is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with Campcaster; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl -dnl Author : $Author$ -dnl Version : $Revision$ -dnl Location : $URL$ -dnl----------------------------------------------------------------------------- - -dnl----------------------------------------------------------------------------- -dnl NOTE: Run all configure related scripts from the tmp directory of the -dnl project. -dnl This is due to the fact that configure spreads a lot of trash around, -dnl like atom4te cache directories, config.* files, etc. into the directory -dnl it is being run from. We clearly don't want these in our base directory. -dnl----------------------------------------------------------------------------- -AC_INIT(libserial, 0.5.2, bugs@campware.org) -AC_PREREQ(2.59) -AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision$) - -AC_CONFIG_SRCDIR(../src/libserial-0.5.2.tar.gz) - - -dnl untar the sources before anything happens -../bin/prepare.sh - -cd ../tmp/libserial-0.5.2 -./configure --prefix=$prefix -cd - - - -AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) - -AC_OUTPUT() - diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/etc/libserial-gcc-4.0-fix.patch b/campcaster/src/tools/libserial/libserial-0.5.2/etc/libserial-gcc-4.0-fix.patch deleted file mode 100644 index 71e2455f2..000000000 --- a/campcaster/src/tools/libserial/libserial-0.5.2/etc/libserial-gcc-4.0-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -aur libserial-0.5.2 libserial-0.5.2-gcc-4.0 ---- libserial-0.5.2/src/SerialStreamBuf.h 2005-10-17 02:19:12.000000000 +0200 -+++ libserial-0.5.2-gcc-4.0/src/SerialStreamBuf.h 2007-01-23 14:16:18.000000000 +0100 -@@ -568,6 +568,6 @@ - return next_ch ; - } - -- } ; // namespace LibSerial -+ } // namespace LibSerial - } // extern "C++" - #endif // #ifndef _SerialStreamBuf_h_ ---- libserial-0.5.2/src/SerialStream.h 2005-10-01 23:24:21.000000000 +0200 -+++ libserial-0.5.2-gcc-4.0/src/SerialStream.h 2007-01-23 14:16:23.000000000 +0100 -@@ -346,6 +346,6 @@ - return mIOBuffer->is_open() ; - } - -- } ; // namespace LibSerial -+ } // namespace LibSerial - } // extern "C++" - #endif // #ifndef _SerialStream_h_ diff --git a/campcaster/src/tools/libserial/libserial-0.5.2/src/libserial-0.5.2.tar.gz b/campcaster/src/tools/libserial/libserial-0.5.2/src/libserial-0.5.2.tar.gz deleted file mode 100644 index 4c4e0843d..000000000 Binary files a/campcaster/src/tools/libserial/libserial-0.5.2/src/libserial-0.5.2.tar.gz and /dev/null differ