[SM-Commit] GIT changes to master grimoire by Robin Cook (660beee724ed3ef1b23e149f86e62f90c6e25253)

Robin Cook scm at sourcemage.org
Wed Aug 17 20:06:18 EDT 2011


GIT changes to master grimoire by Robin Cook <rcook at wyrms.net>:

 video/mjpegtools/DETAILS                       |    5 ++---
 video/mjpegtools/HISTORY                       |    4 ++++
 video/mjpegtools/PRE_BUILD                     |    4 ----
 video/mjpegtools/gcc-4.4.patch                 |   11 -----------
 video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch |   24 ------------------------
 video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig   |binary
 6 files changed, 6 insertions(+), 42 deletions(-)

New commits:
commit 660beee724ed3ef1b23e149f86e62f90c6e25253
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    mjpegtools: updated to 2.0.0 and removed patches no longer needed

diff --git a/video/mjpegtools/DETAILS b/video/mjpegtools/DETAILS
index ac51d5c..2c821da 100755
--- a/video/mjpegtools/DETAILS
+++ b/video/mjpegtools/DETAILS
@@ -1,10 +1,9 @@
            SPELL=mjpegtools
-         VERSION=1.9.0
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:98046c8b648c68ce6afb0e27bd775484468c82c95b20e3e443ceffb0303f7f3cff52aeaf26e9b92a860a3b16e488430e22e0e0894b1955c3bfc949882401379d
+         VERSION=2.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/mjpeg/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://mjpeg.sourceforge.net
          ENTERED=20030113
             DOCS="CHANGES COPYING NEWS README*"
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index d576e19..6df7377 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,7 @@
+2011-08-17 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 2.0.0
+	* PRE_BUILD: removed as well as patches
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
deleted file mode 100755
index 3d1d363..0000000
--- a/video/mjpegtools/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch &&
-patch -p0 < $SPELL_DIRECTORY/mjpegtools-1.9.0-jpeg-7.patch
diff --git a/video/mjpegtools/gcc-4.4.patch b/video/mjpegtools/gcc-4.4.patch
deleted file mode 100644
index 3db1ad0..0000000
--- a/video/mjpegtools/gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp	2005-10-13 18:43:10.000000000 +0200
-+++ mjpegtools-1.9.0.fixed/mplex/lpcmstrm_in.cpp	2010-04-15 11:16:46.103830391 +0200
-@@ -53,7 +53,7 @@
- 
- 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;
diff --git a/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch b/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
deleted file mode 100644
index ec36731..0000000
--- a/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
-
-Patch by: Salah Coronya
-
-http://bugs.gentoo.org/show_bug.cgi?id=293919
-
---- lavtools/jpegutils.c
-+++ lavtools/jpegutils.c
-@@ -502,6 +502,7 @@
- 
-    jpeg_read_header (&dinfo, TRUE);
-    dinfo.raw_data_out = TRUE;
-+   dinfo.do_fancy_upsampling = FALSE;
-    dinfo.out_color_space = JCS_YCbCr;
-    dinfo.dct_method = JDCT_IFAST;
-    guarantee_huff_tables(&dinfo);
-@@ -599,6 +600,7 @@
-       if (field > 0) {
-          jpeg_read_header (&dinfo, TRUE);
-          dinfo.raw_data_out = TRUE;
-+         dinfo.do_fancy_upsampling = FALSE;
-          dinfo.out_color_space = JCS_YCbCr;
-          dinfo.dct_method = JDCT_IFAST;
-          jpeg_start_decompress (&dinfo);
diff --git a/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig b/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig
new file mode 100644
index 0000000..7d7730e
Binary files /dev/null and b/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig differ


More information about the SM-Commit mailing list