Update to 0.8.0.

Add THEME option.

Submitted by:	Phil Oleson <oz@nixil.net> (maintainer)
Approved by:	garga (mentor)

4 files changed, 89 insertions, 159 deletions

diff --git a/multimedia/dvd-slideshow/files/patch-dir2slideshow b/multimedia/dvd-slideshow/files/patch-dir2slideshow
new file mode 100644
index 000000000000..d2611d50bd9e
--- /dev/null
+++ b/multimedia/dvd-slideshow/files/patch-dir2slideshow
@@ -0,0 +1,16 @@
+--- 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
diff --git a/multimedia/dvd-slideshow/files/patch-dvd-menu b/multimedia/dvd-slideshow/files/patch-dvd-menu
new file mode 100644
index 000000000000..1d81e69b2ac2
--- /dev/null
+++ b/multimedia/dvd-slideshow/files/patch-dvd-menu
@@ -0,0 +1,25 @@
+--- dvd-menu.orig	2008-03-05 23:20:15.000000000 -0700
++++ dvd-menu	2008-03-05 23:22:38.000000000 -0700
+@@ -804,8 +804,8 @@
+ subtitle_code="EN"
+ 
+ # define some possible fonts:
+-font_dir="/usr/share/fonts/"
+-default_font1='n019004l.pfb' # helvetica bold URW fonts
++font_dir="/usr/local/lib/X11/fonts/"
++default_font1='n019004l.ttf' # helvetica bold URW fonts
+ default_font2='helb____.ttf' # helvetica bold truetype
+ 
+ ## other cool colors:  cadetblue cornflowerblue midnightblue
+@@ -1577,9 +1577,9 @@
+ 	        checkforprog ffmpeg
+ 	        echo "[dvd-menu] Creating ac3 audio..."
+ 	        check_rm "$tmpdir/audio.ac3"
+-	        ffmpeg -i "$tmpdir/audio.wav" -vn -y -ab 192 -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/audio.ac3" >> "$logfile" 2>&1
++	        ffmpeg -i "$tmpdir/audio.wav" -vn -y -ab 192k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/audio.ac3" >> "$logfile" 2>&1
+ 		if [ "$fadein" -eq 1 ] || [ "$fadeout" -eq 1 ] ; then
+-	        	ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab 192 -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
++	        	ffmpeg -i "$tmpdir/fade_audio.wav" -vn -y -ab 192k -acodec ac3 -ar $audio_sample_rate -ac 6 "$tmpdir/fade_audio.ac3" >> "$logfile" 2>&1
+ 		fi
+ 	else
+ 		## toolame is way faster! (3x in my test)
diff --git a/multimedia/dvd-slideshow/files/patch-dvd-slideshow b/multimedia/dvd-slideshow/files/patch-dvd-slideshow
index d623e19ab050..c4ae2964f5b5 100644
--- a/multimedia/dvd-slideshow/files/patch-dvd-slideshow
+++ b/multimedia/dvd-slideshow/files/patch-dvd-slideshow
@@ -1,160 +1,23 @@
---- 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  <scott at dylewski.com>
- #
-@@ -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 @@
+--- 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
- 		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
+ 		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"
diff --git a/multimedia/dvd-slideshow/files/patch-install.sh b/multimedia/dvd-slideshow/files/patch-install.sh
new file mode 100644
index 000000000000..afb3f982e4b2
--- /dev/null
+++ b/multimedia/dvd-slideshow/files/patch-install.sh
@@ -0,0 +1,26 @@
+--- 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