Date: Fri, 17 Mar 2006 01:22:44 -0700 (MST) From: Phil Oleson <oz@nixil.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94590: [MAINTAINER] multimedia/dvd-slideshow fix Message-ID: <200603170822.k2H8Mipf084450@nixil.net> Resent-Message-ID: <200603170830.k2H8UCWG047947@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94590
>Category: ports
>Synopsis: [MAINTAINER] multimedia/dvd-slideshow fix
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 17 08:30:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Phil Oleson
>Release: FreeBSD 4.7-RELEASE-p28 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #43: Wed Jul 20 09:35:30 MDT 2005 root@fc2:/usr/src/sys/compile/nixil.net i386
>Description:
Fix some problems with args to 'wc' that were supposed to be portable but are not.
Add dependency to urwfonts-ttf for subtitles and fixed path within script.
>How-To-Repeat:
N/A
>Fix:
Patch below
--- dvd-slideshow-patch begins here ---
diff -ruN dvd-slideshow.old/Makefile dvd-slideshow/Makefile
--- dvd-slideshow.old/Makefile Sun Mar 12 18:17:42 2006
+++ dvd-slideshow/Makefile Fri Mar 17 01:03:51 2006
@@ -7,7 +7,7 @@
PORTNAME= dvd-slideshow
PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,8 @@
ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
sox:${PORTSDIR}/audio/sox \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
- mkisofs:${PORTSDIR}/sysutils/cdrtools
+ mkisofs:${PORTSDIR}/sysutils/cdrtools \
+ ${X11BASE}/lib/X11/fonts/urwfonts-ttf:${PORTSDIR}/x11-fonts/urwfonts-ttf
NO_BUILD= yes
USE_REINPLACE= yes
diff -ruN dvd-slideshow.old/files/patch-dvd-menu dvd-slideshow/files/patch-dvd-menu
--- dvd-slideshow.old/files/patch-dvd-menu Wed Dec 31 17:00:00 1969
+++ dvd-slideshow/files/patch-dvd-menu Thu Mar 16 04:27:40 2006
@@ -0,0 +1,11 @@
+--- dvd-menu.orig Thu Mar 16 04:24:02 2006
++++ dvd-menu Thu Mar 16 04:27:06 2006
+@@ -181,7 +181,7 @@
+ autocrop=1
+
+ # define some possible fonts:
+-font_dir="/usr/share/fonts/"
++font_dir="/usr/X11R6/lib/X11/fonts/"
+ font1='n019004l.pfb' # helvetica bold URW fonts
+ font2='helb____.ttf' # helvetica bold truetype
+
diff -ruN dvd-slideshow.old/files/patch-dvd-slideshow dvd-slideshow/files/patch-dvd-slideshow
--- dvd-slideshow.old/files/patch-dvd-slideshow Sun Mar 12 18:17:42 2006
+++ dvd-slideshow/files/patch-dvd-slideshow Fri Mar 17 01:12:55 2006
@@ -1,5 +1,56 @@
---- dvd-slideshow.orig Fri Dec 30 04:21:02 2005
-+++ dvd-slideshow Fri Dec 30 04:25:22 2005
+--- dvd-slideshow.orig Tue Nov 22 20:13:05 2005
++++ dvd-slideshow Fri Mar 17 01:12:32 2006
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ # dvd-slideshow
+ # Copyright 2003 Scott Dylewski <scott at dylewski.com>
+ #
+@@ -381,7 +381,7 @@
+ copy=0 # add copies of original images to the output directory
+ autocrop=1 # autocrop images to fill full screen
+
+- font_dir="/usr/share/fonts"
++ font_dir="/usr/X11R6/lib/X11/fonts"
+ font1='n019004l.pfb' # helvetica bold URW fonts
+ font2='helb____.ttf' # helvetica bold truetype
+
+@@ -442,7 +442,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/X11R6/lib/X11/fonts"
+ font1='n019004l.pfb' # helvetica bold URW fonts
+ font2='helb____.ttf' # helvetica bold truetype
+ ## font sizes:
+@@ -738,7 +738,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
+@@ -982,7 +982,7 @@
+ duration_sec=`echo $1 | awk -F. '{ print $1 }'`
+ if [ -z "$duration_sec" ] ; then duration_sec=0 ; fi
+ duration_hu=`echo $1 | awk -F. '{ print $2 }'`
+- characters=`echo "$duration_hu" | wc --chars`
++ characters=`echo "$duration_hu" | wc -m`
+ if [ "$characters" -eq 1 ] ; then
+ ## no decimal was specified
+ duration_hu=0
+@@ -1010,7 +1010,7 @@
+ duration_sec=`echo $1 | awk -F. '{ print $1 }'`
+ if [ -z "$duration_sec" ] ; then duration_sec=0 ; fi
+ duration_ms=`echo $1 | awk -F. '{ print $2 }'`
+- characters=`echo "$duration_ms" | wc --chars`
++ characters=`echo "$duration_ms" | wc -m`
+ if [ "$characters" -eq 1 ] ; then
+ ## no decimal was specified
+ duration_ms=0
@@ -2051,7 +2051,7 @@
audio_inside_txtfile=0
imagefiles=0 ; moviefiles=0 ; audiofiles=0
--- dvd-slideshow-patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603170822.k2H8Mipf084450>