From 6107d94b253f024101967408d53c5c67ab56423d Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@liwjatan.at>
Date: Wed, 16 Jun 2010 14:05:22 -0500
Subject: multimedia/transcode: Patched to eliminate libjpeg segault.

Thanks to Niels Horn for the patch.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
---
 multimedia/transcode/transcode-jpeg8.patch | 10 ++++++++++
 multimedia/transcode/transcode.SlackBuild  | 11 ++++++-----
 multimedia/transcode/transcode.info        |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 multimedia/transcode/transcode-jpeg8.patch

(limited to 'multimedia/transcode')

diff --git a/multimedia/transcode/transcode-jpeg8.patch b/multimedia/transcode/transcode-jpeg8.patch
new file mode 100644
index 000000000000..1074bdf9a23d
--- /dev/null
+++ b/multimedia/transcode/transcode-jpeg8.patch
@@ -0,0 +1,10 @@
+--- transcode-1.1.5/export/export_jpg.c	2009-02-21 18:01:57.000000000 -0300
++++ transcode-1.1.5_patched/export/export_jpg.c	2010-06-12 13:27:04.000000000 -0300
+@@ -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;
diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index 0afa4316a287..569f679ad5cd 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for transcode
 
-# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,15 +24,13 @@
 
 PRGNAM=transcode
 VERSION=1.1.5
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -71,6 +69,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix an issue with newer libjpeg versions. Thanks to Niels Horn for the patch :)
+patch -p1 -i $CWD/transcode-jpeg8.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-netstream \
   --enable-alsa \
   --enable-v4l \
-  --enable-libv4l2=${LIBV4L:-no} \
+  --enable-libv4l2=${LIBV4L:-yes} \
   --enable-libv4lconvert=${LIBV4L:-yes} \
   --enable-libmpeg2=${LIBMPEG2:-no} \
   --enable-libmpeg2convert=${LIBMPEG2:-no} \
diff --git a/multimedia/transcode/transcode.info b/multimedia/transcode/transcode.info
index 126c9f82d0b3..bb90ac7b089c 100644
--- a/multimedia/transcode/transcode.info
+++ b/multimedia/transcode/transcode.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
-- 
cgit v1.2.3