[xiph-cvs] cvs commit: vorbis-tools/win32 Makefile.am

[Jack Moffitt]

jack        01/12/31 16:44:16

  Modified:    .        configure.in vorbis-tools.spec
               oggenc   Makefile.am encode.c
  Added:       win32    Makefile.am
  Removed:     oggenc   build_oggenc.bat
  Log:
  Last minute build fixes for rc3.

Revision  Changes    Path
1.33      +2 -2      vorbis-tools/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure.in	2001/12/19 02:52:52	1.32
+++ configure.in	2002/01/01 00:44:14	1.33
@@ -5,7 +5,7 @@
 dnl ------------------------------------------------
 
 AC_INIT(oggenc/encode.c)
-AM_INIT_AUTOMAKE(vorbis-tools,1.0rc2)
+AM_INIT_AUTOMAKE(vorbis-tools,1.0rc3)
 
 dnl --------------------------------------------------  
 dnl Check for programs
@@ -124,4 +124,4 @@
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 
-AC_OUTPUT(Makefile include/Makefile share/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile debian/Makefile)
+AC_OUTPUT(Makefile include/Makefile share/Makefile win32/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile debian/Makefile)

1.23      +6 -4      vorbis-tools/vorbis-tools.spec

Index: vorbis-tools.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbis-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vorbis-tools.spec	2001/12/20 03:32:19	1.22
+++ vorbis-tools.spec	2002/01/01 00:44:14	1.23
@@ -1,5 +1,5 @@
 %define name	vorbis-tools
-%define version	1.0rc2
+%define version	1.0rc3
 %define release 1
 
 Summary:	Several Ogg Vorbis Tools
@@ -12,9 +12,9 @@
 Vendor:		Xiphophorus <team at xiph.org>
 Source:		ftp://ftp.xiph.org/pub/vorbis-tools/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-root
-Requires:       libogg >= 1.0rc2
-Requires:       libvorbis >= 1.0rc2
-Requires:       libao >= 0.8.0
+Requires:       libogg >= 1.0rc3
+Requires:       libvorbis >= 1.0rc3
+Requires:       libao >= 0.8.2
 Requires:       libcurl >= 7.8
 Prefix:		%{_prefix}
 
@@ -57,6 +57,8 @@
 %postun
 
 %changelog
+* Mon Dec 31 2001 Jack Moffitt <jack at xiph.org>
+- Update for rc3 release.
 * Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
 - Updated for configurable prefix
 * Sun Aug 12 2001 Greg Maxwell <greg at linuxpower.cx>

1.15      +1 -1      vorbis-tools/oggenc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am	2001/12/21 18:34:02	1.14
+++ Makefile.am	2002/01/01 00:44:15	1.15
@@ -15,7 +15,7 @@
 oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \
                  audio.h encode.h platform.h
 
-EXTRA_DIST = oggenc.dsp build_oggenc.bat
+#EXTRA_DIST = oggenc.dsp build_oggenc.bat
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

1.16      +2 -0      vorbis-tools/oggenc/encode.c

Index: encode.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/encode.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- encode.c	2001/12/21 12:46:06	1.15
+++ encode.c	2002/01/01 00:44:15	1.16
@@ -53,6 +53,7 @@
 
         if(opt->quality >= 0.0f)
         {
+		printf("Encoding with VBR\n");
                 if(vorbis_encode_init_vbr(&vi, opt->channels, opt->rate, opt->quality))
                 {
                         fprintf(stderr, "Mode initialisation failed: invalid parameters for quality\n");
@@ -62,6 +63,7 @@
         }
         else
         {
+		printf("Encoding with managed bitrates.\n");
                 if(vorbis_encode_init(&vi, opt->channels, opt->rate, 
                     opt->max_bitrate>0?opt->max_bitrate*1000:-1,
                                     opt->bitrate*1000, 

1.1                  vorbis-tools/win32/Makefile.am

Index: Makefile.am
===================================================================
## Process this file with automake to produce Makefile.in

AUTOMAKE_OPTIONS = foreign dist-zip

EXTRA_DIST = oggenc.dsp oggenc_dynamic.dsp ogginfo.dsp tools.dsp tools.dsw\
        tools.opt vcut.dsp vorbiscomment.dsp

debug:
        $(MAKE) all CFLAGS="@DEBUG@"

profile:
        $(MAKE) all CFLAGS="@PROFILE@"

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.