Skip to Content.
Sympa Menu

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

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 (8a425bd3f3fe10f88ff0c5157488325051ef80ca)
  • Date: Mon, 10 May 2010 04:21:52 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

video/mjpegtools/DETAILS | 2 +-
video/mjpegtools/HISTORY | 4 ++++
video/mjpegtools/PRE_BUILD | 3 ++-
video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch | 24
++++++++++++++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 8a425bd3f3fe10f88ff0c5157488325051ef80ca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

mjpegtools: added patch, jpeg2yuv crashes in libjpeg.so.X
http://bugs.gentoo.org/show_bug.cgi?id=293919

diff --git a/video/mjpegtools/DETAILS b/video/mjpegtools/DETAILS
index 2dd95f3..ac51d5c 100755
--- a/video/mjpegtools/DETAILS
+++ b/video/mjpegtools/DETAILS
@@ -1,6 +1,6 @@
SPELL=mjpegtools
VERSION=1.9.0
- PATCHLEVEL=0
+ PATCHLEVEL=1

SOURCE_HASH=sha512:98046c8b648c68ce6afb0e27bd775484468c82c95b20e3e443ceffb0303f7f3cff52aeaf26e9b92a860a3b16e488430e22e0e0894b1955c3bfc949882401379d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index eb2e556..75081d8 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,7 @@
+2010-05-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, mjpegtools-1.9.0-jpeg-7.patch: added patch from Gentoo
+
2010-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, gcc-4.4.patch: added patch to make the spell
compile with gcc 4.4
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
index 1b8fb01..3d1d363 100755
--- a/video/mjpegtools/PRE_BUILD
+++ b/video/mjpegtools/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch &&
+patch -p0 < $SPELL_DIRECTORY/mjpegtools-1.9.0-jpeg-7.patch
diff --git a/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
b/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
new file mode 100644
index 0000000..ec36731
--- /dev/null
+++ b/video/mjpegtools/mjpegtools-1.9.0-jpeg-7.patch
@@ -0,0 +1,24 @@
+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);



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (8a425bd3f3fe10f88ff0c5157488325051ef80ca), Ladislav Hagara, 05/10/2010

Archive powered by MHonArc 2.6.24.

Top of Page