[arch-commits] Commit in mjpegtools/trunk (4 files)

Eric Bélanger eric at archlinux.org
Sat Jul 3 23:32:01 EDT 2010


    Date: Saturday, July 3, 2010 @ 23:32:01
  Author: eric
Revision: 84755

upgpkg: mjpegtools 1.9.0-4
Fixed jpeg seg fault (close FS#18659), Added install scriptlet to handle info page, Remove old patch

Added:
  mjpegtools/trunk/mjpegtools-1.9.0-jpeg-7.patch
  mjpegtools/trunk/mjpegtools.install
Modified:
  mjpegtools/trunk/PKGBUILD
Deleted:
  mjpegtools/trunk/mjpegtools-1.8.0-gcc41.patch

-------------------------------+
 PKGBUILD                      |   32 +++++++++++++++++++-------------
 mjpegtools-1.8.0-gcc41.patch  |   12 ------------
 mjpegtools-1.9.0-jpeg-7.patch |   24 ++++++++++++++++++++++++
 mjpegtools.install            |   16 ++++++++++++++++
 4 files changed, 59 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-04 02:53:37 UTC (rev 84754)
+++ PKGBUILD	2010-07-04 03:32:01 UTC (rev 84755)
@@ -4,7 +4,7 @@
 
 pkgname=mjpegtools
 pkgver=1.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,22 +13,28 @@
 makedepends=('gtk2>=2.18.6')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
+install=mjpegtools.install
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
         mjpegtools-1.9.0-glibc-2.10.patch
-        png2yuv-fix-memleak.patch)
-md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c'
-         'b8ae66237d83be533db8eea166fd3357'
-         '39e1def8fb0f7c58a217b22dc251a86a')
+        png2yuv-fix-memleak.patch
+        mjpegtools-1.9.0-jpeg-7.patch)
+md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c' 'b8ae66237d83be533db8eea166fd3357'\
+         '39e1def8fb0f7c58a217b22dc251a86a' 'ccc7562a3933877d3362da7cf4695ea0')
+sha1sums=('1701233354c7ea86b5b7808c4dd5d03a71118e48' '3029f0e835e693b144298ed9f8143c9566be26f3'\
+         '8af5c3747756353bef56d03bafbdd086ff15c02c' '2bdb1b3b8591cede11d4a133a758e8ead35db4dd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure || return 1
-  patch -Np1 -i "$srcdir/mjpegtools-1.9.0-glibc-2.10.patch" || return 1
-  patch -Np1 -i "${srcdir}/png2yuv-fix-memleak.patch" || return 1
-  ./configure --prefix=/usr --enable-largefile || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+  patch -Np1 -i "$srcdir/mjpegtools-1.9.0-glibc-2.10.patch"
+  patch -Np1 -i "${srcdir}/png2yuv-fix-memleak.patch"
+  patch -Np0 -i "${srcdir}/mjpegtools-1.9.0-jpeg-7.patch"
+  ./configure --prefix=/usr --enable-largefile
+  make
+}
 
-  install -m644 mpeg2enc/mpeg2syntaxcodes.h \
-      "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
 }

Deleted: mjpegtools-1.8.0-gcc41.patch
===================================================================
--- mjpegtools-1.8.0-gcc41.patch	2010-07-04 02:53:37 UTC (rev 84754)
+++ mjpegtools-1.8.0-gcc41.patch	2010-07-04 03:32:01 UTC (rev 84755)
@@ -1,12 +0,0 @@
-diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh
---- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh	2005-12-19 12:36:54.000000000 +0300
-+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh	2005-12-19 12:44:36.000000000 +0300
-@@ -16,7 +16,7 @@
- 
- #include "Status_t.h"
- #include <iostream>
--
-+#include <cassert>
- 
- 
- // The 2-dimensional region class.  Parameterized by the numeric type

Added: mjpegtools-1.9.0-jpeg-7.patch
===================================================================
--- mjpegtools-1.9.0-jpeg-7.patch	                        (rev 0)
+++ mjpegtools-1.9.0-jpeg-7.patch	2010-07-04 03:32:01 UTC (rev 84755)
@@ -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);

Added: mjpegtools.install
===================================================================
--- mjpegtools.install	                        (rev 0)
+++ mjpegtools.install	2010-07-04 03:32:01 UTC (rev 84755)
@@ -0,0 +1,16 @@
+infodir=/usr/share/info
+file=mjpeg-howto.info
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}



More information about the arch-commits mailing list