Commit 9a888688 authored by Jack Moffitt's avatar Jack Moffitt

Last minute build fixes for rc3.

svn path=/trunk/vorbis-tools/; revision=2926
parent 80c79b75
...@@ -5,7 +5,7 @@ dnl Initialization ...@@ -5,7 +5,7 @@ dnl Initialization
dnl ------------------------------------------------ dnl ------------------------------------------------
AC_INIT(oggenc/encode.c) AC_INIT(oggenc/encode.c)
AM_INIT_AUTOMAKE(vorbis-tools,1.0rc2) AM_INIT_AUTOMAKE(vorbis-tools,1.0rc3)
dnl -------------------------------------------------- dnl --------------------------------------------------
dnl Check for programs dnl Check for programs
...@@ -124,4 +124,4 @@ AC_SUBST(SHARE_LIBS) ...@@ -124,4 +124,4 @@ AC_SUBST(SHARE_LIBS)
AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS) 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)
...@@ -15,7 +15,7 @@ oggenc_DEPENDENCIES = @SHARE_LIBS@ ...@@ -15,7 +15,7 @@ oggenc_DEPENDENCIES = @SHARE_LIBS@
oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \ oggenc_SOURCES = oggenc.c audio.c encode.c platform.c \
audio.h encode.h platform.h audio.h encode.h platform.h
EXTRA_DIST = oggenc.dsp build_oggenc.bat #EXTRA_DIST = oggenc.dsp build_oggenc.bat
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"
......
@echo off
echo ---+++--- Building oggenc ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
set OLDLIB=%LIB%
call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
echo Setting include/lib paths for Vorbis
set INCLUDE=%INCLUDE%;%SRCROOT%\ogg\include;%SRCROOT%\vorbis\include
set LIB=%LIB%;%SRCROOT%\ogg\win32\Static_Release;%SRCROOT%\vorbis\win32\Static_Release
echo Compiling...
msdev oggenc.dsp /useenv /make "oggenc - Win32 Release" /rebuild
set PATH=%OLDPATH%
set INCLUDE=%OLDINCLUDE%
set LIB=%OLDLIB%
...@@ -53,6 +53,7 @@ int oe_encode(oe_enc_opt *opt) ...@@ -53,6 +53,7 @@ int oe_encode(oe_enc_opt *opt)
if(opt->quality >= 0.0f) if(opt->quality >= 0.0f)
{ {
printf("Encoding with VBR\n");
if(vorbis_encode_init_vbr(&vi, opt->channels, opt->rate, opt->quality)) if(vorbis_encode_init_vbr(&vi, opt->channels, opt->rate, opt->quality))
{ {
fprintf(stderr, "Mode initialisation failed: invalid parameters for quality\n"); fprintf(stderr, "Mode initialisation failed: invalid parameters for quality\n");
...@@ -62,6 +63,7 @@ int oe_encode(oe_enc_opt *opt) ...@@ -62,6 +63,7 @@ int oe_encode(oe_enc_opt *opt)
} }
else else
{ {
printf("Encoding with managed bitrates.\n");
if(vorbis_encode_init(&vi, opt->channels, opt->rate, if(vorbis_encode_init(&vi, opt->channels, opt->rate,
opt->max_bitrate>0?opt->max_bitrate*1000:-1, opt->max_bitrate>0?opt->max_bitrate*1000:-1,
opt->bitrate*1000, opt->bitrate*1000,
......
%define name vorbis-tools %define name vorbis-tools
%define version 1.0rc2 %define version 1.0rc3
%define release 1 %define release 1
Summary: Several Ogg Vorbis Tools Summary: Several Ogg Vorbis Tools
...@@ -12,9 +12,9 @@ URL: http://www.xiph.org/ ...@@ -12,9 +12,9 @@ URL: http://www.xiph.org/
Vendor: Xiphophorus <team@xiph.org> Vendor: Xiphophorus <team@xiph.org>
Source: ftp://ftp.xiph.org/pub/vorbis-tools/%{name}-%{version}.tar.gz Source: ftp://ftp.xiph.org/pub/vorbis-tools/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
Requires: libogg >= 1.0rc2 Requires: libogg >= 1.0rc3
Requires: libvorbis >= 1.0rc2 Requires: libvorbis >= 1.0rc3
Requires: libao >= 0.8.0 Requires: libao >= 0.8.2
Requires: libcurl >= 7.8 Requires: libcurl >= 7.8
Prefix: %{_prefix} Prefix: %{_prefix}
...@@ -57,6 +57,8 @@ make DESTDIR=$RPM_BUILD_ROOT install ...@@ -57,6 +57,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
%postun %postun
%changelog %changelog
* Mon Dec 31 2001 Jack Moffitt <jack@xiph.org>
- Update for rc3 release.
* Sun Oct 07 2001 Jack Moffitt <jack@xiph.org> * Sun Oct 07 2001 Jack Moffitt <jack@xiph.org>
- Updated for configurable prefix - Updated for configurable prefix
* Sun Aug 12 2001 Greg Maxwell <greg@linuxpower.cx> * Sun Aug 12 2001 Greg Maxwell <greg@linuxpower.cx>
......
## 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@"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment