Date: Sun, 2 Sep 2007 20:34:34 -0500 From: "User1001" <supraexpress@globaleyes.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/116037: multimedia/dvd-slideshow has been updated from 0.7.5 to 0.8.0-1 Message-ID: <1188783274.13526@FreeBSD1.LocalNET10> Resent-Message-ID: <200709030140.l831e1Vm040304@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116037 >Category: ports >Synopsis: multimedia/dvd-slideshow has been updated from 0.7.5 to 0.8.0-1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 03 01:40:00 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 >Description: Source version of "dvd-slideshow" has been updated. All but the last FBSD patches for V 0.7.5 have been "fixed" in V 0.8.0-1. http://www.inlet-media.de/flvtool2 A number of unfortunate Linux-ims still occur. The most obvious ones have been addressed in the attached patch files. NOTE: some Makefile comments/options should be included with regards to the following optional programs which are checked for and used if found: jhead-2.7 Exif Jpeg camera setting parser, rotator and much mor ruby-flvtool2-1.0.6 Manipulation tool for Macromedia Flash Video files >How-To-Repeat: >Fix: --- dir2slideshow.udiffs begins here --- --- dir2slideshow.orig 2006-12-21 00:43:48.000000000 -0600 +++ dir2slideshow 2007-09-02 20:20:34.000000000 -0500 @@ -633,8 +633,11 @@ check_rm "$output_dir"/filelist_date.txt for (( i=1 ; i<=pictures ; i++ )) ; do file=`sed -n "$i"p "$output_dir"/imagelist.txt` - modified_day=`ls -l --full-time "$file" | awk '{print $6}'` - modified_time=`ls -l --full-time "$file" | awk '{print $7}'` + modified_day=`ls -lT "$file" | awk '{print $9"-"$6"-"$7}'` + modified_day=`date -j -f "%Y-%b-%d" "$modified_day" "+%Y-%m-%d"` + modified_time=`ls -lT "$file" | awk '{print $8}' +## modified_day=`ls -l --full-time "$file" | awk '{print $6}'` +## modified_time=`ls -l --full-time "$file" | awk '{print $7}'` # echo "modified_day=$modified_day" # echo "modified_time=$modified_time" echo "$file: $modified_day $modified_time" >> "$output_dir"/filelist_date.txt --- dir2slideshow.udiffs ends here --- --- dvd-slideshow.udiffs begins here --- --- dvd-slideshow.orig 2007-01-13 20:03:38.000000000 -0600 +++ dvd-slideshow 2007-09-02 20:22:00.000000000 -0500 @@ -3825,7 +3825,7 @@ mkdir -p "$outdir/$newname"_pics fi if [ "$copy" -eq 1 ] ; then - cp -af "${image[$i]}" "$outdir/$newname"_pics + cp -pf "${image[$i]}" "$outdir/$newname"_pics fi moviefiles=$(( $moviefiles + 1 )) elif [ "${filetype[$i]}" == 'ogg' ] || [ "${filetype[$i]}" == 'mp3' ] || [ "${filetype[$i]}" == 'wav' ] || [ "${image[$i]}" == 'silence' ] || [ "${filetype[$i]}" == 'm4a' ] || [ "${filetype[$i]}" == 'aac' ] ; then @@ -6602,9 +6602,9 @@ mv "$tmpdir/video1.flv" "$outdir"/"$slideshow_name".flv myecho "[dvd-slideshow] Generating video thumbnail..." ffmpeg -y -i "$outdir"/"$slideshow_name".flv -f mjpeg -t 0.001 "$outdir"/"$slideshow_name".jpg >> "$outdir"/"$logfile" 2>&1 - if [ -f "/usr/bin/flvtool2" ] ; then + if [ -f "/usr/local/bin/flvtool2" ] ; then myecho "[dvd-slideshow] Running flvtool2 -U $slideshow_name".flv - /usr/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv + /usr/local/bin/flvtool2 -U "$outdir"/"$slideshow_name".flv fi elif [ "$output_format" == 'swf' ] ; then myecho "[dvd-slideshow] Adding audio to .swf file" --- dvd-slideshow.udiffs ends here --- --- install.sh.udiffs begins here --- --- install.sh.orig 2006-09-18 00:26:46.000000000 -0500 +++ install.sh 2007-09-02 19:46:04.000000000 -0500 @@ -10,16 +10,16 @@ cp man/jigl2slideshow.1 /usr/local/man/man1/. # copy executables: -cp dvd-slideshow /usr/bin/. -cp dvd-menu /usr/bin/. -cp gallery1-to-slideshow /usr/bin/. -cp jigl2slideshow /usr/bin/. -cp dir2slideshow /usr/bin/. +cp dvd-slideshow /usr/local/bin/. +cp dvd-menu /usr/local/bin/. +cp gallery1-to-slideshow /usr/local/bin/. +cp jigl2slideshow /usr/local/bin/. +cp dir2slideshow /usr/local/bin/. # remove old versions: -if [ -r '/usr/bin/gallery2slideshow' ] ; then +if [ -r '/usr/local/bin/gallery2slideshow' ] ; then echo 'Removing old gallery2slideshow and installing gallery1-to-slideshow instead' echo 'See changelog for details.' - rm "/usr/bin/gallery2slideshow" + rm "/usr/local/bin/gallery2slideshow" rm "/usr/local/man/man1/gallery2slideshow.1" fi --- install.sh.udiffs ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1188783274.13526>