Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (1627e915a5d187034951588caaa7bcfecd22c2b3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (1627e915a5d187034951588caaa7bcfecd22c2b3)
  • Date: Wed, 26 Nov 2008 05:05:46 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

video/mjpegtools/HISTORY | 3 +
video/mjpegtools/PRE_BUILD | 3 -
video/mjpegtools/gcc-4.3.patch | 90
+++++++++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+), 1 deletion(-)

New commits:
commit d20780c2d2b0f029d59b3937079c0c246bee0c29
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

mjpegtools: gcc-4.3.patch: added for #14913

except for the fuzz factor, this was all done by quill itself :)
in a repository near you soon!

diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index 8400d3c..4526122 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gcc-4.3.patch: added for #14913
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
index f1cb151..83214b0 100755
--- a/video/mjpegtools/PRE_BUILD
+++ b/video/mjpegtools/PRE_BUILD
@@ -5,4 +5,5 @@ sedit '19i#include <cassert>' y4mdenoise/Region2D.hh &&
# configure of 1.8.0 is broken when providing without-quicktime!
# check for fix if there is a new release; also remove automake/conf deps
patch < ${SCRIPT_DIRECTORY}/mjpegtools-configure.ac-pkgconfig.diff &&
-./autogen.sh
+./autogen.sh &&
+patch -F3 -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc-4.3.patch
diff --git a/video/mjpegtools/gcc-4.3.patch b/video/mjpegtools/gcc-4.3.patch
new file mode 100644
index 0000000..84a5ebc
--- /dev/null
+++ b/video/mjpegtools/gcc-4.3.patch
@@ -0,0 +1,90 @@
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/encodertypes.h
mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/encodertypes.h 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h 2008-04-04
18:20:59.000000000 +0300
+@@ -25,6 +25,8 @@
+ */
+
+
++#include <cstdlib>
++
+ class Parity
+ {
+ public:
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/macroblock.cc
mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/macroblock.cc 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc 2008-04-04 18:20:49.000000000
+0300
+@@ -21,6 +21,7 @@
+
+ #include <stdio.h>
+ #include <cassert>
++#include <climits>
+
+ #include "macroblock.hh"
+ #include "mpeg2syntaxcodes.h"
+diff -Nur mjpegtools-1.9.0rc3-old/mpeg2enc/picturereader.cc
mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc
+--- mjpegtools-1.9.0rc3-old/mpeg2enc/picturereader.cc 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc 2008-04-04
18:20:49.000000000 +0300
+@@ -27,6 +27,7 @@
+ //#include <stdlib.h>
+ //#include <unistd.h>
+ //#include <string.h>
++#include <climits>
+ //#include <errno.h>
+ //#include "simd.h"
+
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/inputstrm.cpp
mjpegtools-1.9.0rc3/mplex/inputstrm.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/inputstrm.cpp 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp 2008-04-04 18:20:49.000000000
+0300
+@@ -23,6 +23,7 @@
+
+ #include <config.h>
+ #include <assert.h>
++#include <climits>
+
+ #include "mjpeg_types.h"
+ #include "inputstrm.hpp"
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/main.cpp
mjpegtools-1.9.0rc3/mplex/main.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/main.cpp 2008-04-04 18:20:33.000000000
+0300
++++ mjpegtools-1.9.0rc3/mplex/main.cpp 2008-04-04 18:20:49.000000000 +0300
+@@ -31,6 +31,7 @@
+ #include <getopt.h>
+ #endif
+ #include <string>
++#include <string.h>
+ #include <memory>
+ #include <sys/stat.h>
+ #ifndef _WIN32
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/multiplexor.cpp
mjpegtools-1.9.0rc3/mplex/multiplexor.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/multiplexor.cpp 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp 2008-04-04 18:20:49.000000000
+0300
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
+diff -Nur mjpegtools-1.9.0rc3-old/mplex/padstrm.cpp
mjpegtools-1.9.0rc3/mplex/padstrm.cpp
+--- mjpegtools-1.9.0rc3-old/mplex/padstrm.cpp 2008-04-04 18:20:33.000000000
+0300
++++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp 2008-04-04 18:20:49.000000000
+0300
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #endif
+
++#include <string.h>
+ #include "padstrm.hpp"
+
+
+diff -Nur mjpegtools-1.9.0rc3-old/y4mdenoise/SkipList.hh
mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh
+--- mjpegtools-1.9.0rc3-old/y4mdenoise/SkipList.hh 2008-04-04
18:20:33.000000000 +0300
++++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh 2008-04-04 18:20:49.000000000
+0300
+@@ -57,7 +57,7 @@
+ // Will give good sorting for up to e^10 items.
+
+ public:
+- typedef Allocator<Node,HEADERCHUNK> Allocator;
++ typedef ::Allocator<Node,HEADERCHUNK> Allocator;
+ // The type of node allocator to use.
+
+ static Allocator sm_oNodeAllocator;



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (1627e915a5d187034951588caaa7bcfecd22c2b3), Jaka Kranjc, 11/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page