[pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools Fix non-portable shell scripts, ...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc0640bde928
branches:  trunk
changeset: 519985:dc0640bde928
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Oct 13 12:51:27 2006 +0000

description:
Fix non-portable shell scripts, bump package revision.

diffstat:

 multimedia/mjpegtools/Makefile         |    4 +-
 multimedia/mjpegtools/distinfo         |    4 +-
 multimedia/mjpegtools/patches/patch-ad |   42 ++
 multimedia/mjpegtools/patches/patch-ae |  484 +++++++++++++++++++++++++++++++++
 4 files changed, 531 insertions(+), 3 deletions(-)

diffs (truncated from 562 to 300 lines):

diff -r a44b1f4b43d9 -r dc0640bde928 multimedia/mjpegtools/Makefile
--- a/multimedia/mjpegtools/Makefile    Fri Oct 13 12:39:52 2006 +0000
+++ b/multimedia/mjpegtools/Makefile    Fri Oct 13 12:51:27 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2006/07/07 15:49:33 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/10/13 12:51:27 tron Exp $
 
 DISTNAME=      mjpegtools-1.8.0
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
diff -r a44b1f4b43d9 -r dc0640bde928 multimedia/mjpegtools/distinfo
--- a/multimedia/mjpegtools/distinfo    Fri Oct 13 12:39:52 2006 +0000
+++ b/multimedia/mjpegtools/distinfo    Fri Oct 13 12:51:27 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/08/04 16:43:37 tron Exp $
+$NetBSD: distinfo,v 1.15 2006/10/13 12:51:27 tron Exp $
 
 SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
 RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
@@ -6,3 +6,5 @@
 SHA1 (patch-aa) = 3db2656a4d74b1ec1ac21b654c7a8ea33b791e19
 SHA1 (patch-ab) = 5fc460db1593afb1f99422003db86e6b7cfc8eb9
 SHA1 (patch-ac) = cffe8681628e3a9a45ca16fde0b71cedc5b3e65c
+SHA1 (patch-ad) = 285d7d036c5b6af89d72b6feddf48c6df2727a29
+SHA1 (patch-ae) = d13ec5a33a84187711001ab0edb9468256aa1ef2
diff -r a44b1f4b43d9 -r dc0640bde928 multimedia/mjpegtools/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mjpegtools/patches/patch-ad    Fri Oct 13 12:51:27 2006 +0000
@@ -0,0 +1,42 @@
+--- scripts/lav2mpeg.orig      2004-08-07 03:51:14.000000000 +0100
++++ scripts/lav2mpeg   2006-10-13 13:23:51.000000000 +0100
+@@ -106,10 +106,10 @@
+ }
+ 
+ doStep() {
+-   if [ "$LOGCOMMANDS" == "0" ]; then
++   if [ "$LOGCOMMANDS" = "0" ]; then
+       echo "COMMAND=${step[$count]}"
+    fi
+-   if [ "$LOGONLY" == "" ]; then
++   if [ "$LOGONLY" = "" ]; then
+       eval ${step[$count]}
+    fi
+ }
+@@ -174,7 +174,7 @@
+    logIt "downscale=$downscaling"
+ }
+ 
+-if [ $# -eq 0 -o "$1" == "--help" -o "$1" = "-h" ]; then
++if [ $# -eq 0 -o "$1" = "--help" -o "$1" = "-h" ]; then
+    usage;
+    exit 1
+ fi
+@@ -268,7 +268,7 @@
+ # lavinfo should set up video_frames, video_width
+ # video_height, video_inter, video_norm, audio_chans
+ eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings
+-if [ "$video_frames" == "" ]; then
++if [ "$video_frames" = "" ]; then
+    logIt "'lavinfo $@' died! exiting"
+    logIt " maybe you don't have lavinfo. or your input flags were wrong"
+    logIt " input files must be the last input on the command line"
+@@ -348,7 +348,7 @@
+ fi
+ 
+ # set up the audio
+-if [ "$userstereo" == "" ]; then
++if [ "$userstereo" = "" ]; then
+    stereo=${audio_chans:-0}
+ else
+    stereo=$userstereo
diff -r a44b1f4b43d9 -r dc0640bde928 multimedia/mjpegtools/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mjpegtools/patches/patch-ae    Fri Oct 13 12:51:27 2006 +0000
@@ -0,0 +1,484 @@
+$NetBSD: patch-ae,v 1.4 2006/10/13 12:51:27 tron Exp $
+
+--- scripts/anytovcd.sh.orig   2005-07-21 14:53:00.000000000 +0100
++++ scripts/anytovcd.sh        2006-10-13 13:25:11.000000000 +0100
+@@ -313,7 +313,7 @@
+     esac
+ done
+ 
+-if test "${VIDEO_SRC}" == "" || ! test -r "${VIDEO_SRC}"; then
++if test "${VIDEO_SRC}" = "" || ! test -r "${VIDEO_SRC}"; then
+ 
+     show_error "input file not specified or not present."
+     show_error "Use -h to get help."
+@@ -333,15 +333,15 @@
+ VID_SIZE_SRC="`probe_vid_size "${VIDEO_SRC}"`"
+ 
+ # input interlacing
+-if test "${INTERLACING}" == "none"; then
++if test "${INTERLACING}" = "none"; then
+ 
+     VID_ILACE_SRC="p"
+ 
+-elif test "${INTERLACING}" == "top_first"; then
++elif test "${INTERLACING}" = "top_first"; then
+ 
+     VID_ILACE_SRC="t"
+ 
+-elif test "${INTERLACING}" == "bottom_first"; then
++elif test "${INTERLACING}" = "bottom_first"; then
+ 
+     VID_ILACE_SRC="b"
+ 
+@@ -352,15 +352,15 @@
+ fi
+ 
+ # output interlacing
+-if test "${INTERLACING_OUT}" == "none"; then
++if test "${INTERLACING_OUT}" = "none"; then
+ 
+     VID_ILACE_OUT="p"
+ 
+-elif test "${INTERLACING_OUT}" == "top_first"; then
++elif test "${INTERLACING_OUT}" = "top_first"; then
+ 
+     VID_ILACE_OUT="t"
+ 
+-elif test "${INTERLACING_OUT}" == "bottom_first"; then
++elif test "${INTERLACING_OUT}" = "bottom_first"; then
+ 
+     VID_ILACE_OUT="b"
+ 
+@@ -371,14 +371,14 @@
+ fi
+ 
+ # input framerate
+-if test "${VID_FPS_SRC}" == ""; then
++if test "${VID_FPS_SRC}" = ""; then
+ 
+     VID_FPS_SRC="`probe_vid_fps "${VIDEO_SRC}"`"
+ 
+ fi
+ 
+ # input pixel/sample aspect ratio
+-if test "${VID_SAR_SRC}" == ""; then
++if test "${VID_SAR_SRC}" = ""; then
+ 
+     if which ${TRANSCODE} >/dev/null; then
+ 
+@@ -396,7 +396,7 @@
+ VID_SAR_N_SRC="`echo ${VID_SAR_SRC} | cut -d: -f1`"
+ VID_SAR_D_SRC="`echo ${VID_SAR_SRC} | cut -d: -f2`"
+ 
+-if test "${VID_SAR_N_SRC}" == "0" || test "${VID_SAR_D_SRC}" == "0"; then
++if test "${VID_SAR_N_SRC}" = "0" || test "${VID_SAR_D_SRC}" = "0"; then
+ 
+     show_warn "Unknown pixel aspect ratio, defaulting to 1:1"
+     VID_SAR_SRC="1:1"
+@@ -423,15 +423,15 @@
+ fi
+ 
+ # quality presets
+-if test "${QUALITY}" == "best"; then
++if test "${QUALITY}" = "best"; then
+ 
+     QUANT="4"
+ 
+-elif test "${QUALITY}" == "good"; then
++elif test "${QUALITY}" = "good"; then
+ 
+     QUANT="5"
+ 
+-elif test "${QUALITY}" == "fair"; then
++elif test "${QUALITY}" = "fair"; then
+ 
+     QUANT="6"
+ 
+@@ -444,7 +444,7 @@
+ fi
+ 
+ # profile(s)
+-if test "${VCD_TYPE}" == "cvd"; then
++if test "${VCD_TYPE}" = "cvd"; then
+ 
+     FF_ENC="${FF_ENC} -vcodec mpeg2video -f rawvideo -bufsize 224"
+     MPEG2ENC="${MPEG2ENC} -f 8"
+@@ -468,7 +468,7 @@
+     # default volume size in mbytes (m = 1000)
+     VOL_SIZE="4700"
+ 
+-elif test "${VCD_TYPE}" == "cvd_wide"; then
++elif test "${VCD_TYPE}" = "cvd_wide"; then
+ 
+     FF_ENC="${FF_ENC} -vcodec mpeg2video -f rawvideo -bufsize 224"
+     MPEG2ENC="${MPEG2ENC} -f 8"
+@@ -490,7 +490,7 @@
+     
+     VOL_SIZE="4700"
+ 
+-elif test "${VCD_TYPE}" == "dvd"; then
++elif test "${VCD_TYPE}" = "dvd"; then
+ 
+     FF_ENC="${FF_ENC} -target dvd -f rawvideo -dc 10"
+     MPEG2ENC="${MPEG2ENC} -f 8 -D 10"
+@@ -513,7 +513,7 @@
+     
+     VOL_SIZE="4700"
+ 
+-elif test "${VCD_TYPE}" == "dvd_wide"; then
++elif test "${VCD_TYPE}" = "dvd_wide"; then
+ 
+     FF_ENC="${FF_ENC} -target dvd -f rawvideo -dc 10"
+     MPEG2ENC="${MPEG2ENC} -f 8 -D 10"
+@@ -536,7 +536,7 @@
+     
+     VOL_SIZE="4700"
+ 
+-elif test "${VCD_TYPE}" == "mvcd"; then
++elif test "${VCD_TYPE}" = "mvcd"; then
+ 
+     FF_ENC="${FF_ENC} -vcodec mpeg1video -f rawvideo -bufsize 40 -me_range 64"
+     MPEG2ENC="${MPEG2ENC} -f 2 -g 12 -G 24 -B 256 -S 797"
+@@ -562,7 +562,7 @@
+     # 360000 sectors * 2324 bytes per sector / 1000 / 1000
+     VOL_SIZE="836"
+ 
+-elif test "${VCD_TYPE}" == "svcd"; then
++elif test "${VCD_TYPE}" = "svcd"; then
+ 
+     FF_ENC="${FF_ENC} -target svcd -f rawvideo"
+     MPEG2ENC="${MPEG2ENC} -f 4 -B 256 -S 797"
+@@ -585,7 +585,7 @@
+     
+     VOL_SIZE="836"
+ 
+-elif test "${VCD_TYPE}" == "vcd"; then
++elif test "${VCD_TYPE}" = "vcd"; then
+ 
+     ENC_TYPE="cbr"
+ 
+@@ -618,7 +618,7 @@
+ fi
+ 
+ # audio pass-through
+-if test "${ACOPY_MODE}" == "1"; then
++if test "${ACOPY_MODE}" = "1"; then
+ 
+     AUD_BITRATE_OUT="${AUD_BITRATE_SRC}"
+     AUD_FMT_OUT="${AUD_FMT_SRC}"
+@@ -632,12 +632,12 @@
+ MPEG_OUT="${PREFIX_OUT}-%d.mpg"
+ 
+ # output interlacing
+-if test "${VID_ILACE_OUT}" == "b"; then
++if test "${VID_ILACE_OUT}" = "b"; then
+ 
+     FF_ENC="${FF_ENC} -ildct -ilme -top 0"
+     MPEG2ENC="${MPEG2ENC} -I 1 -z b"
+ 
+-elif test "${VID_ILACE_OUT}" == "t"; then
++elif test "${VID_ILACE_OUT}" = "t"; then
+ 
+     FF_ENC="${FF_ENC} -ildct -ilme -top 1"
+     MPEG2ENC="${MPEG2ENC} -I 1 -z t"
+@@ -649,15 +649,15 @@
+ fi
+ 
+ # output framerate
+-if test "${VID_FPS_SRC}" == "30000:1001" || test "${VID_FPS_SRC}" == "24000:1001" || test "${VID_FPS_SRC}" == "25:1"; then
++if test "${VID_FPS_SRC}" = "30000:1001" || test "${VID_FPS_SRC}" = "24000:1001" || test "${VID_FPS_SRC}" = "25:1"; then
+ 
+     VID_FPS_OUT="${VID_FPS_SRC}"
+ 
+-elif test "${OUT_NORM}" == "ntsc"; then
++elif test "${OUT_NORM}" = "ntsc"; then
+ 
+     VID_FPS_OUT="30000:1001"
+ 
+-elif test "${OUT_NORM}" == "ntsc_film"; then
++elif test "${OUT_NORM}" = "ntsc_film"; then
+ 
+     VID_FPS_OUT="24000:1001"
+ 
+@@ -668,7 +668,7 @@
+ fi
+ 
+ # output sar and framesize for pal/ntsc
+-if test "${VID_FPS_OUT}" == "25:1"; then
++if test "${VID_FPS_OUT}" = "25:1"; then
+ 
+     VID_SAR_OUT="${VID_SAR_625_OUT}"
+     VID_SIZE_OUT="${VID_SIZE_625_OUT}"
+@@ -681,7 +681,7 @@
+ fi
+ 
+ # cvd_wide "preset" for y4mscaler
+-if test "${VCD_TYPE}" == "cvd_wide"; then
++if test "${VCD_TYPE}" = "cvd_wide"; then
+ 
+     Y4MSCALER="${Y4MSCALER} -O sar=${VID_SAR_OUT} -O size=${VID_SIZE_OUT}"
+ 
+@@ -695,12 +695,12 @@
+ fi