rpms/vorbis-tools/F-9 vorbis-tools-1.2.0-non-block.patch, NONE, 1.1 vorbis-tools.spec, 1.33, 1.34

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/vorbis-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13102

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/F-9/vorbis-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vorbis-tools.spec	11 Mar 2008 12:25:38 -0000	1.33
+++ vorbis-tools.spec	21 Oct 2008 07:50:22 -0000	1.34
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -9,6 +9,7 @@
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.0-build.patch
 Patch1:		vorbis-tools-1.0-curlconfig.patch
+Patch2:		vorbis-tools-1.2.0-non-block.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	libogg >= 2:1.1
 Requires:	libvorbis >= 1:%{version} 
@@ -34,8 +35,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .build
+%patch1 -p1 -b .curlconfig
+%patch2 -p1 -b .non-block
 
 %build
 autoconf
@@ -63,6 +65,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 21 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1:1.2.0-2
+- fixed seting flags for stderr (#467064)
+
 * Tue Mar 11 2008 Jindrich Novy <jnovy at redhat.com> - 1:1.2.0-1
 - update to 1.2.0
 - remove libcurl and oggdec patches, applied upstream