Hello community,
here is the log from the commit of package mjpegtools
checked in at Mon Jan 7 12:33:00 CET 2008.
--------
--- mjpegtools/mjpegtools.changes 2007-08-12 12:21:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2008-01-07 11:07:55.747890000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 7 11:07:27 CET 2008 - ssommer@suse.de
+
+- fix build with gcc43
+
+-------------------------------------------------------------------
New:
----
mjpegtools-gcc43.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.fq8349/_old 2008-01-07 12:31:53.000000000 +0100
+++ /var/tmp/diff_new_pack.fq8349/_new 2008-01-07 12:31:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mjpegtools (Version 1.9.0rc2)
#
-# 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.
#
@@ -14,13 +14,13 @@
BuildRequires: SDL-devel gcc-c++ libjpeg-devel libquicktime-devel nasm
#BuildRequires: gtk1-compat-devel
#BuildRequires: libmovtar popt-devel
-URL: http://mjpeg.sourceforge.net/
-License: BSD 3-Clause, GPL v2 or later
+Url: http://mjpeg.sourceforge.net/
+License: BSD 3-Clause; GPL v2 or later
Group: Productivity/Multimedia/Video/Editors and Convertors
PreReq: %install_info_prereq
-Autoreqprov: on
+AutoReqProv: on
Version: 1.9.0rc2
-Release: 36
+Release: 67
Summary: MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
Source0: %{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@
Patch5: mjpegtools-getopt.patch
Patch6: mjpegtools-writeable_strings.patch
Patch7: mjpegtools-jpeg2yuv_stdin.patch
+Patch8: mjpegtools-gcc43.patch
Patch100: %{name}-codecpatch.patch
%description
@@ -95,6 +96,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p0
+%patch8 -p1
%if ! 0%{?BUILD_ORIG}
# remove references to files removed by %{name}-codecpatch.sh
%patch100 -p1
@@ -169,6 +171,8 @@
%{_libdir}/pkgconfig/mjpegtools.pc
%changelog
+* Mon Jan 07 2008 - ssommer@suse.de
+- fix build with gcc43
* Sun Aug 12 2007 - ro@suse.de
- fix build for BUILD_ORIG not set
* Fri Aug 10 2007 - pcerny@suse.cz
++++++ mjpegtools-gcc43.patch ++++++
diff -Naur mjpegtools-1.9.0rc2.org/mplex/inputstrm.cpp mjpegtools-1.9.0rc2/mplex/inputstrm.cpp
--- mjpegtools-1.9.0rc2.org/mplex/inputstrm.cpp 2008-01-07 09:54:29.027181000 +0100
+++ mjpegtools-1.9.0rc2/mplex/inputstrm.cpp 2008-01-07 09:55:25.943206000 +0100
@@ -23,6 +23,7 @@
#include
#include
+#include
#include "mjpeg_types.h"
#include "inputstrm.hpp"
diff -Naur mjpegtools-1.9.0rc2.org/mplex/main.cpp mjpegtools-1.9.0rc2/mplex/main.cpp
--- mjpegtools-1.9.0rc2.org/mplex/main.cpp 2008-01-07 09:54:29.018190000 +0100
+++ mjpegtools-1.9.0rc2/mplex/main.cpp 2008-01-07 10:10:09.533217000 +0100
@@ -31,6 +31,7 @@
#include
#endif
#include <string>
+#include <cstring>
#include <memory>
#include
#ifndef _WIN32
diff -Naur mjpegtools-1.9.0rc2.org/mplex/multiplexor.cpp mjpegtools-1.9.0rc2/mplex/multiplexor.cpp
--- mjpegtools-1.9.0rc2.org/mplex/multiplexor.cpp 2008-01-07 09:54:29.101109000 +0100
+++ mjpegtools-1.9.0rc2/mplex/multiplexor.cpp 2008-01-07 10:03:59.895225000 +0100
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
diff -Naur mjpegtools-1.9.0rc2.org/mplex/padstrm.cpp mjpegtools-1.9.0rc2/mplex/padstrm.cpp
--- mjpegtools-1.9.0rc2.org/mplex/padstrm.cpp 2008-01-07 09:54:29.061146000 +0100
+++ mjpegtools-1.9.0rc2/mplex/padstrm.cpp 2008-01-07 10:01:17.725554000 +0100
@@ -23,7 +23,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-
+#include
#include "padstrm.hpp"
diff -Naur mjpegtools-1.9.0rc2.org/y4mdenoise/Set.hh mjpegtools-1.9.0rc2/y4mdenoise/Set.hh
--- mjpegtools-1.9.0rc2.org/y4mdenoise/Set.hh 2008-01-07 09:54:29.858347000 +0100
+++ mjpegtools-1.9.0rc2/y4mdenoise/Set.hh 2008-01-07 10:58:26.997847000 +0100
@@ -23,7 +23,7 @@
// How we implement ourselves.
public:
- typedef typename Imp::Allocator Allocator;
+ typedef typename Imp::Allocator_t Allocator;
// The type of allocator to use to allocate items in the set.
Set (const PRED &a_rPred = PRED(),
diff -Naur mjpegtools-1.9.0rc2.org/y4mdenoise/SkipList.hh mjpegtools-1.9.0rc2/y4mdenoise/SkipList.hh
--- mjpegtools-1.9.0rc2.org/y4mdenoise/SkipList.hh 2008-01-07 09:54:29.844363000 +0100
+++ mjpegtools-1.9.0rc2/y4mdenoise/SkipList.hh 2008-01-07 10:45:11.852797000 +0100
@@ -57,19 +57,19 @@
// Will give good sorting for up to e^10 items.
public:
- typedef Allocator Allocator;
+ typedef Allocator Allocator_t;
// The type of node allocator to use.
- static Allocator sm_oNodeAllocator;
+ static Allocator_t sm_oNodeAllocator;
// The default node allocator.
SkipList (const PRED &a_rPred = PRED(),
- Allocator &a_rAlloc = sm_oNodeAllocator);
+ Allocator_t &a_rAlloc = sm_oNodeAllocator);
// Default constructor. Must be followed by Init().
SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,
uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),
- Allocator &a_rAlloc = sm_oNodeAllocator);
+ Allocator_t &a_rAlloc = sm_oNodeAllocator);
// Constructor. Specify whether or not duplicates are allowed,
// and provide a random number seed.
@@ -255,7 +255,7 @@
private:
- Allocator &m_rNodeAllocator;
+ Allocator_t &m_rNodeAllocator;
// Where we get memory to allocate nodes.
bool m_bAllowDuplicates;
@@ -337,7 +337,7 @@
// The default node allocator. Allocates 64K at a time.
template
-typename SkipList::Allocator
+typename SkipList::Allocator_t
SkipList::sm_oNodeAllocator (65536);
@@ -345,7 +345,7 @@
// Default constructor. Must be followed by Init().
template
SkipList::SkipList (const PRED &a_rPred,
- Allocator &a_rAlloc)
+ Allocator_t &a_rAlloc)
: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
{
// Set up some defaults.
@@ -371,7 +371,7 @@
template
SkipList::SkipList (Status_t &a_reStatus,
bool a_bAllowDuplicates, uint32_t a_nRandSeed,
- const PRED &a_rPred, Allocator &a_rAlloc)
+ const PRED &a_rPred, Allocator_t &a_rAlloc)
: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
{
// Make sure they didn't start us off with an error.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org