pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/mencvcd mencvcd: update to 1.4.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/df86f1aa4155
branches:  trunk
changeset: 412194:df86f1aa4155
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 01 11:50:24 2020 +0000

description:
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.

diffstat:

 sysutils/mencvcd/Makefile                       |   25 +-
 sysutils/mencvcd/PLIST                          |    4 +-
 sysutils/mencvcd/distinfo                       |   12 +-
 sysutils/mencvcd/patches/patch-TOOLS_mencvcd.sh |  176 ++++++++++++++++++++++++
 sysutils/mencvcd/patches/patch-aa               |  175 -----------------------
 5 files changed, 197 insertions(+), 195 deletions(-)

diffs (truncated from 434 to 300 lines):

diff -r 4f058f97e83b -r df86f1aa4155 sysutils/mencvcd/Makefile
--- a/sysutils/mencvcd/Makefile Sun Mar 01 11:46:43 2020 +0000
+++ b/sysutils/mencvcd/Makefile Sun Mar 01 11:50:24 2020 +0000
@@ -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@localhost
-# "MEncVCD is part of MPlayer. You can find it in subdirectory TOOLS/ of the source code."
+MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 #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+=      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 -r 4f058f97e83b -r df86f1aa4155 sysutils/mencvcd/PLIST
--- a/sysutils/mencvcd/PLIST    Sun Mar 01 11:46:43 2020 +0000
+++ b/sysutils/mencvcd/PLIST    Sun Mar 01 11:50:24 2020 +0000
@@ -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 -r 4f058f97e83b -r df86f1aa4155 sysutils/mencvcd/distinfo
--- a/sysutils/mencvcd/distinfo Sun Mar 01 11:46:43 2020 +0000
+++ b/sysutils/mencvcd/distinfo Sun Mar 01 11:50:24 2020 +0000
@@ -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 -r 4f058f97e83b -r df86f1aa4155 sysutils/mencvcd/patches/patch-TOOLS_mencvcd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/mencvcd/patches/patch-TOOLS_mencvcd.sh   Sun Mar 01 11:50:24 2020 +0000
@@ -0,0 +1,176 @@
+$NetBSD: patch-TOOLS_mencvcd.sh,v 1.1 2020/03/01 11:50:24 wiz Exp $
+
+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
+-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
+@@ -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
+-                       # to your cdwriter dev
+ CDMAXSIZE=800
+ 
+ ################################################################################
+@@ -120,6 +117,7 @@ usage() {
+    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."
+@@ -179,7 +177,7 @@ case $1 in
+       exit 1
+    ;;
+    *)
+-      NAME=$1
++      NAME="$1"
+       shift 1
+    ;;
+ esac
+@@ -208,9 +206,9 @@ abrset=0
+ asr=44100
+ vbr=1152
+ vbrset=0
+-denoise="cat -"
++denoise=""
+ vnorm="VCD"
+-mplexnorm="-f $VCDMODE -m 1 -V -b 46"
++mplexnorm="-f $VCDMODE -V -b 46"
+ imaget="-t vcd2"
+ yuvin=""
+ framerate=""
+@@ -229,6 +227,7 @@ while [ "$1"x != "x" ]; do
+       shift 1
+         ;;
+       -w)
++qmat="-K kvcd"
+               wide="-M WIDE2STD"
+       ;;
+       -h|-?)
+@@ -289,12 +288,16 @@ while [ "$1"x != "x" ]; do
+       shift 1
+       ;;
+       -denoise)
+-        denoise="yuvdenoise"
++        denoise="-vf denoise3d"
+         ;;
+       -ratio)
+         ratio=$2
+         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 [ "$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
+@@ -361,10 +364,9 @@ if [ $burnonly -eq 0 ]; then
+       $command &
+ 
+       # mjpegtools
+-      ($denoise < $VIDEO | \
+-         yuvscaler -v 0 $wide -O $vnorm $size $yuvin | \
+-         mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \
+-                $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
+@@ -375,23 +377,23 @@ if [ $burnonly -eq 0 ]; then
+       # 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
+ 
+@@ -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 $mplexnorm $sync $NAME.mpv $NAME.mpa -o ${NAME}%d.mpg
++   [ -f "$NAME.mpv" -a -f "$NAME.mpa" ] || exit 1
++   rm -f "${NAME}*.mpg"
++   mplex $mplexnorm $sync "$NAME.mpv" "$NAME.mpa" -o "${NAME}%d.mpg"
+ 
+    # remove pipe, won't need anymore!
+    rm -f $VIDEO
+@@ -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
+       [ -f $mpg ] || exit 1
+       cue="`basename $mpg .mpg`.cue"
+       bin="`basename $mpg .mpg`.bin"
+@@ -425,7 +427,7 @@ fi
+ # burn the (s)vcd's
+ [ $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
+ 
+@@ -433,8 +435,8 @@ for cue in ${NAME}*.cue; do
+    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
diff -r 4f058f97e83b -r df86f1aa4155 sysutils/mencvcd/patches/patch-aa
--- a/sysutils/mencvcd/patches/patch-aa Sun Mar 01 11:46:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-$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 <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
-    ;;
-    *)
--      NAME=$1
-+      NAME="$1"
-       shift 1
-    ;;
- esac
-@@ -217,9 +214,9 @@



Home | Main Index | Thread Index | Old Index