- Don't hardcode device and driver for "cdrdao" so that the user can use

  the configuration file "$HOME/.cdrdao" to set these.
- Add a new "-qmat" paramater to set the quantisation matrix for "mpeg2enc".
  This change was taken from Bernd Sieker's heavily hacked script based on
  an old version of "mencvcd".
Bump package revision.

3 files changed, 68 insertions, 18 deletions

diff --git a/sysutils/mencvcd/Makefile b/sysutils/mencvcd/Makefile
index 2f141d28911..e47cb33efb6 100644
--- a/sysutils/mencvcd/Makefile
+++ b/sysutils/mencvcd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/02/01 22:57:52 tron Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/02 09:11:27 tron Exp $
 
 DISTNAME=	mencvcd
 PKGNAME=	${DISTNAME}-0.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hammelmann.gmxhome.de/
 EXTRACT_SUFX=
diff --git a/sysutils/mencvcd/distinfo b/sysutils/mencvcd/distinfo
index 5b9efc8a2ce..6efc25da1fe 100644
--- a/sysutils/mencvcd/distinfo
+++ b/sysutils/mencvcd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/01 22:57:52 tron Exp $
+$NetBSD: distinfo,v 1.3 2005/02/02 09:11:27 tron Exp $
 
 SHA1 (mencvcd-0.3/mencvcd) = a3ace9d50e0722946286b8704b800ccbce86233b
 Size (mencvcd-0.3/mencvcd) = 13038 bytes
-SHA1 (patch-aa) = 22b7bd5e21889ed0f8238e0ef9264baed64b6da2
+SHA1 (patch-aa) = 445903a8a90e86ff45b891cd2769c8602ff261ee
diff --git a/sysutils/mencvcd/patches/patch-aa b/sysutils/mencvcd/patches/patch-aa
index f4e2b9d0c28..25f09a4d4af 100644
--- a/sysutils/mencvcd/patches/patch-aa
+++ b/sysutils/mencvcd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/02 09:11:27 tron Exp $
 
 --- mencvcd.orig	2003-06-13 21:06:02.000000000 +0100
-+++ mencvcd	2005-02-01 21:17:58.000000000 +0000
++++ mencvcd	2005-02-02 08:20:24.000000000 +0000
 @@ -1,4 +1,3 @@
 -#!/bin/sh
  #
@@ -16,7 +16,25 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
          if [ -z "`which $exe`" ]; then
                  echo "WARNING: $exe is not found in your path $PATH!"
  	fi
-@@ -186,7 +185,7 @@
+@@ -85,9 +84,6 @@
+ 
+ TMPDIR="." # path to directory for creating temporary files, recommended 2-3GB space
+ 
+-CDDRV="generic-mmc"    # cdrdao: cdwriter driver
+-CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder 
+-                       # to your cdwriter dev
+ CDMAXSIZE=800
+ 
+ ################################################################################
+@@ -127,6 +123,7 @@
+    echo "-noburn         disables burning."
+    echo "-normalize      use 'normalize'."
+    echo "-overburn       enables overburning a cd."
++   echo "-qmat <name>    quantisation matrix for mpeg2enc"
+    echo "-pulldown       enable pulldown mode in output."
+    echo "-ratio <s>      output ratio size of frames, see yuvscaler (1)."
+    echo "-size <X>x<Y>   sets output size of frames."
+@@ -186,7 +183,7 @@
        exit 1
     ;;
     *)
@@ -25,7 +43,7 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
        shift 1
     ;;
  esac
-@@ -217,9 +216,9 @@
+@@ -217,9 +214,9 @@
  asr=44100
  vbr=1152
  vbrset=0
@@ -37,7 +55,26 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
  imaget="-t vcd2"
  tvnorm=""
  framerate=""
-@@ -305,7 +304,7 @@
+@@ -230,6 +227,7 @@
+ overburn=""
+ pd=""
+ normalize=0
++qmat="-K kvcd"
+ 
+ while [ "$1"x != "x" ]; do
+    case $1 in
+@@ -296,6 +294,10 @@
+       -normalize)
+         normalize=1
+ 	;;
++      -qmat)
++        qmat="-K $2"
++        shift 1
++        ;;
+       -tvnorm)
+         tvnorm="-n $2"
+ 	shift 1
+@@ -305,7 +307,7 @@
  	shift 1
  	;;
        -denoise)
@@ -46,7 +83,7 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
          ;;
        -ratio)
          ratio=$2
-@@ -349,7 +348,7 @@
+@@ -349,7 +351,7 @@
  mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
  if [ "$vcdnorm" == "SVCD" ]; then
     [ $vbrset -eq 0 ] && vbr=2500
@@ -55,20 +92,21 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
     mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230"
     imaget="-t svcd"
  fi
-@@ -381,10 +380,9 @@
+@@ -381,10 +383,9 @@
        $command &
        
        # mjpegtools
 -      ($denoise < $VIDEO | \
 -         yuvscaler -v 0 $wide -O $vcdnorm $size $active $tvnorm | \
-+      (yuvscaler -v 0 $wide -O $vcdnorm $size $active $tvnorm < $VIDEO |
-          mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \
+-         mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \
 -	          $pd $framerate $tvnorm -4 2 -2 1 -o $NAME.mpv) &
-+	          $pd $framerate $tvnorm -4 2 -2 1 -o "$NAME.mpv") &
++      (yuvscaler -v 0 $wide -O $vcdnorm $size $active $tvnorm < $VIDEO |
++         mpeg2enc -v 0 $qmat -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 \
++	          -r 16 $pd $framerate $tvnorm -4 2 -2 1 -o "$NAME.mpv") &
     
        # wait for finishing the subprocesses
        wait
-@@ -395,23 +393,23 @@
+@@ -395,23 +396,23 @@
        # do resampling with sox
        if [ $sox -ne 0 ]; then
  	echo "wait, do resampling with sox..."
@@ -97,7 +135,7 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
        fi
     fi
  
-@@ -419,9 +417,9 @@
+@@ -419,9 +420,9 @@
     rm -f $AUDIO
  
     # multiplex streams
@@ -110,7 +148,7 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
  
     # remove pipe, won't need anymore!
     rm -f $VIDEO
-@@ -430,7 +428,7 @@
+@@ -430,7 +431,7 @@
     [ $mpgonly -eq 1 ] && exit 0
  
     # create cd images
@@ -119,7 +157,7 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
        [ -f $mpg ] || exit 1
        cue="`basename $mpg .mpg`.cue"
        bin="`basename $mpg .mpg`.bin"
-@@ -444,7 +442,7 @@
+@@ -444,7 +445,7 @@
  # burn the svcds
  [ $burn -eq 0 ] && exit 0
  
@@ -128,3 +166,15 @@ $NetBSD: patch-aa,v 1.1 2005/02/01 22:57:52 tron Exp $
     bin="`basename $cue .cue`.bin"
     [ -f $bin -a -f $cue ] || exit 1
  
+@@ -452,9 +453,9 @@
+    read -n 1 i
+ 
+    if [ $blank -eq 1 ]; then
+-      cdrdao blank --reload $CDDEV --driver $CDDRV --blank-mode minimal
++      cdrdao blank --reload --blank-mode minimal
+    fi
+-   cdrdao write $overburn --reload $CDDEV --driver $CDDRV $cue
++   cdrdao write $overburn --reload $cue
+ 
+ done
+ exit 0