head 1.4; access; symbols pkgsrc-2019Q4:1.3.0.106 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.102 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.100 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.98 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.96 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.94 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.92 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.90 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.88 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.86 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.82 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.80 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.78 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.76 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.74 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.72 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.70 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.68 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.66 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.64 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.62 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.60 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.58 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.56 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.54 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.52 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.48 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.46 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.44 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.42 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.40 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.36 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.32 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.30 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.28 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.26 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.24 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2; locks; strict; comment @# @; 1.4 date 2020.03.01.11.50.24; author wiz; state dead; branches; next 1.3; commitid oL4yQaMGMgnDZGYB; 1.3 date 2007.11.01.08.34.43; author rillig; state Exp; branches; next 1.2; 1.2 date 2005.02.02.09.11.27; author tron; state Exp; branches; next 1.1; 1.1 date 2005.02.01.22.57.52; author tron; state Exp; branches; next ; desc @@ 1.4 log @mencvcd: update to 1.4. This switches it to use the script from the mplayer sources. Modification date is still from 2011. Changes not found. @ text @$NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $ --- mencvcd.orig 2003-06-13 21:06:02.000000000 +0100 +++ mencvcd 2005-02-02 08:20:24.000000000 +0000 @@@@ -23,7 +22,7 @@@@ exit 1 fi done -for exe in vcdimager lame cdrdao yuvdenoise sox toolame normalize; do +for exe in vcdimager lame cdrdao sox toolame normalize; do if [ -z "`which $exe`" ]; then echo "WARNING: $exe is not found in your path $PATH!" fi @@@@ -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 quantisation matrix for mpeg2enc" echo "-pulldown enable pulldown mode in output." echo "-ratio output ratio size of frames, see yuvscaler (1)." echo "-size x sets output size of frames." @@@@ -186,7 +183,7 @@@@ exit 1 ;; *) - NAME=$1 + NAME="$1" shift 1 ;; esac @@@@ -217,9 +214,9 @@@@ asr=44100 vbr=1152 vbrset=0 -denoise="cat -" +denoise="" vcdnorm="VCD" -mplexnorm="-f $VCDMODE -m 1 -V -b 46" +mplexnorm="-f $VCDMODE -V -b 46" imaget="-t vcd2" tvnorm="" framerate="" @@@@ -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) - denoise="yuvdenoise" + denoise="-vf denoise3d" ;; -ratio) ratio=$2 @@@@ -349,7 +351,7 @@@@ mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46" if [ "$vcdnorm" == "SVCD" ]; then [ $vbrset -eq 0 ] && vbr=2500 - mplexnorm="-f $SVCDMODE -m 2 -V -b 230" + mplexnorm="-f $SVCDMODE -V -b 230" mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230" imaget="-t svcd" fi @@@@ -381,10 +383,9 @@@@ $command & # mjpegtools - ($denoise < $VIDEO | \ - yuvscaler -v 0 $wide -O $vcdnorm $size $active $tvnorm | \ - mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \ - $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 +396,23 @@@@ # do resampling with sox if [ $sox -ne 0 ]; then echo "wait, do resampling with sox..." - sox $AUDIO -v $volume -r $asr $NAME.wav resample -qs - mv -f $NAME.wav $AUDIO + sox $AUDIO -v $volume -r $asr "$NAME.wav" resample -qs + mv -f "$NAME.wav" $AUDIO fi if [ $toolame -ne 0 -a $mp3 -eq 0 ]; then # do mp2 encoding with toolame echo "wait, encoding to mp2 audio with toolame..." toolame -b $abr $AUDIO - mv -f `basename $AUDIO .wav`.mp2 $NAME.mpa + mv -f `basename $AUDIO .wav`.mp2 "$NAME.mpa" elif [ $toolame -eq 0 -a $mp3 -eq 0 ]; then # mp2enc/lame can't read audiodump.wav directly from named pipe, # we have to read the whole file. echo "wait, encoding to mp2 audio with mp2enc..." - mp2enc -b $abr -r $asr -o $NAME.mpa < $AUDIO + mp2enc -b $abr -r $asr -o "$NAME.mpa" < $AUDIO elif [ $mp3 -ne 0 ]; then echo "wait, encoding to mp3 audio with lame..." - lame -b $abr --resample $kasr - $NAME.mpa < $AUDIO + lame -b $abr --resample $kasr - "$NAME.mpa" < $AUDIO fi fi @@@@ -419,9 +420,9 @@@@ rm -f $AUDIO # multiplex streams - [ -f $NAME.mpv -a -f $NAME.mpa ] || exit 1 - rm -f ${NAME}*.mpg - mplex -v 0 $mplexnorm $sync -o ${NAME}%d.mpg $NAME.mpv $NAME.mpa + [ -f "$NAME.mpv" -a -f "$NAME.mpa" ] || exit 1 + rm -f "${NAME}*.mpg" + mplex -v 0 $mplexnorm $sync -o "${NAME}%d.mpg" "$NAME.mpv" "$NAME.mpa" # remove pipe, won't need anymore! rm -f $VIDEO @@@@ -430,7 +431,7 @@@@ [ $mpgonly -eq 1 ] && exit 0 # create cd images - for mpg in ${NAME}*.mpg; do + for mpg in "${NAME}*.mpg"; do [ -f $mpg ] || exit 1 cue="`basename $mpg .mpg`.cue" bin="`basename $mpg .mpg`.bin" @@@@ -444,7 +445,7 @@@@ # burn the svcds [ $burn -eq 0 ] && exit 0 -for cue in ${NAME}*.cue; do +for cue in "${NAME}*.cue"; do 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 @ 1.3 log @Files from DISTDIR should not be copied with the -p option, since they could be write-protected by file flags, which makes it difficult to remove them with "make clean". While here, replaced some custom code with things that have been added to the pkgsrc infrastructure. This makes the Makefile a bit shorter. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2005/02/02 09:11:27 tron Exp $ @ 1.2 log @- 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. @ text @d1 1 a1 1 $NetBSD$ a4 5 @@@@ -1,4 +1,3 @@@@ -#!/bin/sh # # Version: 0.3 # @ 1.1 log @- Don't use "-m" option with "mplex" because recent version don't support it. - Fix various quoting problems. - Use "mplayer" for denoising to save one extra step. Bump package revision after these bug fixes. @ text @d4 1 a4 1 +++ mencvcd 2005-02-01 21:17:58.000000000 +0000 d19 19 a37 1 @@@@ -186,7 +185,7 @@@@ d46 1 a46 1 @@@@ -217,9 +216,9 @@@@ d58 20 a77 1 @@@@ -305,7 +304,7 @@@@ d86 1 a86 1 @@@@ -349,7 +348,7 @@@@ d95 1 a95 1 @@@@ -381,10 +380,9 @@@@ d101 2 d104 2 a105 3 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") & d109 1 a109 1 @@@@ -395,23 +393,23 @@@@ d138 1 a138 1 @@@@ -419,9 +417,9 @@@@ d151 1 a151 1 @@@@ -430,7 +428,7 @@@@ d160 1 a160 1 @@@@ -444,7 +442,7 @@@@ d169 12 @