Hello community, here is the log from the commit of package xawtv checked in at Sat Aug 2 06:04:20 CEST 2008. -------- --- xawtv/xawtv.changes 2007-08-06 23:55:13.000000000 +0200 +++ xawtv/xawtv.changes 2008-07-29 14:54:17.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 29 14:48:21 CEST 2008 - mmarek@suse.cz + +- don't print spurious error messages in xioctl() (bnc#404034) + +------------------------------------------------------------------- New: ---- xawtv-xioctl-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xawtv.spec ++++++ --- /var/tmp/diff_new_pack.z10190/_old 2008-08-02 05:58:14.000000000 +0200 +++ /var/tmp/diff_new_pack.z10190/_new 2008-08-02 05:58:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xawtv (Version 3.95) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,16 +10,17 @@ # norootforbuild + Name: xawtv BuildRequires: aalib-devel alsa-devel freeglut-devel gcc-c++ libdrm-devel libjpeg-devel libpng-devel lirc openmotif openmotif-devel recode slang-devel update-desktop-files xorg-x11-devel zvbi-devel -URL: http://bytesex.org/xawtv/ +Url: http://bytesex.org/xawtv/ License: GPL v2 or later Group: Hardware/TV Requires: v4l-conf, tv-common, tv-fonts, pia Conflicts: xaw3dd -Autoreqprov: on +AutoReqProv: on Version: 3.95 -Release: 81 +Release: 179 Summary: Video4Linux TV application (Athena) Source: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop @@ -28,6 +29,7 @@ Patch1: xawtv-strip.patch Patch2: xawtv-pagemask.patch Patch3: xawtv.PAGE_SIZE.patch +Patch4: xawtv-xioctl-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -43,6 +45,7 @@ Gerd Knorr <kraxel@suse.de> %package -n motv +License: GPL v2 or later Summary: Video4Linux TV application (Motif) Group: Hardware/TV Requires: v4l-conf, tv-common, tv-fonts, pia @@ -63,6 +66,7 @@ Gerd Knorr <kraxel@suse.de> %package -n tv-common +License: GPL v2 or later Summary: Fonts, Tools, and some READMEs for motv and xawtv Group: Development/Libraries/C and C++ Provides: xawtv:/usr/X11R6/lib/X11/fonts/misc/led-iso8859-1.bdf @@ -79,6 +83,7 @@ Gerd Knorr <kraxel@suse.de> %package -n v4l-conf +License: GPL v2 or later Summary: Video4linux Configuration Tool Group: Hardware/TV Provides: xawtv:%{_bindir}/v4l-conf @@ -94,6 +99,7 @@ Gerd Knorr <kraxel@suse.de> %package -n v4l-tools +License: GPL v2 or later Summary: video4linux terminal / command line utilities Group: Hardware/TV Requires: v4l-conf, tv-common @@ -113,6 +119,7 @@ Gerd Knorr <kraxel@suse.de> %package -n alevtd +License: GPL v2 or later Summary: http server for teletext pages Group: Productivity/Networking/Web/Servers @@ -128,6 +135,7 @@ Edgar Toernig <froese@gmx.de> %package -n pia +License: GPL v2 or later Summary: Simple Movie Player Group: Productivity/Multimedia/Video/Players Requires: tv-common @@ -149,6 +157,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build autoreconf -fi @@ -278,7 +287,6 @@ %post -n v4l-conf %run_permissions - %verifyscript %verify_permissions -e %{_bindir}/v4l-conf @@ -287,176 +295,178 @@ rm -rf "%{buildroot}" %changelog -* Mon Aug 06 2007 - olh@suse.de +* Tue Jul 29 2008 mmarek@suse.cz +- don't print spurious error messages in xioctl() (bnc#404034) +* Tue Aug 07 2007 olh@suse.de - remove PAGE_SIZE useage and inclusion of asm/page.h -* Sat May 19 2007 - coolo@suse.de +* Sat May 19 2007 coolo@suse.de - remove translations from desktop files -* Thu Apr 19 2007 - ro@suse.de +* Thu Apr 19 2007 ro@suse.de - added %%{_mandir}/fr directory to filelist -* Fri Mar 30 2007 - rguenther@suse.de +* Fri Mar 30 2007 rguenther@suse.de - add %%{_mandir}/fr/man1 directory. -* Mon Oct 16 2006 - kraxel@suse.de +* Mon Oct 16 2006 kraxel@suse.de - fix build failure. -* Thu Aug 17 2006 - cthiel@suse.de +* Thu Aug 17 2006 cthiel@suse.de - update to version 3.95 * misc minor fixes collected over time. * make it build with gcc4. - drop xawtv-gcc4.patch - fix build with X.Org 7.1 -* Fri May 19 2006 - ro@suse.de +* Fri May 19 2006 ro@suse.de - fix build on ppc64 -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - schwab@suse.de +* Fri Jan 20 2006 schwab@suse.de - Don't strip binaries. -* Wed Oct 12 2005 - sbrabec@suse.cz +* Wed Oct 12 2005 sbrabec@suse.cz - Force glib2 using gtk1-compat-devel. - Enabled DV support. -* Fri Apr 22 2005 - ro@suse.de +* Fri Apr 22 2005 ro@suse.de - hack to build with gcc4 -* Fri Nov 19 2004 - ro@suse.de +* Fri Nov 19 2004 ro@suse.de - include icon in file list -* Wed Nov 10 2004 - ro@suse.de +* Wed Nov 10 2004 ro@suse.de - fixed permissions handling for v4l-conf -* Wed Aug 18 2004 - kraxel@suse.de +* Wed Aug 18 2004 kraxel@suse.de - update to version 3.94. -* Thu Apr 22 2004 - kraxel@suse.de +* Thu Apr 22 2004 kraxel@suse.de - update to version 3.92. -* Thu Jan 29 2004 - kraxel@suse.de +* Thu Jan 29 2004 kraxel@suse.de - update to version 3.91. -* Tue Oct 28 2003 - kraxel@suse.de +* Tue Oct 28 2003 kraxel@suse.de - %%run_permission fixes. -* Mon Oct 27 2003 - kraxel@suse.de +* Mon Oct 27 2003 kraxel@suse.de - some spec file tweaks to make the package also build on older distributions. -* Fri Oct 17 2003 - kraxel@suse.de +* Fri Oct 17 2003 kraxel@suse.de - updated to version 3.90 -* Fri Sep 12 2003 - kraxel@suse.de +* Fri Sep 12 2003 kraxel@suse.de - added bugfix for a segfault. - added conflicts: xaw3dd to xawtv (#12466). -* Fri Aug 29 2003 - kukuk@suse.de +* Fri Aug 29 2003 kukuk@suse.de - Change group to video for v4l-conf (like /etc/permissions has) -* Thu Aug 21 2003 - kraxel@suse.de +* Thu Aug 21 2003 kraxel@suse.de - more file list fixes. -* Sat Aug 16 2003 - adrian@suse.de +* Sat Aug 16 2003 adrian@suse.de - add desktop files from kappfinder -* Thu Aug 14 2003 - kraxel@suse.de +* Thu Aug 14 2003 kraxel@suse.de - fixup file lists (#28805). -* Wed Jun 18 2003 - kraxel@suse.de +* Wed Jun 18 2003 kraxel@suse.de - fixup file lists. -* Mon May 26 2003 - kraxel@suse.de +* Mon May 26 2003 kraxel@suse.de - fixup file lists. -* Wed Apr 16 2003 - kraxel@suse.de +* Wed Apr 16 2003 kraxel@suse.de - updated to version 3.88 -* Tue Apr 15 2003 - kraxel@suse.de +* Tue Apr 15 2003 kraxel@suse.de - updated to version 3.87 -* Mon Mar 31 2003 - ro@suse.de +* Mon Mar 31 2003 ro@suse.de - use mesa-devel-packages in neededforbuild -* Tue Mar 25 2003 - kraxel@suse.de +* Wed Mar 26 2003 kraxel@suse.de - updates to version 3.86 -* Thu Feb 20 2003 - kraxel@suse.de +* Thu Feb 20 2003 kraxel@suse.de - fix two segfaults in motv (one of them being bug #23958). -* Mon Feb 10 2003 - kraxel@suse.de +* Mon Feb 10 2003 kraxel@suse.de - updated to version 3.85 -* Fri Feb 07 2003 - kraxel@suse.de +* Fri Feb 07 2003 kraxel@suse.de - updated to version 3.84 -* Fri Jan 17 2003 - kraxel@suse.de +* Fri Jan 17 2003 kraxel@suse.de - updated to version 3.83 -* Tue Dec 10 2002 - kraxel@suse.de +* Tue Dec 10 2002 kraxel@suse.de - updated to version 3.81 -* Fri Nov 15 2002 - kraxel@suse.de +* Fri Nov 15 2002 kraxel@suse.de - updated to version 3.79 -* Fri Aug 16 2002 - kraxel@suse.de +* Fri Aug 16 2002 kraxel@suse.de - added alevtd bugfix. -* Wed Jul 24 2002 - kraxel@suse.de +* Wed Jul 24 2002 kraxel@suse.de - updated to version 3.76 - more neededforbuild fixes (alsa, mesa, lirc). -* Fri Jun 21 2002 - ro@suse.de +* Fri Jun 21 2002 ro@suse.de - added xf86 and libjpeg to neededforbuild - added glib,glib-devel to neededforbuild (for libquicktime) - added openmotif,openmotif-devel (for motv) - added aalib,aalib-devel,slang,slang-devel (for ttv) -* Thu Jun 20 2002 - kraxel@suse.de +* Thu Jun 20 2002 kraxel@suse.de - updated to version 3.75 -* Mon Mar 18 2002 - kraxel@suse.de +* Mon Mar 18 2002 kraxel@suse.de - one-liner Fix for ppm snapshots. -* Fri Feb 22 2002 - kraxel@suse.de +* Fri Feb 22 2002 kraxel@suse.de - updated to version 3.72 -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Mon Jan 28 2002 - kraxel@suse.de +* Mon Jan 28 2002 kraxel@suse.de - updated to version 3.68 -* Tue Sep 11 2001 - kraxel@suse.de +* Tue Sep 11 2001 kraxel@suse.de - fixed bugzilla #10420 - merged another one-liner fix for a segfault from current xawtv tree. -* Mon Sep 03 2001 - kraxel@suse.de +* Mon Sep 03 2001 kraxel@suse.de - updated to version 3.61 -* Fri Aug 31 2001 - ro@suse.de +* Fri Aug 31 2001 ro@suse.de - added slang to neededforbuild (for aalib) -* Wed Aug 15 2001 - kraxel@suse.de +* Wed Aug 15 2001 kraxel@suse.de - updated to version 3.60 -* Mon Jul 30 2001 - kraxel@suse.de +* Mon Jul 30 2001 kraxel@suse.de - updated to version 3.57 -* Fri Jul 20 2001 - kraxel@suse.de +* Fri Jul 20 2001 kraxel@suse.de - splitted into multiple, smaller packages. -* Tue Jul 17 2001 - kraxel@suse.de +* Tue Jul 17 2001 kraxel@suse.de - updated to version 3.56 -* Wed Jul 11 2001 - kraxel@suse.de +* Wed Jul 11 2001 kraxel@suse.de - updated to version 3.55 -* Mon Jun 25 2001 - kraxel@suse.de +* Mon Jun 25 2001 kraxel@suse.de - updated to version 3.53 -* Mon Apr 30 2001 - kraxel@suse.de +* Mon Apr 30 2001 kraxel@suse.de - Deleted the %%post script with mkfontdir. It's not required as /sbin/conf.d/SuSEconfig.fonts does that and causes problems at install time [bug #7425] -* Mon Apr 09 2001 - kraxel@suse.de +* Mon Apr 09 2001 kraxel@suse.de - updated to version 3.43 - fixed %%post script -* Fri Apr 06 2001 - kraxel@suse.de +* Fri Apr 06 2001 kraxel@suse.de - updated to version 3.42 - build with quicktime4linux lib and xfree4 - created new subpackage for alevtd -* Thu Apr 05 2001 - uli@suse.de +* Thu Apr 05 2001 uli@suse.de - removed lx_suse from neededforbuild -* Thu Jan 11 2001 - ro@suse.de +* Thu Jan 11 2001 ro@suse.de - fixed doc list -* Mon Jan 08 2001 - mt@suse.de +* Mon Jan 08 2001 mt@suse.de - renamed consolefont lat1-16.psf* to lat1-16.psfu* in fbtools.c -* Sun Aug 27 2000 - mt@suse.de +* Sun Aug 27 2000 mt@suse.de - added xf86_3x and xdevel3 to #needforbuild -* Wed Jul 05 2000 - mt@suse.de +* Wed Jul 05 2000 mt@suse.de - update to 3.17 (works really fine with lx_suse >= 2.2.16-7) - kradio is not a part of the xawtv source any more -* Mon Sep 27 1999 - bs@suse.de +* Mon Sep 27 1999 bs@suse.de - fixed requirements for sub packages -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Sep 09 1999 - bs@suse.de +* Thu Sep 09 1999 bs@suse.de - fixed call of Check at the end of %%install section -* Sat Jul 17 1999 - mt@suse.de +* Sat Jul 17 1999 mt@suse.de - updated to 2.46 (bug fixes version) - added some security patches -* Wed Jun 02 1999 - mt@suse.de +* Wed Jun 02 1999 mt@suse.de - fixed ChannelEditor PopDown-Action (Close Button) -* Wed Jun 02 1999 - mt@suse.de +* Wed Jun 02 1999 mt@suse.de - updated to 2.45 - adapted security fixes/checks by marc from previous releases -* Mon Apr 05 1999 - bs@suse.de +* Mon Apr 05 1999 bs@suse.de - fixed date strings in .changes. -* Thu Mar 25 1999 - mt@suse.de +* Thu Mar 25 1999 mt@suse.de - security fixes/checks by marc -* Fri Mar 19 1999 - mt@suse.de +* Fri Mar 19 1999 mt@suse.de - fixed filelist in spec -* Fri Mar 19 1999 - mt@suse.de +* Fri Mar 19 1999 mt@suse.de - new version 2.38 -* Mon Nov 16 1998 - mt@suse.de +* Mon Nov 16 1998 mt@suse.de - new version 2.29 -* Wed Oct 07 1998 - ro@suse.de +* Wed Oct 07 1998 ro@suse.de - detect which directory contains QT -* Mon Jul 13 1998 - mt@suse.de +* Mon Jul 13 1998 mt@suse.de - added /usr/bin/radio, changed /dev/radio to /dev/bttv-fm (c,81,64) -* Sat Jul 11 1998 - bs@suse.de +* Sat Jul 11 1998 bs@suse.de - fixed neededforbuild -* Fri Jul 10 1998 - mt@suse.de +* Fri Jul 10 1998 mt@suse.de - new version 2.14 with v4l interface ++++++ xawtv-xioctl-error.patch ++++++ --- libng/plugins/drv0-v4l2.c | 4 ++-- libng/plugins/drv1-v4l.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- libng/plugins/drv0-v4l2.c.orig +++ libng/plugins/drv0-v4l2.c @@ -166,12 +166,12 @@ xioctl(int fd, int cmd, void *arg, int m int rc; rc = ioctl(fd,cmd,arg); - if (0 == rc && ng_debug < 2) + if (rc >= 0 && ng_debug < 2) return rc; if (mayfail && errno == mayfail && ng_debug < 2) return rc; print_ioctl(stderr,ioctls_v4l2,PREFIX,cmd,arg); - fprintf(stderr,": %s\n",(rc == 0) ? "ok" : strerror(errno)); + fprintf(stderr,": %s\n",(rc >= 0) ? "ok" : strerror(errno)); return rc; } --- libng/plugins/drv1-v4l.c.orig +++ libng/plugins/drv1-v4l.c @@ -219,10 +219,10 @@ xioctl(int fd, int cmd, void *arg) int rc; rc = ioctl(fd,cmd,arg); - if (0 == rc && ng_debug < 2) + if (rc >= 0 && ng_debug < 2) return 0; print_ioctl(stderr,ioctls_v4l1,PREFIX,cmd,arg); - fprintf(stderr,": %s\n",(rc == 0) ? "ok" : strerror(errno)); + fprintf(stderr,": %s\n",(rc >= 0) ? "ok" : strerror(errno)); return rc; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org