[xiph-commits] r7345 - in trunk/vorbis: . debian doc doc/vorbisenc

thomasvs at dactyl.lonelymoon.com thomasvs
Mon Jul 26 06:31:40 PDT 2004


doc/vorbisfile include include/vorbis lib lib/books
lib/books/coupled lib/books/floor lib/books/uncoupled
lib/modes vq win32
Message-ID: <20040726133140.083A19AAAB at dactyl.lonelymoon.com>

Author: thomasvs
Date: Mon Jul 26 06:31:40 2004
New Revision: 7345

Modified:
trunk/vorbis/autogen.sh
trunk/vorbis/configure.in
trunk/vorbis/debian/Makefile.am
trunk/vorbis/doc/Makefile.am
trunk/vorbis/doc/vorbisenc/Makefile.am
trunk/vorbis/doc/vorbisfile/Makefile.am
trunk/vorbis/include/Makefile.am
trunk/vorbis/include/vorbis/Makefile.am
trunk/vorbis/lib/Makefile.am
trunk/vorbis/lib/books/Makefile.am
trunk/vorbis/lib/books/coupled/Makefile.am
trunk/vorbis/lib/books/floor/Makefile.am
trunk/vorbis/lib/books/uncoupled/Makefile.am
trunk/vorbis/lib/modes/Makefile.am
trunk/vorbis/libvorbis.spec
trunk/vorbis/vq/Makefile.am
trunk/vorbis/win32/Makefile.am
Log:
This patch fixes a few autotools issues with vorbis svn

* error out on autotools failures so warnings are caught early on
* move around AC_CANONICAL_HOST to squash warning
* add AC_CANONICAL_TARGET
* don't squash LIBS but set VORBIS_LIBS instead
* clean up AC_OUTPUT
* AUTOMAKE_OPTIONS = foreign only needs to be done toplevel
(this can be verified by checking Makefile's generated in other directories
and seeing that the var isn't used)
* use OGG_LIBS and VORBIS_LIBS in Makefile.am



Modified: trunk/vorbis/autogen.sh
===================================================================
--- trunk/vorbis/autogen.sh	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/autogen.sh	2004-07-26 13:31:38 UTC (rev 7345)
@@ -61,15 +61,15 @@
echo "Generating configuration files for $package, please wait...."

echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS || exit 1
#echo "  autoheader"
#autoheader
echo "  $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake
+$LIBTOOLIZE --automake || exit 1
echo "  automake --add-missing $AUTOMAKE_FLAGS"
-automake --add-missing $AUTOMAKE_FLAGS
+automake --add-missing $AUTOMAKE_FLAGS || exit 1
echo "  autoconf"
-autoconf
+autoconf || exit 1

cd $olddir
$srcdir/configure "$@" && echo

Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/configure.in	2004-07-26 13:31:38 UTC (rev 7345)
@@ -5,6 +5,10 @@
dnl ------------------------------------------------

AC_INIT(lib/mdct.c)
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
AM_INIT_AUTOMAKE(libvorbis,1.0.1)
AM_MAINTAINER_MODE

@@ -67,8 +71,6 @@
dnl Set build flags based on environment
dnl --------------------------------------------------

-AC_CANONICAL_HOST
-
dnl Set some target options

cflags_save="$CFLAGS"
@@ -182,12 +184,14 @@
dnl Check for libraries
dnl --------------------------------------------------

-AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
+AC_CHECK_LIB(m, cos, VORBIS_LIBS="-lm", VORBIS_LIBS="")
AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)

XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
-LIBS="$LIBS $OGG_LIBS"
+libs_save=$LIBS
+LIBS="$OGG_LIBS $VORBIS_LIBS"
AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
+LIBS=$libs_save

dnl --------------------------------------------------
dnl Check for library functions
@@ -200,9 +204,26 @@
dnl Do substitutions
dnl --------------------------------------------------

-AC_SUBST(LIBS)
+AC_SUBST(VORBIS_LIBS)
AC_SUBST(DEBUG)
AC_SUBST(PROFILE)
AC_SUBST(pthread_lib)

-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile vorbis.pc vorbisenc.pc vorbisfile.pc)
+AC_OUTPUT([
+Makefile
+lib/Makefile
+lib/modes/Makefile
+lib/books/Makefile
+lib/books/coupled/Makefile
+lib/books/uncoupled/Makefile
+lib/books/floor/Makefile
+doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
+include/Makefile include/vorbis/Makefile
+examples/Makefile
+win32/Makefile
+debian/Makefile
+vq/Makefile
+vorbis.pc
+vorbisenc.pc
+vorbisfile.pc
+])

Modified: trunk/vorbis/debian/Makefile.am
===================================================================
--- trunk/vorbis/debian/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/debian/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
EXTRA_DIST = changelog control copyright libvorbis-dev.docs \
libvorbis-dev.examples libvorbis-dev.install libvorbis0a.install \
libvorbisenc2.install libvorbisfile3.install rules

Modified: trunk/vorbis/doc/Makefile.am
===================================================================
--- trunk/vorbis/doc/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/doc/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this with automake to create Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = vorbisfile vorbisenc

docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

Modified: trunk/vorbis/doc/vorbisenc/Makefile.am
===================================================================
--- trunk/vorbis/doc/vorbisenc/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/doc/vorbisenc/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc

doc_DATA = index.html overview.html reference.html style.css\

Modified: trunk/vorbis/doc/vorbisfile/Makefile.am
===================================================================
--- trunk/vorbis/doc/vorbisfile/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/doc/vorbisfile/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile

doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\

Modified: trunk/vorbis/include/Makefile.am
===================================================================
--- trunk/vorbis/include/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/include/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = vorbis

Modified: trunk/vorbis/include/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/include/vorbis/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/include/vorbis/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
includedir = $(prefix)/include/vorbis

include_HEADERS = codec.h vorbisfile.h vorbisenc.h

Modified: trunk/vorbis/lib/Makefile.am
===================================================================
--- trunk/vorbis/lib/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
SUBDIRS = modes books

INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
@@ -18,6 +16,7 @@
registry.h scales.h window.h lookup.h lookup_data.h\
codec_internal.h backends.h bitrate.h
libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@

libvorbisfile_la_SOURCES = vorbisfile.c
libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@

Modified: trunk/vorbis/lib/books/Makefile.am
===================================================================
--- trunk/vorbis/lib/books/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/books/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,4 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
SUBDIRS = coupled uncoupled floor

Modified: trunk/vorbis/lib/books/coupled/Makefile.am
===================================================================
--- trunk/vorbis/lib/books/coupled/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/books/coupled/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = res_books_stereo.h
\ No newline at end of file
+EXTRA_DIST = res_books_stereo.h

Modified: trunk/vorbis/lib/books/floor/Makefile.am
===================================================================
--- trunk/vorbis/lib/books/floor/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/books/floor/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
EXTRA_DIST = floor_books.h

Modified: trunk/vorbis/lib/books/uncoupled/Makefile.am
===================================================================
--- trunk/vorbis/lib/books/uncoupled/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/books/uncoupled/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,5 +1,3 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
EXTRA_DIST = res_books_uncoupled.h

Modified: trunk/vorbis/lib/modes/Makefile.am
===================================================================
--- trunk/vorbis/lib/modes/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/lib/modes/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
EXTRA_DIST = floor_all.h psych_44.h residue_44.h setup_11.h setup_32.h \
setup_8.h psych_11.h psych_8.h residue_44u.h setup_16.h \
setup_44.h setup_X.h psych_16.h residue_16.h residue_8.h \

Modified: trunk/vorbis/libvorbis.spec
===================================================================
--- trunk/vorbis/libvorbis.spec	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/libvorbis.spec	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,15 +1,14 @@
Name:		libvorbis
Version:	1.0.1
-Release:	1
-Summary:	The Vorbis General Audio Compression Codec
+Release:	0.xiph.1
+Summary:	The Vorbis General Audio Compression Codec.

Group:		System Environment/Libraries
License:	BSD
URL:		http://www.xiph.org/
Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-root
+Source:		http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root

# We're forced to use an epoch since both Red Hat and Ximian use it in their
# rc packages
@@ -49,24 +48,20 @@
make

%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT

-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig

-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
-%doc COPYING
-%doc AUTHORS
-%doc README
+%doc AUTHORS COPYING README
%{_libdir}/libvorbis.so.*
%{_libdir}/libvorbisfile.so.*
%{_libdir}/libvorbisenc.so.*
@@ -78,6 +73,7 @@
%doc doc/vorbisfile
%doc doc/vorbisenc
%{_datadir}/aclocal/vorbis.m4
+%dir %{_includedir}/vorbis
%{_includedir}/vorbis/codec.h
%{_includedir}/vorbis/vorbisfile.h
%{_includedir}/vorbis/vorbisenc.h
@@ -95,6 +91,14 @@
%{_libdir}/pkgconfig/vorbisenc.pc

%changelog
+* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- autogenerate from configure
+- fix download location
+- remove Prefix
+- own include dir
+- move ldconfig runs to -p scripts
+- change Release tag to include xiph
+
* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
- update for 1.0.1 release


Modified: trunk/vorbis/vq/Makefile.am
===================================================================
--- trunk/vorbis/vq/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/vq/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@

EXTRA_PROGRAMS = latticebuild latticepare latticehint\

Modified: trunk/vorbis/win32/Makefile.am
===================================================================
--- trunk/vorbis/win32/Makefile.am	2004-07-26 06:26:30 UTC (rev 7344)
+++ trunk/vorbis/win32/Makefile.am	2004-07-26 13:31:38 UTC (rev 7345)
@@ -1,8 +1,5 @@
## Process this with automake to create Makefile.in

-AUTOMAKE_OPTIONS = foreign
-
-
EXTRA_DIST = vorbis.def vorbis_dynamic.dsp vorbis_static.dsp\
vorbisfile.def vorbisfile_dynamic.dsp vorbisfile_static.dsp\
vorbisenc.def vorbisenc_dynamic.dsp vorbisenc_static.dsp\



More information about the commits mailing list