rpms/vorbis-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed seting flags for stderr (#467064)

Browse Source
This commit is contained in:
Zdenek Prikryl 2008-10-21 07:41:38 +00:00
parent ad0925744a
commit 828ed0a4b8
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
vorbis-tools-1.2.0-non-block.patch Normal file
View File

@ -0,0 +1,45 @@
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,

8
vorbis-tools.spec
View File

@ -1,12 +1,13 @@
Summary: The Vorbis General Audio Compression Codec tools
Name: vorbis-tools
Version: 1.2.0
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 1
Group: Applications/Multimedia
License: GPLv2
URL: http://www.xiph.org/
Source: http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
Patch0: vorbis-tools-1.2.0-non-block.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libvorbis-devel libao-devel curl-devel speex-devel flac-devel
Obsoletes: vorbis < %{epoch}:%{version}-%{release}
@ -23,7 +24,7 @@ comment editor.
%prep
%setup -q
%patch0 -p1 -b .non-block
%build
%configure
@ -48,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Oct 21 2008 Zdenek Prikryl <zprikryl@redhat.com> - 1:1.2.0-3
- fixed seting flags for stderr (#467064)
* Sat May 31 2008 Hans de Goede <j.w.r.degoede@hhs.n> - 1:1.2.0-2
- Stop calling autoconf, this was no longer necessarry and in current
rawhide breaks us from building (because aclocal.m4 does not match