rpms
/
mjpegtools
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Wed Apr 15 2009 Hans de Goede <j.w.r.degoede@hhs.nl> 1.9.0-1

Browse Source 
- Update to upstream 1.9.0 final release
el8
Hans de Goede 16 years ago
parent a3bdebb19e
commit 597b6b8c98
5 changed files with 21 additions and 154 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
mjpegtools-1.9.0rc3.tar.gz
mjpegtools-1.9.0.tar.gz

12
mjpegtools-1.9.0-gcc44.patch
Unescape View File

@ -0,0 +1,12 @@
diff -up mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp
--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ 2005-10-13 18:43:10.000000000 +0200
+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-04-15 12:22:29.000000000 +0200
@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs,
bool LPCMStream::Probe(IBitStream &bs )
{
- char *last_dot = strrchr( bs.StreamName(), '.' );
+ const char *last_dot = strrchr( bs.StreamName(), '.' );
return
last_dot != NULL
&& strcmp( last_dot+1, "lpcm") == 0;

147
mjpegtools-1.9.0_rc3-gcc43.patch
Unescape View File

@ -1,147 +0,0 @@
http://bugs.gentoo.org/200767
http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776
--- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
+++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
@@ -25,6 +25,8 @@
*/
+#include <stdlib.h>
+
class Parity
{
public:
--- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
+++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <cassert>
+#include <limits.h>
#include "macroblock.hh"
#include "mpeg2syntaxcodes.h"
--- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
+++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
@@ -23,6 +23,7 @@
#include "picturereader.hh"
#include "mpeg2encoder.hh"
#include "imageplanes.hh"
+#include <limits.h>
//#include <stdio.h>
//#include <stdlib.h>
//#include <unistd.h>
--- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
+++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
@@ -23,6 +23,7 @@
#include <config.h>
#include <assert.h>
+#include <limits.h>
#include "mjpeg_types.h"
#include "inputstrm.hpp"
--- mjpegtools-1.9.0rc3/mplex/padstrm.cpp
+++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include <string.h>
#include "padstrm.hpp"
--- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
+++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
@@ -22,6 +22,7 @@
#include <config.h>
#include <math.h>
#include <stdlib.h>
+#include <string.h>
#include <mjpeg_types.h>
#include <mjpeg_logging.h>
--- mjpegtools-1.9.0rc3/mplex/main.cpp
+++ mjpegtools-1.9.0rc3/mplex/main.cpp
@@ -31,6 +31,7 @@
#include <getopt.h>
#endif
#include <string>
+#include <string.h>
#include <memory>
#include <sys/stat.h>
#ifndef _WIN32
--- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh
+++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh
@@ -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(),
--- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
+++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
@@ -57,19 +57,19 @@
// Will give good sorting for up to e^10 items.
public:
- typedef Allocator<Node,HEADERCHUNK> Allocator;
+ typedef Allocator<Node,HEADERCHUNK> 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 <class KEY, class VALUE, class KEYFN, class PRED>
-typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator
+typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t
SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);
@@ -345,7 +345,7 @@
// Default constructor. Must be followed by Init().
template <class KEY, class VALUE, class KEYFN, class PRED>
SkipList<KEY,VALUE,KEYFN,PRED>::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 <class KEY, class VALUE, class KEYFN, class PRED>
SkipList<KEY,VALUE,KEYFN,PRED>::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.

12
mjpegtools.spec
Unescape View File

@ -1,14 +1,14 @@
Name: mjpegtools
Version: 1.9.0
Release: 0.7.rc3%{?dist}
Release: 1%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
URL: http://mjpeg.sourceforge.net/
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}rc3.tar.gz
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch
Patch1: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch
Patch1: mjpegtools-1.9.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@ -71,8 +71,7 @@ for building applications that use mjpegtools libraries.
%prep
%setup -q -n %{name}-%{version}rc3
find . -type d -name CVS -print0 | xargs -0 rm -rf
%setup -q
%patch0 -p1
%patch1 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
@ -151,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Apr 15 2009 Hans de Goede <j.w.r.degoede@hhs.nl> 1.9.0-1
- Update to upstream 1.9.0 final release
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.9.0-0.7.rc3
- rebuild for new F11 features

2
sources
Unescape View File

@ -1 +1 @@
d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz
309a6fcf0900a010d6a9c1e91afc2f5c mjpegtools-1.9.0.tar.gz

Write Preview
Loading…
Cancel
Save