Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9740f13f2cc8b20a3b55012ce3709538767c22c8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9740f13f2cc8b20a3b55012ce3709538767c22c8)
  • Date: Thu, 8 Jan 2009 18:03:27 -0600

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

video/mjpegtools/DETAILS | 6 -
video/mjpegtools/HISTORY | 5
video/mjpegtools/INSTALL | 2
video/mjpegtools/PRE_BUILD | 9 -
video/mjpegtools/gcc-4.3.patch | 90
----------------
video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff | 13 --
6 files changed, 8 insertions(+), 117 deletions(-)

New commits:
commit 9740f13f2cc8b20a3b55012ce3709538767c22c8
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

mjpegtools 1.9.0

diff --git a/video/mjpegtools/DETAILS b/video/mjpegtools/DETAILS
index 72b89eb..2dd95f3 100755
--- a/video/mjpegtools/DETAILS
+++ b/video/mjpegtools/DETAILS
@@ -1,7 +1,7 @@
SPELL=mjpegtools
- VERSION=1.8.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ee826994d64a3630adb3a114063594fe890a91ee3b73da49d445421ab7f740f51efe5735803d2d8aba4375409d6d3d2cb22fd780842739a3901a55bb6dff57eb
+ VERSION=1.9.0
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:98046c8b648c68ce6afb0e27bd775484468c82c95b20e3e443ceffb0303f7f3cff52aeaf26e9b92a860a3b16e488430e22e0e0894b1955c3bfc949882401379d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/mjpeg/$SOURCE
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index 4526122..a79344c 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,8 @@
+2009-01-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.0
+ * PRE_BUILD, mjpegtools-configure.ac-pkgconfig.diff, gcc-4.3.patch,
+ INSTALL: removed
+
2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gcc-4.3.patch: added for #14913

diff --git a/video/mjpegtools/INSTALL b/video/mjpegtools/INSTALL
deleted file mode 100755
index 105525c..0000000
--- a/video/mjpegtools/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-default_install &&
-cp -f mpeg2enc/mpeg2syntaxcodes.h
$INSTALL_ROOT/usr/include/mjpegtools/mpeg2enc
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
deleted file mode 100755
index 83214b0..0000000
--- a/video/mjpegtools/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# gcc 4.1 fix
-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 &&
-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
deleted file mode 100644
index 84a5ebc..0000000
--- a/video/mjpegtools/gcc-4.3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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;
diff --git a/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
b/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
deleted file mode 100644
index a1d6757..0000000
--- a/video/mjpegtools/mjpegtools-configure.ac-pkgconfig.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../mjpegtools-1.8.0-nopng/configure.ac 2006-07-04 17:56:00.000000000
+0200
-+++ configure.ac 2006-07-04 18:49:09.801873871 +0200
-@@ -233,6 +233,10 @@
- have_jpeg=true ],,)
- fi
-
-+dnl We need this so that skipping the quicktime test doesn't cause
-+dnl png test to be skipped
-+PKG_PROG_PKG_CONFIG()
-+
- have_libquicktime=false
- if test x$with_libquicktime != xno ; then
- PKG_CHECK_MODULES(LIBQUICKTIME, [libquicktime >= 0.9.4],



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (9740f13f2cc8b20a3b55012ce3709538767c22c8), Ladislav Hagara, 01/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page