Date: Tue, 29 May 2007 08:00:54 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/113105: [patch] update multimedia/tovid to 0.30_2 Message-ID: <20070528220054.9866E641@k7.mavetju> Resent-Message-ID: <200705282210.l4SMA4vS054772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113105 >Category: ports >Synopsis: [patch] update multimedia/tovid to 0.30_2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon May 28 22:10:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 6.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386 >Description: Update tovid to 0.30_2 _2 because of the patches included from the website >How-To-Repeat: >Fix: Please note that there are handfull of added files and a handfull of deleted files. Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/tovid/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 19 May 2007 20:18:02 -0000 1.15 +++ Makefile 28 May 2007 21:58:29 -0000 @@ -6,10 +6,13 @@ # PORTNAME= tovid -PORTVERSION= 0.24 -PORTREVISION= 9 +PORTVERSION= 0.30 +PORTREVISION= 2 CATEGORIES= multimedia python -MASTER_SITES= http://download.berlios.de/tovid/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= tovid +PATCH_SITES= http://tovid.sourceforge.net/download/patches/ +PATCHFILES= tovid-0.30.2.patch.gz MAINTAINER= multimedia@FreeBSD.org COMMENT= A collection of video disc authoring tools @@ -33,33 +36,39 @@ tcrequant:${PORTSDIR}/multimedia/transcode \ vcdxbuild:${PORTSDIR}/multimedia/vcdimager \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ - growisofs:${PORTSDIR}/sysutils/dvd+rw-tools + growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ + txt2tags:${PORTSDIR}/textproc/txt2tags RUN_DEPENDS= \ ${BUILD_DEPENDS} \ bash:${PORTSDIR}/shells/bash USE_PYTHON= yes -USE_PYDISTUTILS= yes +#USE_PYDISTUTILS= yes USE_CDRTOOLS= yes USE_WX= 2.6 WX_COMPS= python GNU_CONFIGURE= yes +USE_GMAKE= yes +NO_BUILD= yes +PATCH_DIST_STRIP= -p1 -MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \ - tovid-suite.1 tovid.1 +CONFIGURE_ARGS= --mandir=${PREFIX}/man/ + +MAN1= idvid.1 makedvd.1 makemenu.1 makeslides.1 makevcd.1 makexml.1 \ + postproc.1 todisc.1 tovid.1 tovid-stats.1 post-patch: - @${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E \ -e 's|gawk|${AWK}|' \ -e 's|md5sum|md5|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # md5sum -> md5 # gnu sed -> sed # linux du -b -> emulation with awk # du should follow symbolic links # faster mplayer -dumpaudio # faster mplayer -dumpvideo - @${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E \ -e 's|md5sum|md5|' \ -e 's|sed[[:space:]]+-r|sed -E|' \ -e "s,du[[:space:]]+-b([^\|]+),ls -ALln \1 | ${AWK} '{print \$$5}'," \ @@ -69,7 +78,7 @@ -e 's|(-dumpvideo)|-ac dummy -ao null \1|' \ ${WRKSRC}/src/* # bash to sh fixes - @${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E \ -e 's|\[\[|\[|' \ -e 's|\]\]|\]|' \ -e 's|(\[[^]]+=)=|\1|g' \ @@ -79,14 +88,12 @@ ${WRKSRC}/src/* # python interpreter safeness .for dir in libtovid src - @${REINPLACE_CMD} -E \ - -e 's|/usr/bin/env[[:space:]]+python|${PYTHON_CMD}|' \ - ${WRKSRC}/${dir}/* + ${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \ + ${REINPLACE_CMD} -E \ + -e 's|/usr/bin/env[[:space:]]+python|${PYTHON_CMD}|' .endfor -# sh interpreter safeness - @${REINPLACE_CMD} -E \ - -e 's|`which env`[[:space:]]+sh|${LOCALBASE}/bin/bash|' \ - ${WRKSRC}/src/Makefile.in + + ${FIND} ${WRKSRC} -name '*.bak' -delete post-build: @cd ${WRKSRC} && ${MAKE} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/tovid/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 27 Dec 2005 16:49:42 -0000 1.1 +++ distinfo 28 May 2007 21:58:29 -0000 @@ -1,3 +1,6 @@ -MD5 (tovid-0.24.tar.gz) = e12bd1d8d034534f6808b3f45f9f54a5 -SHA256 (tovid-0.24.tar.gz) = 0643993a98a22baed3de01d2ee15d0fcbe54d38523d61e4a7beb06e88f656b2f -SIZE (tovid-0.24.tar.gz) = 167673 +MD5 (tovid-0.30.tar.gz) = feb3418acade9584cd8256f5ce2efb88 +SHA256 (tovid-0.30.tar.gz) = fe30a4ef08d1aa15fcb811d123d14a7934a9f5180abbcaddafef1e543c42720f +SIZE (tovid-0.30.tar.gz) = 393084 +MD5 (tovid-0.30.2.patch.gz) = 695f4ec2c5ed7a0305bfd32718b5d232 +SHA256 (tovid-0.30.2.patch.gz) = 2b778324f9db1813435843be75ec49eee241c508329770c77a5279ec097e2da0 +SIZE (tovid-0.30.2.patch.gz) = 1257 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/multimedia/tovid/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 22 Jan 2006 02:30:00 -0000 1.2 +++ pkg-plist 28 May 2007 21:58:30 -0000 @@ -1,4 +1,3 @@ -bin/dvrequant bin/idvid bin/makedvd bin/makemenu @@ -7,33 +6,139 @@ bin/makexml bin/postproc bin/previd +bin/todisc +bin/todisc-fade-routine bin/tovid bin/tovid-batch bin/tovid-init bin/tovid-interactive bin/tovid-test +bin/genvid +bin/pyidvid +bin/pytovid +bin/pymakemenu +bin/pymakexml +bin/ripframes +bin/todiscgui bin/tovidgui -%%PYTHON_SITELIBDIR%%/libtovid/Globals.py -%%PYTHON_SITELIBDIR%%/libtovid/Globals.pyc -%%PYTHON_SITELIBDIR%%/libtovid/Globals.pyo -%%PYTHON_SITELIBDIR%%/libtovid/Parser.py -%%PYTHON_SITELIBDIR%%/libtovid/Parser.pyc -%%PYTHON_SITELIBDIR%%/libtovid/Parser.pyo -%%PYTHON_SITELIBDIR%%/libtovid/Project.py -%%PYTHON_SITELIBDIR%%/libtovid/Project.pyc -%%PYTHON_SITELIBDIR%%/libtovid/Project.pyo -%%PYTHON_SITELIBDIR%%/libtovid/TDL.py -%%PYTHON_SITELIBDIR%%/libtovid/TDL.pyc -%%PYTHON_SITELIBDIR%%/libtovid/TDL.pyo -%%PYTHON_SITELIBDIR%%/libtovid/Target.py -%%PYTHON_SITELIBDIR%%/libtovid/Target.pyc -%%PYTHON_SITELIBDIR%%/libtovid/Target.pyo +bin/tovid-stats +bin/todraw %%PYTHON_SITELIBDIR%%/libtovid/__init__.py %%PYTHON_SITELIBDIR%%/libtovid/__init__.pyc %%PYTHON_SITELIBDIR%%/libtovid/__init__.pyo -%%PYTHON_SITELIBDIR%%/libtovid/tools.py -%%PYTHON_SITELIBDIR%%/libtovid/tools.pyc -%%PYTHON_SITELIBDIR%%/libtovid/tools.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/options.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/util.py +%%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/options.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/util.pyc +%%PYTHON_SITELIBDIR%%/libtovid/gui/__init__.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/configs.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/constants.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/controls.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/dialogs.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/frames.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/icons.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/meta.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/options.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/panels.pyo +%%PYTHON_SITELIBDIR%%/libtovid/gui/util.pyo +%%PYTHON_SITELIBDIR%%/libtovid/author.py +%%PYTHON_SITELIBDIR%%/libtovid/cli.py +%%PYTHON_SITELIBDIR%%/libtovid/deps.py +%%PYTHON_SITELIBDIR%%/libtovid/media.py +%%PYTHON_SITELIBDIR%%/libtovid/opts.py +%%PYTHON_SITELIBDIR%%/libtovid/output.py +%%PYTHON_SITELIBDIR%%/libtovid/runtest.py +%%PYTHON_SITELIBDIR%%/libtovid/spumux.py +%%PYTHON_SITELIBDIR%%/libtovid/standard.py +%%PYTHON_SITELIBDIR%%/libtovid/stats.py +%%PYTHON_SITELIBDIR%%/libtovid/testvid.py +%%PYTHON_SITELIBDIR%%/libtovid/utils.py +%%PYTHON_SITELIBDIR%%/libtovid/xml.py +%%PYTHON_SITELIBDIR%%/libtovid/author.pyc +%%PYTHON_SITELIBDIR%%/libtovid/cli.pyc +%%PYTHON_SITELIBDIR%%/libtovid/deps.pyc +%%PYTHON_SITELIBDIR%%/libtovid/media.pyc +%%PYTHON_SITELIBDIR%%/libtovid/opts.pyc +%%PYTHON_SITELIBDIR%%/libtovid/output.pyc +%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyc +%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyc +%%PYTHON_SITELIBDIR%%/libtovid/standard.pyc +%%PYTHON_SITELIBDIR%%/libtovid/stats.pyc +%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyc +%%PYTHON_SITELIBDIR%%/libtovid/utils.pyc +%%PYTHON_SITELIBDIR%%/libtovid/xml.pyc +%%PYTHON_SITELIBDIR%%/libtovid/author.pyo +%%PYTHON_SITELIBDIR%%/libtovid/cli.pyo +%%PYTHON_SITELIBDIR%%/libtovid/deps.pyo +%%PYTHON_SITELIBDIR%%/libtovid/media.pyo +%%PYTHON_SITELIBDIR%%/libtovid/opts.pyo +%%PYTHON_SITELIBDIR%%/libtovid/output.pyo +%%PYTHON_SITELIBDIR%%/libtovid/runtest.pyo +%%PYTHON_SITELIBDIR%%/libtovid/spumux.pyo +%%PYTHON_SITELIBDIR%%/libtovid/standard.pyo +%%PYTHON_SITELIBDIR%%/libtovid/stats.pyo +%%PYTHON_SITELIBDIR%%/libtovid/testvid.pyo +%%PYTHON_SITELIBDIR%%/libtovid/utils.pyo +%%PYTHON_SITELIBDIR%%/libtovid/xml.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/__init__.py +%%PYTHON_SITELIBDIR%%/libtovid/render/animation.py +%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.py +%%PYTHON_SITELIBDIR%%/libtovid/render/effect.py +%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.py +%%PYTHON_SITELIBDIR%%/libtovid/render/layer.py +%%PYTHON_SITELIBDIR%%/libtovid/render/__init__.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/animation.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/effect.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/layer.pyc +%%PYTHON_SITELIBDIR%%/libtovid/render/__init__.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/animation.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/drawing.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/effect.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/flipbook.pyo +%%PYTHON_SITELIBDIR%%/libtovid/render/layer.pyo +%%PYTHON_SITELIBDIR%%/libtovid/template/__init__.py +%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.py +%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.py +%%PYTHON_SITELIBDIR%%/libtovid/template/__init__.pyc +%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.pyc +%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.pyc +%%PYTHON_SITELIBDIR%%/libtovid/template/__init__.pyo +%%PYTHON_SITELIBDIR%%/libtovid/template/textmenu.pyo +%%PYTHON_SITELIBDIR%%/libtovid/template/thumbmenu.pyo +%%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.py +%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.py +%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.py +%%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.pyc +%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.pyc +%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.pyc +%%PYTHON_SITELIBDIR%%/libtovid/transcode/__init__.pyo +%%PYTHON_SITELIBDIR%%/libtovid/transcode/encode.pyo +%%PYTHON_SITELIBDIR%%/libtovid/transcode/rip.pyo + +@dirrm %%PYTHON_SITELIBDIR%%/libtovid/transcode +@dirrm %%PYTHON_SITELIBDIR%%/libtovid/template +@dirrm %%PYTHON_SITELIBDIR%%/libtovid/render +@dirrm %%PYTHON_SITELIBDIR%%/libtovid/gui @dirrm %%PYTHON_SITELIBDIR%%/libtovid @dirrmtry %%PYTHON_SITELIBDIR%% @dirrmtry %%PYTHON_LIBDIR%% Index: files/patch-Makefile.am =================================================================== RCS file: files/patch-Makefile.am diff -N files/patch-Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.am 28 May 2007 21:58:30 -0000 @@ -0,0 +1,13 @@ +--- Makefile.am.orig Sun May 27 22:25:59 2007 ++++ Makefile.am Sun May 27 22:26:09 2007 +@@ -89,8 +89,8 @@ + # Make the manpages for svn users (tarball users' man pages made in dist-hook) + # This is a static pattern rule as seen on (TV!) + # http://www.gnu.org/software/make/manual/make.html#Static-Pattern +-$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t +- txt2tags -t man -i "$<" -o "$@" ++#$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t ++# txt2tags -t man -i "$<" -o "$@" + + # Shared data: icons and .desktop files + # Source directories: Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.in 28 May 2007 21:58:30 -0000 @@ -0,0 +1,13 @@ +--- Makefile.in.orig Tue Feb 13 13:16:01 2007 ++++ Makefile.in Sun May 27 22:27:03 2007 +@@ -952,8 +952,8 @@ + # Make the manpages for svn users (tarball users' man pages made in dist-hook) + # This is a static pattern rule as seen on (TV!) + # http://www.gnu.org/software/make/manual/make.html#Static-Pattern +-$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t +- txt2tags -t man -i "$<" -o "$@" ++#$(man_MANS): $(man_dir)/%.1: $(man_src_dir)/%.t2t ++# txt2tags -t man -i "$<" -o "$@" + + # src/tovid-init not needed b/c ./configure derives it from src/tovid-init.in + # make fresh man pages for tarball users, ensuring that they're newer than the Index: files/patch-man__postproc.1 =================================================================== RCS file: files/patch-man__postproc.1 diff -N files/patch-man__postproc.1 --- files/patch-man__postproc.1 20 Jan 2006 02:44:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- man/postproc.1.orig Fri Jan 20 00:33:04 2006 -+++ man/postproc.1 Fri Jan 20 00:33:14 2006 -@@ -6,7 +6,7 @@ - - .SS Synopsis - .nf -- makeslides [ OPTIONS ] IN_FILE OUT_FILE -+ postproc [ OPTIONS ] IN_FILE OUT_FILE - .fi - - Index: files/patch-src__dvrequant.sh =================================================================== RCS file: files/patch-src__dvrequant.sh diff -N files/patch-src__dvrequant.sh --- files/patch-src__dvrequant.sh 20 Jan 2006 02:44:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ ---- src/dvrequant.sh.orig Fri Jan 20 00:23:01 2006 -+++ src/dvrequant.sh Fri Jan 20 00:26:34 2006 -@@ -446,11 +446,11 @@ - echo "You may consult the log file:$PROCESS_LOG" - echo " " - echo "BURNING:" --echo "Use to burn image: growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso " -+echo "Use to burn image: growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso " - echo "Insert blank dvd and press ENTER" - read BURN - cd $WORKING_DIR/$DISK_TITLE --growisofs -dvd-compat -Z $DVD_DEVICE=$DISK_TITLE.iso -+growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -Z $DVD_DEVICE=$DISK_TITLE.iso - - exit - Index: files/patch-src__makedvd =================================================================== RCS file: files/patch-src__makedvd diff -N files/patch-src__makedvd --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__makedvd 28 May 2007 21:58:30 -0000 @@ -0,0 +1,25 @@ +--- src/makedvd.orig Tue May 29 07:51:08 2007 ++++ src/makedvd Tue May 29 07:51:55 2007 +@@ -288,11 +288,11 @@ + DISC_SUM=0 + while test $i -le $NUM_VOBS; do + VOB=$(echo "$VOB_LIST" | awk -F ':' '{ print $'$i' }') +- VOB_SIZE=$(du -B M "$VOB" | awk -F ' ' '{print $1}' | tr -d M) ++ VOB_SIZE=$(du -m "$VOB" | awk -F ' ' '{print $1}' | tr -d M) + DISC_SUM=$(expr $VOB_SIZE \+ $DISC_SUM) + i=$(expr $i \+ 1) + done +- AVAIL_SPACE=$(df -B M -P . | awk 'NR != 1 {print $4;}' | tr -d M) ++ AVAIL_SPACE=$(df -m -P . | awk 'NR != 1 {print $4;}' | tr -d M) + + if test $DISC_SUM -gt $AVAIL_SPACE; then + echo $SEPARATOR +@@ -400,7 +400,7 @@ + probe_media + fi + +- DISC_SUM=$(du -s -B M "$OUT_DIR" | awk '{print $1}' | tr -d M) ++ DISC_SUM=$(du -s -m "$OUT_DIR" | awk '{print $1}' | tr -d M) + if test $DISC_SUM -gt $DISC_CAPACITY; then + echo $SEPARATOR + echo "Cannot continue! DVD image (${DISC_SUM}MB) exceeds the DVD's capacity (${DISC_CAPACITY}MB)." Index: files/patch-src__makedvd.sh =================================================================== RCS file: files/patch-src__makedvd.sh diff -N files/patch-src__makedvd.sh --- files/patch-src__makedvd.sh 20 Jan 2006 02:44:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/makedvd.sh.orig Fri Jan 20 00:23:04 2006 -+++ src/makedvd.sh Fri Jan 20 00:27:46 2006 -@@ -236,7 +236,7 @@ - - # Burn the disc, if requested - if $DO_BURN; then -- BURN_CMD="growisofs -dvd-compat -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso" -+ BURN_CMD="growisofs -dvd-compat -dvd-video -use-the-force-luke=dao -speed=$BURN_SPEED -Z $DVDRW_DEVICE=$DISC_LABEL.iso" - echo $SEPARATOR - echo "Burning ISO to DVD with the following command:" - echo $BURN_CMD Index: files/patch-src__makexml.sh =================================================================== RCS file: files/patch-src__makexml.sh diff -N files/patch-src__makexml.sh --- files/patch-src__makexml.sh 19 Feb 2006 08:55:51 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,65 +0,0 @@ ---- src/makexml.sh.orig Sun Feb 19 05:52:41 2006 -+++ src/makexml.sh Sun Feb 19 05:52:41 2006 -@@ -183,7 +183,7 @@ - # Generate XML for the button linking to this titleset menu from the top menu - TOP_MENU_BUTTONS=`cat << EOF - $TOP_MENU_BUTTONS\ -- <button>jump titleset $CUR_TS menu;<\/button>\n -+ <button>jump titleset $CUR_TS menu;<\/button> - EOF` - - # Generate XML for the menu header, with a placeholder for -@@ -206,7 +206,7 @@ - # Generate XML for the button linking to this menu from the top menu - TOP_MENU_BUTTONS=`cat << EOF - $TOP_MENU_BUTTONS\ -- <select ref="select-menu-$CUR_TS"\/>\n -+ <select ref="select-menu-$CUR_TS"\/> - EOF` - - # Generate XML for the segment item -@@ -271,7 +271,7 @@ - if [ $CUR_VIDEO -lt 2 ]; then - MENU_BUTTONS=`cat << EOF - $MENU_BUTTONS\ -- <button>jump title $CUR_TITLE;<\/button>\n -+ <button>jump title $CUR_TITLE;<\/button> - EOF` - fi - else -@@ -279,7 +279,7 @@ - if [ $CUR_VIDEO -le 1 ]; then - TOP_MENU_BUTTONS=`cat << EOF - $TOP_MENU_BUTTONS\ -- <button>jump titleset $CUR_TS menu;<\/button>\n -+ <button>jump titleset $CUR_TS menu;<\/button> - EOF` - fi - fi -@@ -377,7 +377,7 @@ - if $FIRST_TITLE; then - MENU_BUTTONS=`cat << EOF - $MENU_BUTTONS -- <select ref="play-title-$CUR_TITLE"\/>\n -+ <select ref="play-title-$CUR_TITLE"\/> - EOF` - fi - -@@ -413,7 +413,7 @@ - # jump to this playlist (title) - MENU_BUTTONS=`cat << EOF - $MENU_BUTTONS\ -- <select ref="play-title-$CUR_TITLE"\/>\n -+ <select ref="play-title-$CUR_TITLE"\/> - EOF` - - # Generate XML for the sequence item -@@ -457,7 +457,7 @@ - if $HAVE_TOP_MENU; then - MENU_BUTTONS=`cat << EOF - $MENU_BUTTONS\ -- <button>jump vmgm menu;<\/button>\n -+ <button>jump vmgm menu;<\/button> - EOF` - fi - Index: files/patch-src__tovid =================================================================== RCS file: files/patch-src__tovid diff -N files/patch-src__tovid --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__tovid 28 May 2007 21:58:30 -0000 @@ -0,0 +1,13 @@ +--- src/tovid.orig Sun May 27 21:50:36 2007 ++++ src/tovid Sun May 27 21:50:55 2007 +@@ -1930,8 +1930,8 @@ + # ****************************************************************************** + + if ! $FAKE; then +- AUDIO_SIZE=$(du -c -b "$AUDIO_STREAM" | awk 'END{print $1}') +- VIDEO_SIZE=$(du -c -b "$VIDEO_STREAM" | awk 'END{print $1}') ++ AUDIO_SIZE=`ls -ALln "$OUT_PREFIX.$AUD_SUF" | awk '{ sum += $5 } END { print sum }'` ++ VIDEO_SIZE=`ls -ALln "$OUT_PREFIX.$VID_SUF" | awk '{ sum += $5 } END { print sum }'` + # Total size of streams so far (in MBytes) + STREAM_SIZE=$(expr \( $AUDIO_SIZE \+ $VIDEO_SIZE \) \/ 1000000) + # If it exceeds disc size, add '%d' field to allow mplex to split output Index: files/patch-src__tovid.sh =================================================================== RCS file: files/patch-src__tovid.sh diff -N files/patch-src__tovid.sh --- files/patch-src__tovid.sh 30 Jul 2006 21:31:19 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ ---- src/tovid.sh.orig Tue Dec 27 03:29:42 2005 -+++ src/tovid.sh Tue Dec 27 03:43:52 2005 -@@ -265,7 +265,7 @@ - check_disk_space() - { - # Determine space available in current directory (in MB) -- AVAIL_SPACE=`df -mP . | awk 'NR != 1 {print $4;}'` -+ AVAIL_SPACE=`df -m . | awk 'NR != 1 {print $4;}'` - # Rough estimates of KB/sec for different formats - K_PER_SEC=200 - test x"$TGT_RES" = x"VCD" && K_PER_SEC=172 -@@ -1512,8 +1512,8 @@ - # ****************************************************************************** - # ****************************************************************************** - --AUDIO_SIZE=`du -c -b "$OUT_PREFIX.$AUD_SUF" | awk 'END{print $1}'` --VIDEO_SIZE=`du -c -b "$OUT_PREFIX.$VID_SUF" | awk 'END{print $1}'` -+AUDIO_SIZE=`ls -ALln "$OUT_PREFIX.$AUD_SUF" | awk '{ sum += $5 } END { print sum }'` -+VIDEO_SIZE=`ls -ALln "$OUT_PREFIX.$VID_SUF" | awk '{ sum += $5 } END { print sum }'` - # Total size of streams so far (in MBytes) - TOTAL_SIZE=`expr \( $AUDIO_SIZE \+ $VIDEO_SIZE \) \/ 1000000` - # If it will exceed disc size, add '%d' field to allow mplex to split the output >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070528220054.9866E641>