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.

4 files changed, 70 insertions, 68 deletions

diff --git a/sysutils/mencvcd/Makefile b/sysutils/mencvcd/Makefile
index 4e42a4950c5..29060aac913 100644
--- a/sysutils/mencvcd/Makefile
+++ b/sysutils/mencvcd/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2017/09/03 08:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/01 11:50:24 wiz Exp $
 
-DISTNAME=	mencvcd
-PKGNAME=	${DISTNAME}-0.3
-PKGREVISION=	5
+DISTNAME=	MPlayer-1.4
+PKGNAME=	${DISTNAME:S/MPlayer/mencvcd/}
 CATEGORIES=	sysutils
-MASTER_SITES=	http://hammelmann.gmxhome.de/
-EXTRACT_SUFX=
+MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/releases/
+DIST_SUBDIR=	mplayer
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-# "MEncVCD is part of MPlayer. You can find it in subdirectory TOOLS/ of the source code."
+MAINTAINER?=	pkgsrc-users@NetBSD.org
 #HOMEPAGE=	http://hammelmann.gmxhome.de/projects_en.html
+HOMEPAGE=	http://www.mplayerhq.hu/
 COMMENT=	Script for converting movie files into (S)VCD format
+LICENSE=	gnu-gpl-v2 # just says "GPL"
 
 DEPENDS+=	cdrdao>=1.1.9:../../sysutils/cdrdao
 DEPENDS+=	lame>=3.96.1:../../audio/lame
@@ -20,16 +21,16 @@ DEPENDS+=	normalize>=0.7.6:../../audio/normalize
 DEPENDS+=	sox>=12.16:../../audio/sox
 DEPENDS+=	vcdimager>=0.6.2:../../sysutils/vcdimager
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}
+CHECK_PORTABILITY_SKIP=	ffmpeg/configure # not used by package
+
 NO_BUILD=	yes
 
 INSTALLATION_DIRS=	bin
 
-REPLACE_BASH=	mencvcd
+REPLACE_BASH=	TOOLS/mencvcd.sh
 USE_TOOLS+=	bash:run
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mencvcd ${DESTDIR}${PREFIX}/bin/mencvcd
+	${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/mencvcd.sh ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mencvcd/PLIST b/sysutils/mencvcd/PLIST
index 7cde08961f6..84b4ee69b09 100644
--- a/sysutils/mencvcd/PLIST
+++ b/sysutils/mencvcd/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/27 23:07:40 tron Exp $
-bin/mencvcd
+@comment $NetBSD: PLIST,v 1.2 2020/03/01 11:50:24 wiz Exp $
+bin/mencvcd.sh
diff --git a/sysutils/mencvcd/distinfo b/sysutils/mencvcd/distinfo
index 0ebed90c3fe..2c8c9678bc6 100644
--- a/sysutils/mencvcd/distinfo
+++ b/sysutils/mencvcd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:32:21 agc Exp $
+$NetBSD: distinfo,v 1.7 2020/03/01 11:50:24 wiz Exp $
 
-SHA1 (mencvcd-0.3/mencvcd) = a3ace9d50e0722946286b8704b800ccbce86233b
-RMD160 (mencvcd-0.3/mencvcd) = 3785524bf26a9c7630a08a29b246d209c0b19d3c
-SHA512 (mencvcd-0.3/mencvcd) = b9a705b279301e173dd9358a7d45a97608d2fe5f0896fa3ae021609e5402f6351daf39ece53bb538fb083ce84e07f5e8e13c3f506c62099aa7eda0b26d59e388
-Size (mencvcd-0.3/mencvcd) = 13038 bytes
-SHA1 (patch-aa) = 3bc66db72486cc08766aa3b54ff44fe6a8b958b4
+SHA1 (mplayer/MPlayer-1.4.tar.xz) = 0954a7141de7c945d90db234e39a78c27cf73f78
+RMD160 (mplayer/MPlayer-1.4.tar.xz) = 7f94e3e3f127491f70a93a8699a1192c0771e20b
+SHA512 (mplayer/MPlayer-1.4.tar.xz) = 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
+Size (mplayer/MPlayer-1.4.tar.xz) = 15054920 bytes
+SHA1 (patch-TOOLS_mencvcd.sh) = 61ee925b9fcc5790158e1ea45b01380b837a0f2a
diff --git a/sysutils/mencvcd/patches/patch-aa b/sysutils/mencvcd/patches/patch-TOOLS_mencvcd.sh
index 6e1cb19afc2..dfbfb627ab9 100644
--- a/sysutils/mencvcd/patches/patch-aa
+++ b/sysutils/mencvcd/patches/patch-TOOLS_mencvcd.sh
@@ -1,8 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
+$NetBSD: patch-TOOLS_mencvcd.sh,v 1.1 2020/03/01 11:50:24 wiz Exp $
 
---- mencvcd.orig	2003-06-13 21:06:02.000000000 +0100
-+++ mencvcd	2005-02-02 08:20:24.000000000 +0000
-@@ -23,7 +22,7 @@
+Historic patch, not all parts clear.
+
+Some are just more quoting.
+
+--- TOOLS/mencvcd.sh.orig	2011-01-31 15:45:46.000000000 +0000
++++ TOOLS/mencvcd.sh
+@@ -22,7 +22,7 @@ for exe in mplayer mpeg2enc mp2enc mplex
  		exit 1
  	fi
  done
@@ -11,17 +15,17 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
          if [ -z "`which $exe`" ]; then
                  echo "WARNING: $exe is not found in your path $PATH!"
  	fi
-@@ -85,9 +84,6 @@
+@@ -80,9 +80,6 @@ done
  
  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 
+-CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder
 -                       # to your cdwriter dev
  CDMAXSIZE=800
  
  ################################################################################
-@@ -127,6 +123,7 @@
+@@ -120,6 +117,7 @@ usage() {
     echo "-noburn         disables burning."
     echo "-normalize      use 'normalize'."
     echo "-overburn       enables overburning a cd."
@@ -29,7 +33,7 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
     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 @@
+@@ -179,7 +177,7 @@ case $1 in
        exit 1
     ;;
     *)
@@ -38,38 +42,27 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
        shift 1
     ;;
  esac
-@@ -217,9 +214,9 @@
+@@ -208,9 +206,9 @@ abrset=0
  asr=44100
  vbr=1152
  vbrset=0
 -denoise="cat -"
 +denoise=""
- vcdnorm="VCD"
+ vnorm="VCD"
 -mplexnorm="-f $VCDMODE -m 1 -V -b 46"
 +mplexnorm="-f $VCDMODE -V -b 46"
  imaget="-t vcd2"
- tvnorm=""
+ yuvin=""
  framerate=""
-@@ -230,6 +227,7 @@
- overburn=""
- pd=""
- normalize=0
+@@ -229,6 +227,7 @@ while [ "$1"x != "x" ]; do
+ 	shift 1
+         ;;
+       -w)
 +qmat="-K kvcd"
