rpms/oggvideotools/devel import.log, NONE, 1.1 oggvideotools-0.4-autoconf.patch, NONE, 1.1 oggvideotools-0.4-gcc43.patch, NONE, 1.1 oggvideotools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matt Domsch (mdomsch)
fedora-extras-commits at redhat.com
Tue Jul 29 04:44:02 UTC 2008
- Previous message (by thread): rpms/kernel/devel sources,1.845,1.846
- Next message (by thread): rpms/oggvideotools/F-9 oggvideotools-0.4-autoconf.patch, NONE, 1.1 oggvideotools-0.4-gcc43.patch, NONE, 1.1 oggvideotools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mdomsch
Update of /cvs/extras/rpms/oggvideotools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14909/devel
Modified Files:
.cvsignore sources
Added Files:
import.log oggvideotools-0.4-autoconf.patch
oggvideotools-0.4-gcc43.patch oggvideotools.spec
Log Message:
initial checkin
--- NEW FILE import.log ---
oggvideotools-0_4-1_fc9:HEAD:oggvideotools-0.4-1.fc9.src.rpm:1217306529
oggvideotools-0.4-autoconf.patch:
--- NEW FILE oggvideotools-0.4-autoconf.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/aclocal.m4 oggvideotools-0.4-fedora/aclocal.m4
--- oggvideotools-0.4/aclocal.m4 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/aclocal.m4 2008-07-28 13:58:05.000000000 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -84,16 +87,14 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -137,9 +138,9 @@ See the pkg-config man page for more det
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -174,7 +175,7 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -189,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -205,8 +206,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -478,7 +481,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -526,13 +529,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -637,16 +640,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -918,7 +922,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/depcomp oggvideotools-0.4-fedora/admin/depcomp
--- oggvideotools-0.4/admin/depcomp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/admin/depcomp 2008-07-28 13:58:07.000000000 -0400
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/admin/install-sh oggvideotools-0.4-fedora/admin/install-sh
--- oggvideotools-0.4/admin/install-sh 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/admin/install-sh 2008-07-28 13:58:07.000000000 -0400
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@ fi
# Put in absolute file names if you don't have them in your path;
# or use environment 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}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to
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.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -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.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
- -d) dir_arg=true
- shift
- continue;;
+ -C) copy_on_change=true;;
+
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@ while test $# -ne 0; do
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@ for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) 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
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@ do
# 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 $mode "$dsttmp"; } &&
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 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.
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- # 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 "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 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.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure oggvideotools-0.4-fedora/configure
--- oggvideotools-0.4/configure 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/configure 2008-07-28 13:58:06.000000000 -0400
@@ -700,19 +700,14 @@ RANLIB
PKG_CONFIG
OGG_CFLAGS
OGG_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
THEORA_CFLAGS
THEORA_LIBS
SDL_CFLAGS
SDL_LIBS
-HAVE_OGG_TRUE
-HAVE_OGG_FALSE
-HAVE_VORBIS_TRUE
-HAVE_VORBIS_FALSE
-HAVE_THEORA_TRUE
-HAVE_THEORA_FALSE
-HAVE_SDL_TRUE
-HAVE_SDL_FALSE
-OGGVIDEOTOOLS
+WANT_OGGSCROLL_TRUE
+WANT_OGGSCROLL_FALSE
CXXCPP
GREP
EGREP
@@ -733,6 +728,8 @@ CFLAGS
PKG_CONFIG
OGG_CFLAGS
OGG_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
THEORA_CFLAGS
THEORA_LIBS
SDL_CFLAGS
@@ -1330,6 +1327,9 @@ Some influential environment variables:
PKG_CONFIG path to pkg-config utility
OGG_CFLAGS C compiler flags for OGG, overriding pkg-config
OGG_LIBS linker flags for OGG, overriding pkg-config
+ VORBIS_CFLAGS
+ C compiler flags for VORBIS, overriding pkg-config
+ VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
THEORA_CFLAGS
C compiler flags for THEORA, overriding pkg-config
THEORA_LIBS linker flags for THEORA, overriding pkg-config
@@ -3914,8 +3914,8 @@ else
fi
-CFLAGS=""
-CXXFLAGS="-Wall "
+# GCC 4.3 needs this
+CXXFLAGS="$CXXFLAGS -std=c++0x "
# set C++ compiling and linkage
ac_ext=cpp
@@ -3925,9 +3925,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength"
-
-# Actually I do not need these libraries
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -4053,11 +4050,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for OGG" >&5
echo $ECHO_N "checking for OGG... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$OGG_CFLAGS"; then
- pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$OGG_CFLAGS"; then
+ pkg_cv_OGG_CFLAGS="$OGG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5
($PKG_CONFIG --exists --print-errors "ogg") 2>&5
ac_status=$?
@@ -4067,15 +4063,13 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$OGG_LIBS"; then
- pkg_cv_OGG_LIBS="$OGG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$OGG_LIBS"; then
+ pkg_cv_OGG_LIBS="$OGG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg\"") >&5
($PKG_CONFIG --exists --print-errors "ogg") 2>&5
ac_status=$?
@@ -4085,9 +4079,8 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -4100,9 +4093,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg"`
+ OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ogg" 2>&1`
else
- OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg"`
+ OGG_PKG_ERRORS=`$PKG_CONFIG --print-errors "ogg" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$OGG_PKG_ERRORS" >&5
@@ -4123,17 +4116,86 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
have_ogg=yes
fi
-#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false)
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for VORBIS" >&5
+echo $ECHO_N "checking for VORBIS... $ECHO_C" >&6; }
+
+if test -n "$VORBIS_CFLAGS"; then
+ pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5
+ ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$VORBIS_LIBS"; then
+ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbis\"") >&5
+ ($PKG_CONFIG --exists --print-errors "vorbis") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vorbis" 2>&1`
+ else
+ VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors "vorbis" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VORBIS_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ have_vorbis=false
+elif test $pkg_failed = untried; then
+ have_vorbis=false
+else
+ VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
+ VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBVORBIS 1
+_ACEOF
+ have_vorbis=yes
+fi
pkg_failed=no
{ echo "$as_me:$LINENO: checking for THEORA" >&5
echo $ECHO_N "checking for THEORA... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$THEORA_CFLAGS"; then
- pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$THEORA_CFLAGS"; then
+ pkg_cv_THEORA_CFLAGS="$THEORA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5
($PKG_CONFIG --exists --print-errors "theora") 2>&5
ac_status=$?
@@ -4143,15 +4205,13 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$THEORA_LIBS"; then
- pkg_cv_THEORA_LIBS="$THEORA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$THEORA_LIBS"; then
+ pkg_cv_THEORA_LIBS="$THEORA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"theora\"") >&5
($PKG_CONFIG --exists --print-errors "theora") 2>&5
ac_status=$?
@@ -4161,9 +4221,8 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -4176,9 +4235,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "theora"`
+ THEORA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "theora" 2>&1`
else
- THEORA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "theora"`
+ THEORA_PKG_ERRORS=`$PKG_CONFIG --print-errors "theora" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$THEORA_PKG_ERRORS" >&5
@@ -4204,11 +4263,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for SDL" >&5
echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -4218,15 +4276,13 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -4236,9 +4292,8 @@ if test -n "$PKG_CONFIG"; then
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -4251,9 +4306,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1`
else
- SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
@@ -4275,43 +4330,22 @@ _ACEOF
have_sdl=yes
fi
- if test x$have_ogg != xfalse; then
- HAVE_OGG_TRUE=
- HAVE_OGG_FALSE='#'
-else
- HAVE_OGG_TRUE='#'
- HAVE_OGG_FALSE=
-fi
- if test x$have_vorbis != xfalse; then
- HAVE_VORBIS_TRUE=
- HAVE_VORBIS_FALSE='#'
-else
- HAVE_VORBIS_TRUE='#'
- HAVE_VORBIS_FALSE=
-fi
- if test x$have_theora != xfalse; then
- HAVE_THEORA_TRUE=
- HAVE_THEORA_FALSE='#'
-else
- HAVE_THEORA_TRUE='#'
- HAVE_THEORA_FALSE=
-fi
- if test x$have_sdl != xfalse; then
- HAVE_SDL_TRUE=
- HAVE_SDL_FALSE='#'
+
+
+
+
+ if test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ; then
+ WANT_OGGSCROLL_TRUE=
+ WANT_OGGSCROLL_FALSE='#'
else
- HAVE_SDL_TRUE='#'
- HAVE_SDL_FALSE=
+ WANT_OGGSCROLL_TRUE='#'
+ WANT_OGGSCROLL_FALSE=
fi
-# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS"
-CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS"
-
#
# add checking message for debug information
#
@@ -4343,12 +4377,6 @@ else
CXXFLAGS="$CXXFLAGS -O2"
fi
-if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes
-then
- OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll"
-fi
-
-
# Checks for header files.
@@ -5772,31 +5800,10 @@ echo "$as_me: error: conditional \"am__f
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_OGG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_VORBIS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_THEORA_TRUE}" && test -z "${HAVE_THEORA_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_THEORA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_THEORA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_SDL\" was never defined.
+if test -z "${WANT_OGGSCROLL_TRUE}" && test -z "${WANT_OGGSCROLL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WANT_OGGSCROLL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_SDL\" was never defined.
+echo "$as_me: error: conditional \"WANT_OGGSCROLL\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6418,18 +6425,18 @@ RANLIB!$RANLIB$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
OGG_CFLAGS!$OGG_CFLAGS$ac_delim
OGG_LIBS!$OGG_LIBS$ac_delim
+VORBIS_CFLAGS!$VORBIS_CFLAGS$ac_delim
+VORBIS_LIBS!$VORBIS_LIBS$ac_delim
THEORA_CFLAGS!$THEORA_CFLAGS$ac_delim
THEORA_LIBS!$THEORA_LIBS$ac_delim
SDL_CFLAGS!$SDL_CFLAGS$ac_delim
SDL_LIBS!$SDL_LIBS$ac_delim
-HAVE_OGG_TRUE!$HAVE_OGG_TRUE$ac_delim
-HAVE_OGG_FALSE!$HAVE_OGG_FALSE$ac_delim
-HAVE_VORBIS_TRUE!$HAVE_VORBIS_TRUE$ac_delim
-HAVE_VORBIS_FALSE!$HAVE_VORBIS_FALSE$ac_delim
-HAVE_THEORA_TRUE!$HAVE_THEORA_TRUE$ac_delim
-HAVE_THEORA_FALSE!$HAVE_THEORA_FALSE$ac_delim
-HAVE_SDL_TRUE!$HAVE_SDL_TRUE$ac_delim
-HAVE_SDL_FALSE!$HAVE_SDL_FALSE$ac_delim
+WANT_OGGSCROLL_TRUE!$WANT_OGGSCROLL_TRUE$ac_delim
+WANT_OGGSCROLL_FALSE!$WANT_OGGSCROLL_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -6471,15 +6478,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-OGGVIDEOTOOLS!$OGGVIDEOTOOLS$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6880,21 +6882,22 @@ echo "$as_me: $ac_file is unchanged" >&6
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -6931,7 +6934,7 @@ echo "$as_me: executing $ac_file command
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/configure.ac oggvideotools-0.4-fedora/configure.ac
--- oggvideotools-0.4/configure.ac 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/configure.ac 2008-07-28 13:31:38.000000000 -0400
@@ -13,28 +13,25 @@ AC_PROG_CXX
AC_PROG_CC
AC_PROG_RANLIB
-CFLAGS=""
-CXXFLAGS="-Wall "
+# GCC 4.3 needs this
+CXXFLAGS="$CXXFLAGS -std=c++0x "
# set C++ compiling and linkage
AC_LANG_CPLUSPLUS
-OGGVIDEOTOOLS="oggSplit oggDump oggJoin oggCut oggCat oggLength"
-
-# Actually I do not need these libraries
PKG_CHECK_MODULES(OGG, ogg, AC_DEFINE(HAVE_LIBOGG,1,[Defined to 1 if ogg library has been found]) have_ogg=yes, have_ogg=false)
-#PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false)
+PKG_CHECK_MODULES(VORBIS, vorbis, AC_DEFINE(HAVE_LIBVORBIS,1,[Defined to 1 if vorbis library has been found]) have_vorbis=yes, have_vorbis=false)
PKG_CHECK_MODULES(THEORA, theora, AC_DEFINE(HAVE_LIBTHEORA,1,[Defined to 1 if theora library has been found]) have_theora=yes, have_theora=false)
PKG_CHECK_MODULES(SDL, sdl, AC_DEFINE(HAVE_LIBSDL,1,[Defined to 1 if the SDL library has been found]) have_sdl=yes, have_sdl=false)
-
-AM_CONDITIONAL(HAVE_OGG, test x$have_ogg != xfalse)
-AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis != xfalse)
-AM_CONDITIONAL(HAVE_THEORA, test x$have_theora != xfalse)
-AM_CONDITIONAL(HAVE_SDL, test x$have_sdl != xfalse)
-
-# CXXFLAGS="$CXXFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS"
-CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $THEORA_CFLAGS $SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $OGG_LIBS $VORBIS_LIBS $THEORA_LIBS $SDL_LIBS"
+AC_SUBST(OGG_CFLAGS)
+AC_SUBST(OGG_LIBS)
+AC_SUBST(VORBIS_CFLAGS)
+AC_SUBST(VORBIS_LIBS)
+AC_SUBST(THEORA_CFLAGS)
+AC_SUBST(THEORA_LIBS)
+AC_SUBST(SDL_CFLAGS)
+AC_SUBST(SDL_LIBS)
+AM_CONDITIONAL([WANT_OGGSCROLL], [test x$have_ogg = xyes -a x$have_vorbis = xyes -a x$have_theora = xyes -a x$have_sdl = xyes ])
#
# add checking message for debug information
@@ -62,12 +59,6 @@ else
CXXFLAGS="$CXXFLAGS -O2"
fi
-if test x$have_ogg = xyes -a x$have_ogg = xyes -a x$have_theora = xyes
-then
- OGGVIDEOTOOLS="$OGGVIDEOTOOLS oggScroll"
-fi
-
-AC_SUBST(OGGVIDEOTOOLS)
# Checks for header files.
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/INSTALL oggvideotools-0.4-fedora/INSTALL
--- oggvideotools-0.4/INSTALL 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/INSTALL 2008-07-28 13:58:07.000000000 -0400
@@ -1,38 +1,54 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
Basic Installation
==================
- These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -51,52 +67,55 @@ The simplest way to compile this package
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -107,7 +126,7 @@ option `--program-prefix=PREFIX' or `--p
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -122,48 +141,86 @@ you can use the `configure' options `--x
Specifying the System Type
==========================
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
CPU-COMPANY-SYSTEM
-See the file `config.sub' for the possible values of each field. If
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
-Operation Controls
+Defining Variables
==================
- `configure' recognizes the following options to control how it
-operates.
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
-`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
`--help'
+`-h'
Print a summary of the options to `configure', and exit.
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
`--quiet'
`--silent'
`-q'
@@ -175,8 +232,6 @@ operates.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
-`configure' also accepts some other, not widely useful, options.
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal --exclude=autom4te.cache --exclude='*.cpp' oggvideotools-0.4/src/makefile.am oggvideotools-0.4-fedora/src/makefile.am
--- oggvideotools-0.4/src/makefile.am 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/makefile.am 2008-07-28 13:38:16.000000000 -0400
@@ -1,7 +1,4 @@
-bin_PROGRAMS = $(OGGVIDEOTOOLS)
-EXTRA_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength oggScroll
-
-AM_CXXFLAGS = $(CFLAGS)
+bin_PROGRAMS = oggSplit oggDump oggJoin oggCut oggCat oggLength
SRC_CORE = mediaUnit.cpp mediaRepository.cpp fileRepository.cpp rawMediaPacket.cpp \
mediaDecoder.cpp mediaEncoder.cpp mediaConverter.cpp \
@@ -34,21 +31,15 @@ ADDHEADERS = refObject.h definition.h og
streamConfig.h $(HDR_VORBIS) $(HDR_THEORA) $(HDR_SDL)
oggSplit_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggSplit.cpp
-
oggDump_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggDump.cpp
-
oggJoin_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggJoin.cpp
-
oggCut_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCut.cpp
-
oggCat_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggCat.cpp
-
oggLength_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) oggLength.cpp
-if HAVE_THEORA
-if HAVE_OGG
-if HAVE_SDL
+if WANT_OGGSCROLL
+bin_PROGRAMS += oggScroll
oggScroll_SOURCES = $(SRC_CORE) $(SRC_THEORA_INDEP) $(SRC_VORBIS_INDEP) $(SRC_THEORA_DEP) $(SRC_SDL) oggScroll.cpp
-endif
-endif
+oggScroll_CXXFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(THEORA_CFLAGS) $(SDL_CFLAGS)
+oggScroll_LDADD = $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SDL_LIBS)
endif
oggvideotools-0.4-gcc43.patch:
--- NEW FILE oggvideotools-0.4-gcc43.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggCut.cpp oggvideotools-0.4-fedora/src/oggCut.cpp
--- oggvideotools-0.4/src/oggCut.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggCut.cpp 2008-07-24 15:50:15.000000000 -0400
@@ -21,6 +21,7 @@
#include <iostream>
#include <map>
+#include <cstdlib>
#include "fileRepository.h"
#include "streamSerializer.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggDump.cpp oggvideotools-0.4-fedora/src/oggDump.cpp
--- oggvideotools-0.4/src/oggDump.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggDump.cpp 2008-07-24 15:50:01.000000000 -0400
@@ -25,6 +25,7 @@
#include <sstream>
#include <fstream>
#include <ostream>
+#include <cstdlib>
#include "fileRepository.h"
#include "rawMediaPacket.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggEncoder.cpp oggvideotools-0.4-fedora/src/oggEncoder.cpp
--- oggvideotools-0.4/src/oggEncoder.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggEncoder.cpp 2008-07-24 15:47:44.000000000 -0400
@@ -20,6 +20,7 @@
*/
#include <iostream>
+#include <cstring>
#include "oggEncoder.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggLength.cpp oggvideotools-0.4-fedora/src/oggLength.cpp
--- oggvideotools-0.4/src/oggLength.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggLength.cpp 2008-07-24 15:50:26.000000000 -0400
@@ -21,6 +21,7 @@
#include <iostream>
#include <string>
+#include <cstdlib>
#include "fileRepository.h"
#include "streamSerializer.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPacket.cpp oggvideotools-0.4-fedora/src/oggPacket.cpp
--- oggvideotools-0.4/src/oggPacket.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggPacket.cpp 2008-07-24 15:42:28.000000000 -0400
@@ -21,6 +21,7 @@
#include <iostream>
#include <sstream>
+#include <cstring>
//#include "theora/theora.h"
#include "oggPacket.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggPage.cpp oggvideotools-0.4-fedora/src/oggPage.cpp
--- oggvideotools-0.4/src/oggPage.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggPage.cpp 2008-07-24 15:42:12.000000000 -0400
@@ -20,6 +20,7 @@
*/
#include <sstream>
+#include <cstring>
#include "oggPage.h"
#include "oggHeader.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggSplit.cpp oggvideotools-0.4-fedora/src/oggSplit.cpp
--- oggvideotools-0.4/src/oggSplit.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggSplit.cpp 2008-07-24 15:49:44.000000000 -0400
@@ -23,6 +23,7 @@
#include <map>
#include <sstream>
#include <string>
+#include <cstdlib>
#include "fileRepository.h"
#include "rawMediaPacket.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamDecoder.cpp oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp
--- oggvideotools-0.4/src/oggStreamDecoder.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggStreamDecoder.cpp 2008-07-24 15:41:55.000000000 -0400
@@ -22,6 +22,7 @@
#include <iostream>
#include <vector>
+#include <cstring>
#include "definition.h"
#include "oggHeader.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/oggStreamEncoder.cpp oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp
--- oggvideotools-0.4/src/oggStreamEncoder.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/oggStreamEncoder.cpp 2008-07-24 15:43:12.000000000 -0400
@@ -21,6 +21,7 @@
#include <iostream>
#include <string.h>
+#include <random>
#include "definition.h"
#include "oggStreamEncoder.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraExtractor.cpp oggvideotools-0.4-fedora/src/theoraExtractor.cpp
--- oggvideotools-0.4/src/theoraExtractor.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/theoraExtractor.cpp 2008-07-24 15:48:24.000000000 -0400
@@ -1,4 +1,5 @@
#include <iostream>
+#include <cstring>
#include "theoraExtractor.h"
#include "definition.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/theoraPosInterpreter.cpp oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp
--- oggvideotools-0.4/src/theoraPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/theoraPosInterpreter.cpp 2008-07-24 15:48:05.000000000 -0400
@@ -2,6 +2,7 @@
#include "theoraStreamParameter.h"
#include <iostream>
+#include <typeinfo>
TheoraPosInterpreter::TheoraPosInterpreter()
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisExtractor.cpp oggvideotools-0.4-fedora/src/vorbisExtractor.cpp
--- oggvideotools-0.4/src/vorbisExtractor.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/vorbisExtractor.cpp 2008-07-24 15:49:00.000000000 -0400
@@ -1,4 +1,5 @@
#include <iostream>
+#include <cstring>
#include "vorbisExtractor.h"
#include "vorbisStreamParameter.h"
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal oggvideotools-0.4/src/vorbisPosInterpreter.cpp oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp
--- oggvideotools-0.4/src/vorbisPosInterpreter.cpp 2008-05-27 15:30:13.000000000 -0400
+++ oggvideotools-0.4-fedora/src/vorbisPosInterpreter.cpp 2008-07-24 15:48:47.000000000 -0400
@@ -1,6 +1,7 @@
#include "vorbisPosInterpreter.h"
#include <iostream>
+#include <typeinfo>
#include "vorbisStreamParameter.h"
--- NEW FILE oggvideotools.spec ---
Name: oggvideotools
Version: 0.4
Release: 1%{?dist}
Summary: Toolbox for manipulating Ogg video files
Group: Applications/Multimedia
License: GPLv2+
URL: http://dev.streamnik.de/oggvideotools.html
Source0: http://dev.streamnik.de/uploads/media/%{name}-%{version}.tar.gz
Patch1: %{name}-0.4-gcc43.patch
Patch2: %{name}-0.4-autoconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
BuildRequires: libogg-devel libvorbis-devel libtheora-devel SDL-devel
%description
A toolbox for manipulating Ogg video files, which usually consist of a
video stream (Theora) and an audio stream (Vorbis). It includes a
number of handy command line tools for manipulating these video files,
such as for splitting the different streams.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog
%{_bindir}/*
%changelog
* Thu Jul 24 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.4-1
- initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Jul 2008 04:01:21 -0000 1.1
+++ .cvsignore 29 Jul 2008 04:43:32 -0000 1.2
@@ -0,0 +1 @@
+oggvideotools-0.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oggvideotools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Jul 2008 04:01:21 -0000 1.1
+++ sources 29 Jul 2008 04:43:32 -0000 1.2
@@ -0,0 +1 @@
+42126f6618488ff4e7c8cca0af70f512 oggvideotools-0.4.tar.gz
- Previous message (by thread): rpms/kernel/devel sources,1.845,1.846
- Next message (by thread): rpms/oggvideotools/F-9 oggvideotools-0.4-autoconf.patch, NONE, 1.1 oggvideotools-0.4-gcc43.patch, NONE, 1.1 oggvideotools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list