[arch-commits] Commit in transcode/trunk (3 files)

[Eric Bélanger]

    Date: Thursday, September 23, 2010 @ 23:35:03
  Author: eric
Revision: 91207

upgpkg: transcode 1.1.5-5
Fixed mpa codec (close FS#20587), Fixed jpeg segmentation fault

Added:
  transcode/trunk/transcode-1.1.5-jpeg-7.patch
  transcode/trunk/transcode-1.1.5-mpa.patch
Modified:
  transcode/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   19 ++++++++++++-------
 transcode-1.1.5-jpeg-7.patch |   16 ++++++++++++++++
 transcode-1.1.5-mpa.patch    |   10 ++++++++++
 3 files changed, 38 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-24 01:59:31 UTC (rev 91206)
+++ PKGBUILD	2010-09-24 03:35:03 UTC (rev 91207)
@@ -6,23 +6,28 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.5
-pkgrel=4
-pkgdesc="A video/DVD ripper and encoder for the terminal/console."
+pkgrel=5
+pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64')
 url="http://tcforge.berlios.de/"
 license=('GPL')
 depends=('imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	'xvidcore' 'libmpeg2' 'libtheora' 'libxaw' 'x264' 'libxml2'
-	'libxv' 'a52dec' 'alsa-lib')
+	 'libmpeg2' 'libtheora' 'libxaw'  'libxml2' 'libxv' 'a52dec' 'alsa-lib')
 makedepends=('nasm' 'pkg-config')
 options=('!libtool' '!makeflags')
 source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz)
-md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510')
-sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d')
+	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
+	transcode-1.1.5-jpeg-7.patch  transcode-1.1.5-mpa.patch)
+md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' 'c0bd49a88f667c68c4430ad25bbed510'\
+         'af4056b7530a6f147594f676849e7c7b' 'c299cfc6c4be6a5512d1a129f04e5450')
+sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'\
+         '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../transcode-1.1.5-jpeg-7.patch
+  patch -p1 < ../transcode-1.1.5-mpa.patch
+
  # building from here
   ./configure --prefix=/usr \
     --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \

Added: transcode-1.1.5-jpeg-7.patch
===================================================================
--- transcode-1.1.5-jpeg-7.patch	                        (rev 0)
+++ transcode-1.1.5-jpeg-7.patch	2010-09-24 03:35:03 UTC (rev 91207)
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/show_bug.cgi?id=294488
+
+Patch by: Salah Coronya
+
+Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
+
+--- export/export_jpg.c
++++ export/export_jpg.c
+@@ -91,6 +91,7 @@
+ 
+   jpeg_set_quality(&encinfo, quality, TRUE);
+   encinfo.raw_data_in = TRUE;
++  encinfo.do_fancy_downsampling = FALSE;
+   encinfo.in_color_space = JCS_YCbCr;
+ 
+   encinfo.comp_info[0].h_samp_factor = 2;

Added: transcode-1.1.5-mpa.patch
===================================================================
--- transcode-1.1.5-mpa.patch	                        (rev 0)
+++ transcode-1.1.5-mpa.patch	2010-09-24 03:35:03 UTC (rev 91207)
@@ -0,0 +1,10 @@
+--- transcode-1.1.5-old/export/aud_aux.c	2010-07-04 12:44:31.867550180 -0500
++++ transcode-1.1.5/export/aud_aux.c	2010-07-04 13:41:01.253292529 -0500
+@@ -347,6 +347,7 @@
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+     memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
++    mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
+     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
+     mpa_ctx.channels    = vob->dm_chan;            // channels
+     mpa_ctx.sample_rate = vob->a_rate;