From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 2 22:10:04 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A18D116A4AB for ; Sun, 2 Sep 2007 22:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 99AC113C48A for ; Sun, 2 Sep 2007 22:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l82MA3c4025175 for ; Sun, 2 Sep 2007 22:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l82MA3MB025174; Sun, 2 Sep 2007 22:10:03 GMT (envelope-from gnats) Resent-Date: Sun, 2 Sep 2007 22:10:03 GMT Resent-Message-Id: <200709022210.l82MA3MB025174@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "User1001" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D0CA16A417 for ; Sun, 2 Sep 2007 22:07:25 +0000 (UTC) (envelope-from supraexpress@globaleyes.net) Received: from MX1.ll.net (mail.globaleyes.net [209.131.230.155]) by mx1.freebsd.org (Postfix) with ESMTP id 522CF13C442 for ; Sun, 2 Sep 2007 22:07:24 +0000 (UTC) (envelope-from supraexpress@globaleyes.net) Received: from FreeBSD1.LocalNET10 (unverified [209.131.254.241]) by MX1.ll.net (Vircom SMTPRS 4.4.571.23) with ESMTP id for ; Sun, 2 Sep 2007 17:07:00 -0500 Message-Id: <1188770826.2815@FreeBSD1.LocalNET10> Date: Sun, 2 Sep 2007 17:07:06 -0500 From: "User1001" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/116031: multimedia/dvd-slideshow has incorrect path for LSOF X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2007 22:10:04 -0000 >Number: 116031 >Category: ports >Synopsis: multimedia/dvd-slideshow has incorrect path for LSOF >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Sep 02 22:10:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: User1001 >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD 6.2-STABLE #3: Fri Jul 27 23:04:38 CDT 2007 lsof-4.79B dvd-slideshow-0.7.5_1 >Description: dvd-slideshow script uses "/usr/bin/lsof" instead of "/usr/local/sbin/lsof" for LSOF >How-To-Repeat: >Fix: --- dvd-slideshow.udiffs begins here --- --- dvd-slideshow.orig 2006-03-09 23:56:54.000000000 -0600 +++ dvd-slideshow 2007-09-02 17:02:53.000000000 -0500 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # dvd-slideshow # Copyright 2003 Scott Dylewski # @@ -151,7 +151,7 @@ Got rid of calls to NetPBM functions, so it is no longer required... Changed "wc -m" call to "wc --chars" for better compatibility. Fixed syntax so spaces should be allowed in input files now. - Changed "seq 2 1" to "seq 2 -1 1" for better compatibility + Changed "seq2 2 1" to "seq2 2 -1 1" for better compatibility Added option to "autocrop" images (-c) that are close to the output aspect ratio, but not quite. Title syntax changed... (see documentation) @@ -562,7 +562,7 @@ border=0 # not implemented yet subtitle_type="render" # format of subtitles. other values make dvd-slideshow render them internally. #subtitle_type="srt" # format of subtitles. other values make dvd-slideshow render them internally. -font_dir="/usr/share/fonts/" +font_dir="/usr/local/lib/X11/fonts/" default_font1='n019004l.pfb' # helvetica bold URW fonts default_font2='helb____.ttf' # helvetica bold truetype ## Subtitle: @@ -877,7 +877,7 @@ it=$(( $1 - $minutes * 60000 )) seconds=$(( $it / 1000 )) ; [ $seconds -eq 0 ] && seconds="0" thousandths=$(( $it - $seconds * 1000 )) ; - characters=`echo "$thousandths" | wc --chars` + characters=`echo "$thousandths" | wc -m` if [ $characters -eq 1 ] ; then thousandths_out="000" # empty string! elif [ $characters -eq 2 ] ; then @@ -923,7 +923,7 @@ minutes=`echo $1 | cut -d: -f2` seconds=`echo $1 | cut -d: -f3 | cut -d. -f1` fraction=`echo $1 | cut -d: -f3 | cut -d. -f2` - characters=`echo "$fraction" | wc --chars` + characters=`echo "$fraction" | wc -m` if [ "$characters" -eq 1 ] ; then ## no decimal was specified duration_ms="0" elif [ "$characters" -eq 2 ] ; then ## 1 decimal was specified @@ -1074,7 +1074,7 @@ # $1_$2.ppm ## wait for all files in a fade to exist... dir_tmp=`dirname "$1"` - for i_tmp in `seq 1 $2` ; do + for i_tmp in `seq2 1 $2` ; do di_tmp=`addzeros $i_tmp` newfile_tmp="$1"_$di_tmp.ppm while [ ! -f "$newfile_tmp" ] @@ -1099,14 +1099,14 @@ echo -n '' elif [ $this_frame -gt $(( $total_frames - $stepsize )) ] ; then ## make ( $total_frames - $this_frame ) copies - for it in `seq 1 $(( $total_frames - $this_frame ))`; do + for it in `seq2 1 $(( $total_frames - $this_frame ))`; do dj2=`addzeros $(( $this_frame + $it ))` cp "$tmpdir/fade_$dj.ppm" "$tmpdir/fade_$dj2.ppm" waitforfile "$tmpdir/fade_$dj2.ppm" # need on slow systems? done else ## loop over number of copies = stepsize-1 - for it in `seq 1 $(( $stepsize - 1 ))`; do + for it in `seq2 1 $(( $stepsize - 1 ))`; do dj2=`addzeros $(( $this_frame + $it ))` cp "$tmpdir/fade_$dj.ppm" "$tmpdir/fade_$dj2.ppm" waitforfile "$tmpdir/fade_$dj2.ppm" # need on slow systems? @@ -1121,7 +1121,7 @@ local l_duration_sec=`echo $1 | awk -F. '{ print $1 }'` [ -z "$l_duration_sec" ] && l_duration_sec=0 local l_duration_ms=`echo $1 | awk -F. '{ print $2 }'` - local l_characters=`echo "$l_duration_ms" | wc --chars` + local l_characters=`echo "$l_duration_ms" | wc -m` if [ -z "$l_duration_ms" ] ; then l_duration_ms=0 elif [ "$l_characters" -eq 1 ] ; then @@ -2418,7 +2418,7 @@ ####################################################################### ## Roate? ## rotate image first, then apply other effects? - for e in `seq 2 -1 1`; do + for e in `seq2 2 -1 1`; do if [ "$e" -eq 1 ] ; then this_effect="${effect1[$i]}" this_effect_params="${effect1_params[$i]}" @@ -2800,7 +2800,7 @@ # open the fifo for writing as fd 3 (unlikely to be used!) exec 3>"$tmpdir/$yuvfifo" - /usr/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1 + /usr/local/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1 fi ## make both a slideshow_background file and a title_background file @@ -3141,7 +3141,7 @@ ## do two frames each loop so it's faster? echo -n "[dvd-slideshow]" lastbar=0 - for fr in `seq 1 $stepsize $frames`; do + for fr in `seq2 1 $stepsize $frames`; do dj=`addzeros $fr` progressbar $fr $frames percent=$(( 100 * $fr / $frames )) @@ -3281,7 +3281,7 @@ echo -n "[dvd-slideshow]" lastbar=0 # required for progressbar ## do two frames each loop so it's faster? - for fr in `seq 1 $stepsize $frames`; do + for fr in `seq2 1 $stepsize $frames`; do progressbar $fr $frames dj=`addzeros $fr` percent=$(( 100 * $fr / $frames )) @@ -3329,7 +3329,7 @@ convert "$lastslide" "$tmpdir/temp_slideshow_image.mpc" echo -n "[dvd-slideshow]" lastbar=0 - for fr in `seq 1 $stepsize $frames`; do + for fr in `seq2 1 $stepsize $frames`; do dj=`addzeros $fr` progressbar $fr $frames percent=$(( 100 - 100 * $fr / $frames )) @@ -3645,7 +3645,7 @@ smooth_offset=$( echo "scale=9;$frames-$smooth_slope/$smooth_time*($frames^2/2)" | bc -l ) #random constant in the decel equation fi - for fr in `seq 1 $stepsize $frames`; do + for fr in `seq2 1 $stepsize $frames`; do dj=`addzeros $fr` if [ $smooth_ken -eq 1 ] && [ $frames -ge 30 ]; then @@ -3932,7 +3932,7 @@ fi echo -n "[dvd-slideshow]" lastbar=0 - for fr in `seq 1 $stepsize $frames`; do + for fr in `seq2 1 $stepsize $frames`; do dj=`addzeros $fr` x0=`div1000 $(( 1000 * $xs0 + $(($xe0-$xs0)) * 1000 * $fr / $frames ))` y0=`div1000 $(( 1000 * $ys0 + $(($ye0-$ys0)) * 1000 * $fr / $frames ))` @@ -4319,7 +4319,7 @@ # just close the fifo and wait for the encoder to finish logecho "[dvd-slideshow] mpeg2enc process=$yuvpid" logecho "[dvd-slideshow] output from ps=`ps $yuvpid`" - /usr/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1 + /usr/local/sbin/lsof -a -u $USER -d 3 +c 0 -c dvd -c convert -c mpeg2 >> "$outdir/$logfile" 2>&1 # close pipe to mpeg2enc exec 3>&- myecho '[dvd-slideshow] waiting for mpeg2enc to finish...' @@ -4422,7 +4422,7 @@ audio_1[0]='silence' # no duration needed myecho "[dvd-slideshow] No audio files passed. Using $end_hms silence." audio1_start=0 - audio1_end="$end_time" + audio1_end="5" fi ## let's split this audio processing into two loops: one just prepares the --- dvd-slideshow.udiffs ends here --- >Release-Note: >Audit-Trail: >Unformatted: