rpms/vorbis-tools/devel vorbis-tools-1.2.0-non-block.patch, NONE, 1.1 vorbis-tools.spec, 1.34, 1.35
Zdenek Prikryl
zprikryl at fedoraproject.org
Tue Oct 21 07:42:09 UTC 2008
Author: zprikryl
Update of /cvs/extras/rpms/vorbis-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12269
Modified Files:
vorbis-tools.spec
Added Files:
vorbis-tools-1.2.0-non-block.patch
Log Message:
fixed seting flags for stderr (#467064)
vorbis-tools-1.2.0-non-block.patch:
--- NEW FILE vorbis-tools-1.2.0-non-block.patch ---
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,
Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- vorbis-tools.spec 31 May 2008 14:36:17 -0000 1.34
+++ vorbis-tools.spec 21 Oct 2008 07:41:38 -0000 1.35
@@ -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 @@
%prep
%setup -q
-
+%patch0 -p1 -b .non-block
%build
%configure
@@ -48,6 +49,9 @@
%changelog
+* Tue Oct 21 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1:1.2.0-3
+- fixed seting flags for stderr (#467064)
+
* Sat May 31 2008 Hans de Goede <j.w.r.degoede at 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
More information about the scm-commits
mailing list