- 
- while [ "$1"x != "x" ]; do
-    case $1 in
-@@ -296,6 +294,10 @@
-       -normalize)
-         normalize=1
+       	wide="-M WIDE2STD"
  	;;
-+      -qmat)
-+        qmat="-K $2"
-+        shift 1
-+        ;;
-       -tvnorm)
-         tvnorm="-n $2"
- 	shift 1
-@@ -305,7 +307,7 @@
+       -h|-?)
+@@ -289,12 +288,16 @@ while [ "$1"x != "x" ]; do
  	shift 1
  	;;
        -denoise)
@@ -78,30 +71,39 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
          ;;
        -ratio)
          ratio=$2
-@@ -349,7 +351,7 @@
+         shift 1
+         ;;
++      -qmat)
++        qmat="-K $2"
++        shift 1
++        ;;
+       -sid) # mplayer option: have to set vf expand, too!!!
+         sub="-vf pp,expand=-1:-1:-1:-1:1 -sid $2"
+         shift 1
+@@ -332,7 +335,7 @@ done
  mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
- if [ "$vcdnorm" == "SVCD" ]; then
+ if [ "$vnorm" = "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 @@
+@@ -361,10 +364,9 @@ if [ $burnonly -eq 0 ]; then
        $command &
-       
+ 
        # mjpegtools
 -      ($denoise < $VIDEO | \
--         yuvscaler -v 0 $wide -O $vcdnorm $size $active $tvnorm | \
+-         yuvscaler -v 0 $wide -O $vnorm $size $yuvin | \
 -         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 $yuvin -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 @@
+@@ -375,23 +377,23 @@ if [ $burnonly -eq 0 ]; then
        # do resampling with sox
        if [ $sox -ne 0 ]; then
  	echo "wait, do resampling with sox..."
@@ -117,7 +119,7 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
  	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 
+       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..."
@@ -130,30 +132,30 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
        fi
     fi
  
-@@ -419,9 +420,9 @@
+@@ -399,9 +401,9 @@ if [ $burnonly -eq 0 ]; then
     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
+-   mplex $mplexnorm $sync $NAME.mpv $NAME.mpa -o ${NAME}%d.mpg
 +   [ -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"
++   mplex $mplexnorm $sync "$NAME.mpv" "$NAME.mpa" -o "${NAME}%d.mpg"
  
     # remove pipe, won't need anymore!
     rm -f $VIDEO
-@@ -430,7 +431,7 @@
+@@ -410,7 +412,7 @@ if [ $burnonly -eq 0 ]; then
     [ $mpgonly -eq 1 ] && exit 0
  
     # create cd images
--   for mpg in ${NAME}*.mpg; do 
-+   for mpg in "${NAME}*.mpg"; do 
+-   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
+@@ -425,7 +427,7 @@ fi
+ # burn the (s)vcd's
  [ $burn -eq 0 ] && exit 0
  
 -for cue in ${NAME}*.cue; do
@@ -161,7 +163,7 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
     bin="`basename $cue .cue`.bin"
     [ -f $bin -a -f $cue ] || exit 1
  
-@@ -452,9 +453,9 @@
+@@ -433,8 +435,8 @@ for cue in ${NAME}*.cue; do
     read -n 1 i
  
     if [ $blank -eq 1 ]; then
@@ -170,6 +172,5 @@ $NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
     fi
 -   cdrdao write $overburn --reload $CDDEV --driver $CDDRV $cue
 +   cdrdao write $overburn --reload $cue
- 
  done
  exit 0