Author: timn
Update of /cvs/pkgs/rpms/player/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5494
Modified Files:
player-2.1.1-norpath.patch
Log Message:
+ Cleaned up patch, called aclocal
Tim
player-2.1.1-norpath.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 player-2.1.1-norpath.patch
Index: player-2.1.1-norpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-8/player-2.1.1-norpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- player-2.1.1-norpath.patch 31 Aug 2008 23:17:35 -0000 1.1
+++ player-2.1.1-norpath.patch 31 Aug 2008 23:50:03 -0000 1.2
@@ -713,156786 +713,6 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -urN player-2.1.1/autom4te.cache/output.1
player-2.1.1.norpath_am/autom4te.cache/output.1
---- player-2.1.1/autom4te.cache/output.1 1970-01-01 01:00:00.000000000 +0100
-+++ player-2.1.1.norpath_am/autom4te.cache/output.1 2008-09-01 00:18:39.000000000 +0200
-@@ -0,0 +1,60264 @@
-+@%:@! /bin/sh
-+@%:@ Guess values for system-dependent variables and create Makefiles.
-+@%:@ Generated by GNU Autoconf 2.61 for player 2.1.1.
-+@%:@
-+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+@%:@ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+@%:@ This configure script is free software; the Free Software Foundation
-+@%:@ gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null
2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in
-+ *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file
name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- /
2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
-+fi
-+
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
[...156395 lines suppressed...]
-+m4trace:configure.ac:489: -1- m4_pattern_allow([^WITH_IMAGEMAGICK_FALSE$])
-+m4trace:configure.ac:489: -1- _AM_SUBST_NOTMAKE([WITH_IMAGEMAGICK_TRUE])
-+m4trace:configure.ac:489: -1- _AM_SUBST_NOTMAKE([WITH_IMAGEMAGICK_FALSE])
-+m4trace:configure.ac:493: -1- AC_SUBST([GSL_CFLAGS])
-+m4trace:configure.ac:493: -1- AC_SUBST_TRACE([GSL_CFLAGS])
-+m4trace:configure.ac:493: -1- m4_pattern_allow([^GSL_CFLAGS$])
-+m4trace:configure.ac:493: -1- AC_SUBST([GSL_LIBS])
-+m4trace:configure.ac:493: -1- AC_SUBST_TRACE([GSL_LIBS])
-+m4trace:configure.ac:493: -1- m4_pattern_allow([^GSL_LIBS$])
-+m4trace:configure.ac:495: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSL])
-+m4trace:configure.ac:495: -1- m4_pattern_allow([^HAVE_GSL$])
-+m4trace:configure.ac:495: -1- AH_OUTPUT([HAVE_GSL], [/* GSL library is present */
-+#undef HAVE_GSL])
-+m4trace:configure.ac:498: -1- AM_CONDITIONAL([WITH_GSL], [test "x$with_gsl" =
"xyes"])
-+m4trace:configure.ac:498: -1- AC_SUBST([WITH_GSL_TRUE])
-+m4trace:configure.ac:498: -1- AC_SUBST_TRACE([WITH_GSL_TRUE])
-+m4trace:configure.ac:498: -1- m4_pattern_allow([^WITH_GSL_TRUE$])
-+m4trace:configure.ac:498: -1- AC_SUBST([WITH_GSL_FALSE])
-+m4trace:configure.ac:498: -1- AC_SUBST_TRACE([WITH_GSL_FALSE])
-+m4trace:configure.ac:498: -1- m4_pattern_allow([^WITH_GSL_FALSE$])
-+m4trace:configure.ac:498: -1- _AM_SUBST_NOTMAKE([WITH_GSL_TRUE])
-+m4trace:configure.ac:498: -1- _AM_SUBST_NOTMAKE([WITH_GSL_FALSE])
-+m4trace:configure.ac:501: -1- AC_SUBST([have_xmms])
-+m4trace:configure.ac:501: -1- AC_SUBST_TRACE([have_xmms])
-+m4trace:configure.ac:501: -1- m4_pattern_allow([^have_xmms$])
-+m4trace:configure.ac:502: -1- AM_CONDITIONAL([HAVE_XMMS], [test "x$have_xmms"
= "xyes"])
-+m4trace:configure.ac:502: -1- AC_SUBST([HAVE_XMMS_TRUE])
-+m4trace:configure.ac:502: -1- AC_SUBST_TRACE([HAVE_XMMS_TRUE])
-+m4trace:configure.ac:502: -1- m4_pattern_allow([^HAVE_XMMS_TRUE$])
-+m4trace:configure.ac:502: -1- AC_SUBST([HAVE_XMMS_FALSE])
-+m4trace:configure.ac:502: -1- AC_SUBST_TRACE([HAVE_XMMS_FALSE])
-+m4trace:configure.ac:502: -1- m4_pattern_allow([^HAVE_XMMS_FALSE$])
-+m4trace:configure.ac:502: -1- _AM_SUBST_NOTMAKE([HAVE_XMMS_TRUE])
-+m4trace:configure.ac:502: -1- _AM_SUBST_NOTMAKE([HAVE_XMMS_FALSE])
-+m4trace:configure.ac:524: -1- AM_CONDITIONAL([INCLUDE_LIBPLAYERC_PY], [test
"x$enable_libplayerc_py" = "xyes"])
-+m4trace:configure.ac:524: -1- AC_SUBST([INCLUDE_LIBPLAYERC_PY_TRUE])
-+m4trace:configure.ac:524: -1- AC_SUBST_TRACE([INCLUDE_LIBPLAYERC_PY_TRUE])
-+m4trace:configure.ac:524: -1- m4_pattern_allow([^INCLUDE_LIBPLAYERC_PY_TRUE$])
-+m4trace:configure.ac:524: -1- AC_SUBST([INCLUDE_LIBPLAYERC_PY_FALSE])
-+m4trace:configure.ac:524: -1- AC_SUBST_TRACE([INCLUDE_LIBPLAYERC_PY_FALSE])
-+m4trace:configure.ac:524: -1- m4_pattern_allow([^INCLUDE_LIBPLAYERC_PY_FALSE$])
-+m4trace:configure.ac:524: -1- _AM_SUBST_NOTMAKE([INCLUDE_LIBPLAYERC_PY_TRUE])
-+m4trace:configure.ac:524: -1- _AM_SUBST_NOTMAKE([INCLUDE_LIBPLAYERC_PY_FALSE])
-+m4trace:configure.ac:527: -1- AC_CONFIG_FILES([Makefile
-+ rtk2/Makefile
-+ replace/Makefile
-+ doc/Makefile
-+ doc/images/Makefile
-+ libplayerjpeg/Makefile
-+ libplayercore/Makefile
-+ libplayercore/bindings/Makefile
-+ libplayercore/bindings/java/Makefile
-+ libplayercore/playercore.pc
-+ libplayercore/playererror.pc
-+ libplayercore/playerutils.pc
-+ libplayerxdr/Makefile
-+ libplayerxdr/playerxdr.pc
-+ libplayertcp/Makefile
-+ libplayertcp/bindings/Makefile
-+ libplayertcp/bindings/java/Makefile
-+ libplayertcp/playertcp.pc
-+ libplayertcp/playerudp.pc
-+ libplayersd/Makefile
-+ libplayersd/playersd.pc
-+ server/Makefile
-+ server/libplayerdrivers/Makefile
-+ server/libplayerdrivers/playerdrivers.pc
-+ server/drivers/Makefile
-+ server/drivers/base/Makefile
-+ server/drivers/gps/Makefile
-+ server/drivers/shell/Makefile
-+ server/drivers/mixed/Makefile
-+ server/drivers/mixed/phidgetIFK/Makefile
-+ server/drivers/mixed/wbr/Makefile
-+ server/drivers/mixed/wbr/914/Makefile
-+ server/drivers/position/Makefile
-+ server/drivers/actarray/Makefile
-+ server/drivers/audio/Makefile
-+ server/drivers/camera/Makefile
-+ server/drivers/camera/v4l/Makefile
-+ server/drivers/camera/1394/Makefile
-+ server/drivers/camera/compress/Makefile
-+ server/drivers/camera/imageseq/Makefile
-+ server/drivers/camera/sphere/Makefile
-+ server/drivers/camera/uvc/Makefile
-+ server/drivers/camera/yarp/Makefile
-+ server/drivers/fiducial/Makefile
-+ server/drivers/ptz/Makefile
-+ server/drivers/laser/Makefile
-+ server/drivers/blobfinder/Makefile
-+ server/drivers/blobfinder/artoolkitplus/Makefile
-+ server/drivers/blobfinder/cmvision/Makefile
-+ server/drivers/blobfinder/upcbarcode/Makefile
-+ server/drivers/blobfinder/simpleshape/Makefile
-+ server/drivers/blobfinder/acts/Makefile
-+ server/drivers/blobfinder/shapetracker/Makefile
-+ server/drivers/wifi/Makefile
-+ server/drivers/speech/Makefile
-+ server/drivers/speech/recognition/Makefile
-+ server/drivers/mixed/chatterbox/Makefile
-+ server/drivers/mixed/cmucam2/Makefile
-+ server/drivers/mixed/mricp/Makefile
-+ server/drivers/mixed/p2os/Makefile
-+ server/drivers/mixed/erratic/Makefile
-+ server/drivers/mixed/reb/Makefile
-+ server/drivers/mixed/rflex/Makefile
-+ server/drivers/mixed/robotino/Makefile
-+ server/drivers/mixed/khepera/Makefile
-+ server/drivers/mixed/rmp/Makefile
-+ server/drivers/mixed/garcia/Makefile
-+ server/drivers/mixed/nomad/Makefile
-+ server/drivers/mixed/botrics/Makefile
-+ server/drivers/mixed/clodbuster/Makefile
-+ server/drivers/mixed/evolution/Makefile
-+ server/drivers/mixed/evolution/er1/Makefile
-+ server/drivers/mixed/irobot/Makefile
-+ server/drivers/mixed/irobot/roomba/Makefile
-+ server/drivers/mixed/irobot/create/Makefile
-+ server/drivers/mixed/sr3000/Makefile
-+ server/drivers/opaque/Makefile
-+ server/drivers/health/Makefile
-+ server/drivers/health/statgrab/Makefile
-+ server/drivers/planner/Makefile
-+ server/drivers/planner/wavefront/Makefile
-+ server/drivers/position/microstrain/Makefile
-+ server/drivers/position/ascension/Makefile
-+ server/drivers/position/bumpersafe/Makefile
-+ server/drivers/position/nd/Makefile
-+ server/drivers/position/isense/Makefile
-+ server/drivers/position/lasersafe/Makefile
-+ server/drivers/position/nav200/Makefile
-+ server/drivers/position/roboteq/Makefile
-+ server/drivers/position/vfh/Makefile
-+ server/drivers/position/mbicp/Makefile
-+ server/drivers/mcom/Makefile
-+ server/drivers/localization/Makefile
-+ server/drivers/localization/amcl/Makefile
-+ server/drivers/service_adv/Makefile
-+ server/drivers/map/Makefile
-+ server/drivers/joystick/Makefile
-+ server/drivers/rfid/Makefile
-+ server/drivers/wsn/Makefile
-+ server/drivers/imu/Makefile
-+ server/drivers/pointcloud3d/Makefile
-+ server/drivers/ranger/Makefile
-+ server/drivers/vectormap/Makefile
-+ server/drivers/blackboard/Makefile
-+ server/drivers/blackboard/localbb/Makefile
-+ client_libs/Makefile
-+ client_libs/libplayerc++/Makefile
-+ client_libs/libplayerc++/playerc++.pc
-+ client_libs/libplayerc++/test/Makefile
-+ client_libs/libplayerc/Makefile
-+ client_libs/libplayerc/doc/Makefile
-+ client_libs/libplayerc/playerc.pc
-+ client_libs/libplayerc/test/Makefile
-+ client_libs/libplayerc/bindings/Makefile
-+ client_libs/libplayerc/bindings/python/Makefile
-+ examples/Makefile
-+ examples/plugins/Makefile
-+ examples/plugins/exampledriver/Makefile
-+ examples/plugins/logplugin/Makefile
-+ examples/plugins/exampleinterface/Makefile
-+ examples/plugins/multidriver/Makefile
-+ examples/plugins/opaquedriver/Makefile
-+ examples/libplayerc/Makefile
-+ examples/libplayerc++/Makefile
-+ utils/Makefile
-+ utils/playercam/Makefile
-+ utils/playerwritemap/Makefile
-+ utils/playerv/Makefile
-+ utils/playerjoy/Makefile
-+ utils/playernav/Makefile
-+ utils/playerprint/Makefile
-+ utils/playervcr/Makefile
-+ utils/pmap/Makefile
-+ utils/dgps_server/Makefile
-+ utils/xmms-plugin/Makefile
-+ utils/logsplitter/Makefile
-+ utils/playerprop/Makefile
-+ config/Makefile])
-+m4trace:configure.ac:665: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-+m4trace:configure.ac:665: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-+m4trace:configure.ac:665: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.ac:665: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([INSTALL])
-+m4trace:configure.ac:665: -1- AC_SUBST_TRACE([MKDIR_P])
diff -urN player-2.1.1/client_libs/libplayerc/bindings/Makefile.in
player-2.1.1.norpath_am/client_libs/libplayerc/bindings/Makefile.in
--- player-2.1.1/client_libs/libplayerc/bindings/Makefile.in 2008-06-16
01:39:45.000000000 +0200
+++ player-2.1.1.norpath_am/client_libs/libplayerc/bindings/Makefile.in 2008-09-01
00:18:48.000000000 +0200
Show replies by date