[xiph-commits] r13984 - in trunk/theora-tools: . png2theora
theoracomment theoraenc
j at svn.xiph.org
j at svn.xiph.org
Mon Oct 15 08:53:54 PDT 2007
Author: j
Date: 2007-10-15 08:53:53 -0700 (Mon, 15 Oct 2007)
New Revision: 13984
Removed:
trunk/theora-tools/debian/
trunk/theora-tools/doc/
trunk/theora-tools/theora123/
trunk/theora-tools/theora_dumpvideo/
trunk/theora-tools/theora_splayer/
trunk/theora-tools/theora_transcoder/
trunk/theora-tools/theoraplay/
Modified:
trunk/theora-tools/
trunk/theora-tools/Makefile.am
trunk/theora-tools/autogen.sh
trunk/theora-tools/configure.ac
trunk/theora-tools/png2theora/
trunk/theora-tools/theoracomment/
trunk/theora-tools/theoraenc/
Log:
cleanup theora-tools,
* remove all player, this should be a collection of commandline tools for theora
* remove theora_dumpvideo, this is more for testing
* remove debian build directory, debian preferes to maintain its own.
* update autogen.sh / configure.ac / Makefile.am
* update svn:ignore
Property changes on: trunk/theora-tools
___________________________________________________________________
Name: svn:ignore
+ aclocal.m4
autom4te.cache
compile
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
libtheora.spec
libtool
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h1
.project
Modified: trunk/theora-tools/Makefile.am
===================================================================
--- trunk/theora-tools/Makefile.am 2007-10-15 10:31:51 UTC (rev 13983)
+++ trunk/theora-tools/Makefile.am 2007-10-15 15:53:53 UTC (rev 13984)
@@ -2,14 +2,10 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = debian theora123 theora_splayer theoraenc theora_transcoder theora_dumpvideo theoracomment png2theora
+SUBDIRS = theoraenc theoracomment png2theora
EXTRA_DIST = COPYING autogen.sh win32
-dist-hook:
- rm -rf `find $(distdir)/macos -name CVS`
- rm -rf `find $(distdir)/win32 -name CVS`
-
debug:
$(MAKE) all CFLAGS="@DEBUG@"
Modified: trunk/theora-tools/autogen.sh
===================================================================
--- trunk/theora-tools/autogen.sh 2007-10-15 10:31:51 UTC (rev 13983)
+++ trunk/theora-tools/autogen.sh 2007-10-15 15:53:53 UTC (rev 13984)
@@ -11,6 +11,7 @@
cd "$srcdir"
DIE=0
+echo "checking for autoconf... "
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $package."
@@ -19,16 +20,79 @@
DIE=1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/"
+VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/"
+VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//"
+
+# do we need automake?
+if test -r Makefile.am; then
+ AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am`
+ AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP`
+ if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then
+ AM_NEEDED=""
+ fi
+ if test -z $AM_NEEDED; then
+ echo -n "checking for automake... "
+ AUTOMAKE=automake
+ ACLOCAL=aclocal
+ if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then
+ echo "yes"
+ else
+ echo "no"
+ AUTOMAKE=
+ fi
+ else
+ echo -n "checking for automake $AM_NEEDED or later... "
+ majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ`
+ minneeded=`echo $AM_NEEDED | $VERSIONMKMIN`
+ for am in automake automake-$AM_NEEDED automake$AM_NEEDED \
+ automake automake-1.7 automake-1.8 automake-1.9 automake-1.10; do
+ ($am --version < /dev/null > /dev/null 2>&1) || continue
+ ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP`
+ maj=`echo $ver | $VERSIONMKMAJ`
+ min=`echo $ver | $VERSIONMKMIN`
+ if test $maj -eq $majneeded -a $min -ge $minneeded; then
+ AUTOMAKE=$am
+ echo $AUTOMAKE
+ break
+ fi
+ done
+ test -z $AUTOMAKE && echo "no"
+ echo -n "checking for aclocal $AM_NEEDED or later... "
+ for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \
+ aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 aclocal-1.10; do
+ ($ac --version < /dev/null > /dev/null 2>&1) || continue
+ ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP`
+ maj=`echo $ver | $VERSIONMKMAJ`
+ min=`echo $ver | $VERSIONMKMIN`
+ if test $maj -eq $majneeded -a $min -ge $minneeded; then
+ ACLOCAL=$ac
+ echo $ACLOCAL
+ break
+ fi
+ done
+ test -z $ACLOCAL && echo "no"
+ fi
+ test -z $AUTOMAKE || test -z $ACLOCAL && {
echo
echo "You must have automake installed to compile $package."
- echo "Download the appropriate package for your system,"
- echo "or get the source from one of the GNU ftp sites"
- echo "listed in http://www.gnu.org/order/ftp.html"
- DIE=1
-}
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ exit 1
+ }
+fi
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+echo -n "checking for libtool... "
+for LIBTOOLIZE in libtoolize glibtoolize nope; do
+ ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
+done
+if test x$LIBTOOLIZE = xnope; then
+ echo "nope."
+ LIBTOOLIZE=libtoolize
+else
+ echo $LIBTOOLIZE
+fi
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool installed to compile $package."
echo "Download the appropriate package for your system,"
@@ -48,40 +112,16 @@
echo "Generating configuration files for $package, please wait...."
-test -f aclocal.m4 && rm aclocal.m4
-echo -n "looking for our m4 macros... "
-aclocaldirs="$srcdir `aclocal --print-ac-dir` \
- /usr/local/share/aclocal* /usr/local/aclocal* \
- /sw/share/aclocal* /usr/share/aclocal*"
-for dir in $aclocaldirs; do
- test -d "$dir" && if ! test -z "`ls $dir | grep .m4`"; then
- if test ! -z "`fgrep XIPH_PATH_OGG $dir/*.m4`"; then
- echo $dir
- ACLOCAL_FLAGS="-I $dir $ACLOCAL_FLAGS"
- break
- fi
- fi
-done
-if test -z "$ACLOCAL_FLAGS"; then
- echo "nope."
- echo
- echo "Please install the ogg and vorbis libraries, or add the"
- echo "location of ogg.m4 to ACLOCAL_FLAGS in the environment."
- echo
- exit 1
-fi
-
-
-echo " aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
+echo " $ACLOCAL $ACLOCAL_FLAGS"
+$ACLOCAL $ACLOCAL_FLAGS || exit 1
+echo " $LIBTOOLIZE --automake"
+$LIBTOOLIZE --automake || exit 1
echo " autoheader"
-autoheader
-echo " libtoolize --automake"
-libtoolize --automake
-echo " automake --add-missing $AUTOMAKE_FLAGS"
-automake --add-missing $AUTOMAKE_FLAGS
+autoheader || exit 1
+echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
+$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
echo " autoconf"
-autoconf
+autoconf || exit 1
cd $olddir
-$srcdir/configure "$@" && echo
+$srcdir/configure --enable-maintainer-mode "$@" && echo
Modified: trunk/theora-tools/configure.ac
===================================================================
--- trunk/theora-tools/configure.ac 2007-10-15 10:31:51 UTC (rev 13983)
+++ trunk/theora-tools/configure.ac 2007-10-15 15:53:53 UTC (rev 13984)
@@ -80,30 +80,10 @@
CFLAGS="$CFLGS $XIPH_CFLAGS"
LIBS="$LIBS $XIPH_LIBS"
-PKG_CHECK_MODULES(VORBISENC,vorbisenc)
+PKG_CHECK_MODULES(VORBISENC, vorbisenc)
AC_SUBST(VORBISENC_CFLAGS)
AC_SUBST(VORBISENC_LIBS)
-PKG_CHECK_MODULES(SDL,sdl, HAVE_SDL="yes", HAVE_SDL="no")
-AC_SUBST(SDL_CFLAGS)
-AC_SUBST(SDL_LIBS)
-
-AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
- HAVE_OSS=yes
- break
-])
-
-AC_CHECK_LIB(portaudio, Pa_OpenStream, [
- AC_CHECK_HEADER(portaudio.h, [HAVE_PORTAUDIO=yes])
- ],,[-lpthread]
-)
-if test "x$HAVE_PORTAUDIO" != xyes; then
- AC_MSG_WARN([portaudio not found -- not compiling splayer example])
-else
-PORTAUDIO_LIBS="-lportaudio -lpthread"
-fi
-AC_SUBST(PORTAUDIO_LIBS)
-
dnl check for libpng
HAVE_PNG=no
if test "x$HAVE_PKG_CONFIG" = "xyes"
@@ -113,14 +93,6 @@
AC_SUBST(PNG_CFLAGS)
AC_SUBST(PNG_LIBS)
-if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
- THEORA123="theora123"
- AC_SUBST(THEORA123)
-fi
-if test x$HAVE_SDL = xyes -a x$HAVE_PORTAUDIO = xyes; then
- SPLAYER="theora_splayer"
- AC_SUBST(SPLAYER)
-fi
if test x$HAVE_PNG = xyes; then
PNG2THEORA="png2theora"
AC_SUBST(PNG2THEORA)
@@ -138,13 +110,8 @@
AC_CONFIG_FILES([
Makefile
- theora123/Makefile
- theora_splayer/Makefile
theoraenc/Makefile
- theora_transcoder/Makefile
- theora_dumpvideo/Makefile
theoracomment/Makefile
png2theora/Makefile
- debian/Makefile
])
AC_OUTPUT
Property changes on: trunk/theora-tools/png2theora
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.libs
.deps
png2theora
Property changes on: trunk/theora-tools/theoracomment
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.libs
.deps
theoracomment
Property changes on: trunk/theora-tools/theoraenc
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
.libs
.deps
More information about the commits
mailing list