- new upstream release
This commit is contained in:
Kamil Dudka
parent
85f856f29c
commit
c5c9bd65e9
|
|
@ -1 +1 @@
|
|||
vorbis-tools-1.2.0.tar.gz
|
||||
vorbis-tools-1.4.0.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
df976d24e51ef3d87cd462edf747bf9a vorbis-tools-1.2.0.tar.gz
|
||||
567e0fb8d321b2cd7124f8208b8b90e6 vorbis-tools-1.4.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
diff -up vorbis-tools-1.2.0/ogg123/ogg123.c.non-block vorbis-tools-1.2.0/ogg123/ogg123.c
|
||||
--- vorbis-tools-1.2.0/ogg123/ogg123.c.non-block 2008-03-03 06:37:26.000000000 +0100
|
||||
+++ vorbis-tools-1.2.0/ogg123/ogg123.c 2008-10-16 10:35:12.000000000 +0200
|
||||
@@ -504,6 +504,7 @@ int main(int argc, char **argv)
|
||||
|
||||
}
|
||||
playlist_array_destroy(playlist_array, items);
|
||||
+ status_deinit();
|
||||
|
||||
exit (exit_status);
|
||||
}
|
||||
diff -up vorbis-tools-1.2.0/ogg123/status.c.non-block vorbis-tools-1.2.0/ogg123/status.c
|
||||
--- vorbis-tools-1.2.0/ogg123/status.c.non-block 2008-03-03 06:37:26.000000000 +0100
|
||||
+++ vorbis-tools-1.2.0/ogg123/status.c 2008-10-16 10:52:52.000000000 +0200
|
||||
@@ -324,12 +324,18 @@ void stat_format_cleanup (stat_format_t
|
||||
void status_init (int verbosity)
|
||||
{
|
||||
#if defined(HAVE_FCNTL) && defined(HAVE_UNISTD_H)
|
||||
- fcntl (STDERR_FILENO, F_SETFL, O_NONBLOCK);
|
||||
+ fcntl (STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
|
||||
#endif
|
||||
|
||||
max_verbosity = verbosity;
|
||||
}
|
||||
|
||||
+void status_deinit ()
|
||||
+{
|
||||
+#if defined(HAVE_FCNTL) && defined(HAVE_UNISTD_H)
|
||||
+ fcntl (STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) & ~O_NONBLOCK);
|
||||
+#endif
|
||||
+}
|
||||
|
||||
void status_reset_output_lock ()
|
||||
{
|
||||
diff -up vorbis-tools-1.2.0/ogg123/status.h.non-block vorbis-tools-1.2.0/ogg123/status.h
|
||||
--- vorbis-tools-1.2.0/ogg123/status.h.non-block 2008-03-03 06:37:26.000000000 +0100
|
||||
+++ vorbis-tools-1.2.0/ogg123/status.h 2008-10-16 10:34:43.000000000 +0200
|
||||
@@ -60,6 +60,7 @@ stat_format_t *stat_format_create ();
|
||||
void stat_format_cleanup (stat_format_t *stats);
|
||||
|
||||
void status_init (int verbosity);
|
||||
+void status_deinit ();
|
||||
void status_reset_output_lock ();
|
||||
void status_clear_line ();
|
||||
void status_print_statistics (stat_format_t *stats,
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
diff -rup vorbis-tools-1.2.0.orig/oggenc/oggenc.c vorbis-tools-1.2.0/oggenc/oggenc.c
|
||||
--- vorbis-tools-1.2.0.orig/oggenc/oggenc.c 2008-03-03 06:37:27.000000000 +0100
|
||||
+++ vorbis-tools-1.2.0/oggenc/oggenc.c 2009-10-06 21:27:09.398047466 +0200
|
||||
@@ -147,6 +147,7 @@ int main(int argc, char **argv)
|
||||
char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
|
||||
char *date=NULL, *genre=NULL;
|
||||
input_format *format;
|
||||
+ int resampled = 0;
|
||||
|
||||
/* Set various encoding defaults */
|
||||
|
||||
@@ -324,6 +325,8 @@ int main(int argc, char **argv)
|
||||
|
||||
if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
|
||||
int fromrate = enc_opts.rate;
|
||||
+
|
||||
+ resampled = 1;
|
||||
enc_opts.resamplefreq = opt.resamplefreq;
|
||||
if(setup_resample(&enc_opts)) {
|
||||
errors++;
|
||||
@@ -369,7 +372,7 @@ int main(int argc, char **argv)
|
||||
clear_scaler(&enc_opts);
|
||||
if(opt.downmix)
|
||||
clear_downmix(&enc_opts);
|
||||
- if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
|
||||
+ if(resampled)
|
||||
clear_resample(&enc_opts);
|
||||
clear_all:
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
567e0fb8d321b2cd7124f8208b8b90e6 vorbis-tools-1.4.0.tar.gz
|
||||
|
|
@ -0,0 +1 @@
|
|||
fc6a820bdb5ad6fcac074721fab5c3f96eaf6562 vorbis-tools-1.4.0.tar.gz
|
||||
|
|
@ -1,16 +1,18 @@
|
|||
Summary: The Vorbis General Audio Compression Codec tools
|
||||
Name: vorbis-tools
|
||||
Version: 1.2.0
|
||||
Release: 7%{?dist}
|
||||
Version: 1.4.0
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Group: Applications/Multimedia
|
||||
License: GPLv2
|
||||
URL: http://www.xiph.org/
|
||||
Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
|
||||
Patch0: vorbis-tools-1.2.0-non-block.patch
|
||||
Patch1: vorbis-tools-1.2.0-oggenc-resample.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libvorbis-devel libao-devel curl-devel speex-devel flac-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: libao-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: speex-devel
|
||||
Obsoletes: vorbis < %{epoch}:%{version}-%{release}
|
||||
Provides: vorbis = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
|
@ -25,8 +27,6 @@ comment editor.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 26 2010 Kamil Dudka <kdudka@redhat.com> - 1:1.4.0-1
|
||||
- new upstream release
|
||||
|
||||
* Wed Nov 25 2009 Kamil Dudka <kdudka@redhat.com> - 1:1.2.0-7
|
||||
- fix source URL
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue