Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at Mon Mar 1 18:11:01 CET 2010. -------- --- mjpegtools/mjpegtools.changes 2009-11-21 09:31:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2010-03-01 18:04:25.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 1 17:02:04 UTC 2010 - puzel@novell.com + +- mjpegtools-1.9.0-fix-compiler-error.patch + - fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mjpegtools-1.9.0-fix-compiler-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.i4DdtR/_old 2010-03-01 18:10:46.000000000 +0100 +++ /var/tmp/diff_new_pack.i4DdtR/_new 2010-03-01 18:10:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools (Version 1.9.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,12 +23,12 @@ #BuildRequires: gtk1-compat-devel #BuildRequires: libmovtar popt-devel Url: http://mjpeg.sourceforge.net/ -License: BSD 3-clause (or similar) ; GPL v2 or later +License: BSD3c(or similar) ; GPLv2+ Group: Productivity/Multimedia/Video/Editors and Convertors PreReq: %install_info_prereq AutoReqProv: on Version: 1.9.0 -Release: 3 +Release: 4 Summary: MJPEG Video Capture and Processing Tools %if 0%{?BUILD_ORIG} Source0: %{name}-%{version}.tar.bz2 @@ -44,6 +44,7 @@ Patch5: mjpegtools-getopt.patch Patch6: mjpegtools-writeable_strings.patch Patch7: mjpegtools-fix-invalid-conversion.patch +Patch8: mjpegtools-1.9.0-fix-compiler-error.patch Patch100: %{name}-codecpatch.patch %description @@ -64,7 +65,7 @@ Ronald Bultje %package devel -License: BSD 3-clause (or similar) ; GPL v2 or later +License: BSD3c(or similar) ; GPLv2+ Group: Productivity/Multimedia/Video/Editors and Convertors Summary: MJPEG Video Capture and Processing Tools Requires: %{name} = %{version} @@ -96,6 +97,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %if ! 0%{?BUILD_ORIG} # remove references to files removed by %{name}-codecpatch.sh %patch100 -p1 ++++++ mjpegtools-1.9.0-fix-compiler-error.patch ++++++ diff -up mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh.orig mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh --- mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh.orig 2010-03-01 17:45:22.000000000 +0100 +++ mjpegtools-1.9.0/y4mdenoise/BitmapRegion2D.hh 2010-03-01 17:45:58.000000000 +0100 @@ -1289,6 +1289,9 @@ BitmapRegion2D<INDEX,SIZE>::FindLastSetB { // Not written yet. assert (false); + + // Make compiler happy + return 0; } @@ -1301,6 +1304,9 @@ BitmapRegion2D<INDEX,SIZE>::FindLastClea { // Not written yet. assert (false); + + // Make compiler happy + return 0; } ++++++ mjpegtools-1.9.0-patched.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org