Date: Mon, 13 Apr 2009 05:19:33 -0600 (MDT) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133703: [maintainer-update] multimedia/dvd-slideshow-0.8.2 Message-ID: <200904131119.n3DBJX6V011265@nixil.net> Resent-Message-ID: <200904131150.n3DBo1Ae045269@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133703
>Category: ports
>Synopsis: [maintainer-update] multimedia/dvd-slideshow-0.8.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 13 11:50:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Phil Oleson
>Release: FreeBSD 6.3-RELEASE i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 6.3-RELEASE FreeBSD 6.3-RELEASE #2: Wed Jun 25 14:30:46 MDT 2008 root@fc:/usr/src/sys/i386/compile/VKERN i386
>Description:
Upgrading dvd-slideshow to 0.8.2
>How-To-Repeat:
N/S
>Fix:
Patch Upgrades the port to 0.8.2
--- patch-dvd-slideshow begins here ---
diff -ruN dvd-slideshow.orig/Makefile dvd-slideshow/Makefile
--- dvd-slideshow.orig/Makefile 2009-04-13 10:41:31.000000000 +0000
+++ dvd-slideshow/Makefile 2009-04-13 11:04:15.000000000 +0000
@@ -6,11 +6,11 @@
#
PORTNAME= dvd-slideshow
-PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTVERSION= 0.8.2
CATEGORIES= multimedia
MASTER_SITES= SF
-DISTFILES= ${PORTNAME}-${PORTVERSION}-1${EXTRACT_SUFX}
+DISTFILES= ${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX}
+THEMEVERSION= 0.8.0
MAINTAINER= oz@nixil.net
COMMENT= Script that creates a slideshow-style DVD with some simple menus
@@ -25,7 +25,7 @@
flvtool2:${PORTSDIR}/multimedia/ruby-flvtool2 \
${LOCALBASE}/lib/X11/fonts/urwfonts-ttf/README:${PORTSDIR}/x11-fonts/urwfonts-ttf
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-2
NO_BUILD= yes
USE_CDRTOOLS= yes
@@ -64,8 +64,8 @@
RUN_DEPENDS+= toolame:${PORTSDIR}/audio/toolame
.endif
.if defined(WITH_THEMES)
-DISTFILES+= ${PORTNAME}-themes-${PORTVERSION}-1${EXTRACT_SUFX}
-WRKSRC2= ${WRKDIR}/${PORTNAME}-themes-${PORTVERSION}-1
+DISTFILES+= ${PORTNAME}-themes-${THEMEVERSION}-1${EXTRACT_SUFX}
+WRKSRC2= ${WRKDIR}/${PORTNAME}-themes-${THEMEVERSION}-1
PLIST_SUB+= NOTHEMES=""
.else
PLIST_SUB+= NOTHEMES="@comment "
@@ -102,7 +102,7 @@
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/dvd-slideshowrc ${DOCSDIR}
.for FILE in changelog.html gallery1-to-slideshow.html dir2slideshow.html jigl2slideshow.html dvd-menu.html dvd-slideshow.html
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
.endfor
.endif
.ifdef(WITH_THEMES)
diff -ruN dvd-slideshow.orig/distinfo dvd-slideshow/distinfo
--- dvd-slideshow.orig/distinfo 2009-04-13 10:41:31.000000000 +0000
+++ dvd-slideshow/distinfo 2009-04-13 10:45:03.000000000 +0000
@@ -1,6 +1,6 @@
-MD5 (dvd-slideshow-0.8.0-1.tar.gz) = 83ff69e76ba2bfd0d1c735ada0dc64dd
-SHA256 (dvd-slideshow-0.8.0-1.tar.gz) = c75455a9e434c7c5ec05c015d022e62d8a1be2f17cab96eef7deb1ca81d31978
-SIZE (dvd-slideshow-0.8.0-1.tar.gz) = 126102
+MD5 (dvd-slideshow-0.8.2-2.tar.gz) = f945f66f941e72485384067a52f5d46d
+SHA256 (dvd-slideshow-0.8.2-2.tar.gz) = 00ad7d8cced0f72dc8febf80f1cf7d843f8c390aa412ca46ca22ed9521ae0005
+SIZE (dvd-slideshow-0.8.2-2.tar.gz) = 155338
MD5 (dvd-slideshow-themes-0.8.0-1.tar.gz) = 0597ce2f325119db7fc9e286fc9f4c03
SHA256 (dvd-slideshow-themes-0.8.0-1.tar.gz) = 56c13c272eb6e850b98f4182acd3c5e90ba378a6ec7fc37e4c47af70b6e25cb5
SIZE (dvd-slideshow-themes-0.8.0-1.tar.gz) = 1224977
diff -ruN dvd-slideshow.orig/files/patch-dvd-menu dvd-slideshow/files/patch-dvd-menu
--- dvd-slideshow.orig/files/patch-dvd-menu 2009-04-13 10:41:31.000000000 +0000
+++ dvd-slideshow/files/patch-dvd-menu 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
---- 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 -ruN dvd-slideshow.orig/files/patch-dvd-slideshow dvd-slideshow/files/patch-dvd-slideshow
--- dvd-slideshow.orig/files/patch-dvd-slideshow 2009-04-13 10:41:31.000000000 +0000
+++ dvd-slideshow/files/patch-dvd-slideshow 2009-04-13 11:12:00.000000000 +0000
@@ -1,6 +1,6 @@
---- 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 @@
+--- dvd-slideshow.orig 2008-12-05 07:48:58.000000000 +0000
++++ dvd-slideshow 2009-04-13 11:10:55.000000000 +0000
+@@ -3845,7 +3845,7 @@
mkdir -p "$outdir/$newname"_pics
fi
if [ "$copy" -eq 1 ] ; then
@@ -9,10 +9,10 @@
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 @@
+@@ -7136,9 +7136,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
+ ffmpeg -y -i "$outdir"/"$slideshow_name".flv -f mjpeg -t 0.001 "$outdir"/"$slideshow_name".jpg >> "$ffmpeg_out" 2>&1
- if [ -f "/usr/bin/flvtool2" ] ; then
+ if [ -f "/usr/local/bin/flvtool2" ] ; then
myecho "[dvd-slideshow] Running flvtool2 -U $slideshow_name".flv
--- patch-dvd-slideshow ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904131119.n3DBJX6V011265>