Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2012-03-20 12:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2011-12-08 11:53:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2012-03-20 12:11:36.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 15 19:38:49 UTC 2012 - [email protected] + +- Add mjpegtools-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- mjpegtools-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.rg4mMd/_old 2012-03-20 12:11:37.000000000 +0100 +++ /var/tmp/diff_new_pack.rg4mMd/_new 2012-03-20 12:11:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mjpegtools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,12 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mjpegtools Version: 2.0.0 Release: 0 Summary: MJPEG Video Capture and Processing Tools -Url: http://mjpeg.sourceforge.net/ +License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors +Url: http://mjpeg.sourceforge.net/ %if 0%{?BUILD_ORIG} Source0: http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz %else @@ -28,7 +30,6 @@ #%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir} mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz ) Source0: %{name}-%{version}-patched.tar.gz %endif -License: BSD-3-Clause ; GPL-2.0+ Source1: mjpegtools-codecpatch.sh Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-vector_alignment.patch @@ -37,6 +38,7 @@ Patch4: mjpegtools-no_arch_tuning.patch Patch5: mjpegtools-config_h.patch Patch6: mjpegtools-v4l-2.6.38.patch +Patch7: mjpegtools-gcc47.patch Patch100: mjpegtools-codecpatch.patch BuildRequires: gcc-c++ BuildRequires: libjpeg-devel @@ -51,8 +53,8 @@ %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(libv4l1) %endif -BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(SDL_gfx) +BuildRequires: pkgconfig(sdl) Requires(post): info Requires(preun): info @@ -100,6 +102,7 @@ %if 0%{?suse_version} >= 1210 %patch6 %endif +%patch7 -p1 %if ! 0%{?BUILD_ORIG} # remove references to files removed by %%{name}-codecpatch.sh %patch100 ++++++ mjpegtools-2.0.0-patched.tar.gz ++++++ ++++++ mjpegtools-gcc47.patch ++++++ Index: mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh =================================================================== --- mjpegtools-2.0.0.orig/y4mdenoise/MotionSearcher.hh +++ mjpegtools-2.0.0/y4mdenoise/MotionSearcher.hh @@ -2196,7 +2196,7 @@ MotionSearcher<PIXEL_NUM,DIM,PIXEL_TOL,P { // This region is too small to be bothered with. // Just get rid of it. - DeleteRegion (a_pRegion); + this->DeleteRegion (a_pRegion); } else { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
