1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

1) Use growisofs from sysutils/dvd+rw-tools rather than cdrecord

from sysutils/cdrtools
2) Fix perl regexp ( perlfaq(6) ) so that qvamps correctly identifies
   multimedia/mjpegtools version; thus, using appropriatly matching
   command line parameters
3) Add overlooked runtime dependencies to RUN_DEPENDS
4) Enable DVD playing WITH_MPLAYER
5) Properly use 2048 bytes sectors rathen than 512 bytes ones on
   file size calculations
6) Further insure that hier(7) is upholded
7) Bump PORTREVISION

Reviewed by:	Zahemszky Gabor <Gabor@Zahemszky.hu>
Submitted by:	Zahemszky Gabor <Gabor@Zahemszky.hu> [1] [2]
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2006-01-13 15:58:17 +00:00
parent e011792f19
commit 8464d40dd4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=153392
5 changed files with 145 additions and 6 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= qvamps
PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= vamps
@ -17,9 +18,20 @@ COMMENT= Dvd rip gui written in qt that uses vamps and dvdauthor
BUILD_DEPENDS= puic:${PORTSDIR}/x11-toolkits/p5-qt \
swig1.3:${PORTSDIR}/devel/swig13
LIB_DEPENDS= dvdread.3:${PORTSDIR}/multimedia/libdvdread
RUN_DEPENDS= puic:${PORTSDIR}/x11-toolkits/p5-qt \
RUN_DEPENDS= \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
mplex:${PORTSDIR}/multimedia/mjpegtools \
ppmtoy4m:${PORTSDIR}/multimedia/mjpegtools \
puic:${PORTSDIR}/x11-toolkits/p5-qt \
spumux:${PORTSDIR}/multimedia/dvdauthor \
play_cell:${PORTSDIR}/multimedia/vamps \
vamps:${PORTSDIR}/multimedia/vamps
CONFLICTS= lxdvdrip-{{0.,1.[0-3],1.4[0-7]}*
OPTIONS= MPLAYER "Enable DVD playing using mplayer" on
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
@ -61,6 +73,11 @@ PLIST_DIRS= %%DATADIR%%/translations \
%%DATADIR%% \
lib/qvamps
FILES_FIX_2K_SECTOR_SIZE= \
TitleListItems.pm \
VTSListItems.pm \
mainwindow.ui.pm
post-patch:
@${REINPLACE_CMD} -E \
-e 's|puic|${LOCALBASE}/bin/puic|' \
@ -69,10 +86,23 @@ post-patch:
-e 's|[[:space:]]perl[[:space:]]| ${PERL} |' \
${BUILD_WRKSRC}/${MAKEFILE}
.for file in fakelupd.pl qvamps
${REINPLACE_CMD} -E \
@${REINPLACE_CMD} -E \
-e 's|/usr/bin/perl|${PERL}|' \
${WRKSRC}/${file}
.endfor
# PREFIX,DATADIR safeness
.for file in QVamps.pm mainwindow.ui qvamps
@${REINPLACE_CMD} -E \
-e 's|%%PREFIX%%|${PREFIX}|' \
-e 's|%%DATADIR%%|${DATADIR}|' \
${WRKSRC}/${file}
.endfor
# use 2 Kbytes sector size instead of 512 bytes
.for file in ${FILES_FIX_2K_SECTOR_SIZE}
@${REINPLACE_CMD} -E \
-e 's|512\.|2048\.|' \
${WRKSRC}/${file}
.endfor
do-install:
# application
@ -100,4 +130,8 @@ MAKE_ENV+= STRIP="${STRIP_CMD}"
MAKE_ENV+= STRIP="${TRUE}"
.endif
.ifdef(WITH_MPLAYER)
RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer
.endif
.include <bsd.port.post.mk>

View File

@ -0,0 +1,71 @@
--- QVamps.pm.orig Mon Jan 2 05:58:27 2006
+++ QVamps.pm Fri Jan 13 13:20:19 2006
@@ -19,8 +19,8 @@
# places to look for global settings file
our @global_settings_paths =
(
- "/usr/share/qvamps/etc",
- "/usr/local/share/qvamps/etc"
+ "%%PREFIX%%/etc/qvamps",
+ "%%DATADIR%%/etc"
);
# compute program's load prefix
@@ -40,8 +40,8 @@
"/General/DVD_burner" => "/dev/dvdrecorder",
"/General/DVD_burn_speed" => 4,
- "/Installation/prefix" => "/usr/local",
- "/Installation/messages_file" => "%p/share/qvamps/translations/%l",
+ "/Installation/prefix" => "%%PREFIX%%",
+ "/Installation/messages_file" => "%%DATADIR%%/translations/%l",
"/MediaPlayer/play_dvd_title" => 'mplayer -dvd-device %d %o dvd://%T',
"/MediaPlayer/play_dvd_cells" =>
@@ -56,11 +56,12 @@
'mplex -v 0 -f 8 -o /dev/stdout %v %a | spumux -P %x > %o',
"/Dvdauthor/spumux_mpg" => 'spumux -P %x < %i > %o',
"/Dvdauthor/burn_cmd" =>
- 's=`mkisofs -dvd-video -quiet -print-size %i`; ' .
- 'mkisofs -dvd-video -V "%v" %i | ' .
- 'cdrecord dev=%d speed=%s driveropts=burnfree ' .
- 'fs=16M tsize=${s}s -dao -v -',
-
+ 'growisofs -dvd-compat -dvd-video ' .
+ '-use-the-force-luke=dao ' .
+ '-use-the-force-luke=notray ' .
+ '-use-the-force-luke=tty ' .
+ '-speed=%s -Z %d ' .
+ '%i -V "%v" ' ,
"/Vamps/evaporate_cell" =>
'play_cell %d %v %g %c | vamps -E %E -a %a%o -S %S -i %i',
"/Vamps/select_subtitles" => '-s %s',
@@ -68,8 +69,8 @@
"/Vamps/dvdr_spare_sectors" => 1500,
"/Menu/Preferences/tv_standard" => "NTSC",
- "/Menu/Preferences/background" => "%p/share/qvamps/penguin.jpg",
- "/Menu/Preferences/audio_es" => "%p/share/qvamps/silence.mpa",
+ "/Menu/Preferences/background" => "%%DATADIR%%/penguin.jpg",
+ "/Menu/Preferences/audio_es" => "%%DATADIR%%/silence.mpa",
"/Menu/Preferences/audio_language" => "en",
"/Menu/Preferences/audio_format" => "Dolby AC-3",
"/Menu/Preferences/audio_channels" => "5.1",
@@ -101,7 +102,7 @@
our @settings_paths = @global_settings_paths;
# use settings from program's load prefix
-push @settings_paths, "$load_prefix/share/etc" if ($load_prefix);
+push @settings_paths, "$load_prefix/etc/vamps" if ($load_prefix);
# environment overrides global settings default path
@settings_paths = ( "$qvamps_home/share/etc" ) if ($qvamps_home);
@@ -287,7 +288,7 @@
if (open $fh, "-|", "ppmtoy4m -S 420_mpeg2 /dev/null 2>&1")
{
- if (<$fh> =~ /Unknown subsampling mode option: 420_mpeg2/)
+ if (<$fh> =~ /Unknown subsampling mode option:\s+420_mpeg2/)
{
my $ppm2mpv_ntsc = read_setting ("/Menu/Preferences/ppm2mpv_ntsc");
$ppm2mpv_ntsc =~ s/420_mpeg2/420mpeg2/;

View File

@ -0,0 +1,20 @@
--- mainwindow.ui.orig Wed Jan 11 09:56:33 2006
+++ mainwindow.ui Wed Jan 11 09:57:19 2006
@@ -3048,7 +3048,7 @@
</size>
</property>
<property name="text">
- <string>Default for background picture or MPEG program stream, %p =&gt; installation prefix, e.g. /usr/local (/Menu/Preferences/background)</string>
+ <string>Default for background picture or MPEG program stream, %p =&gt; installation prefix, e.g. %%PREFIX%% (/Menu/Preferences/background)</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
@@ -3132,7 +3132,7 @@
</size>
</property>
<property name="text">
- <string>Default for background audio elementary stream, %p =&gt; installation prefix, e.g. /usr/local (/Menu/Preferences/audio_es)</string>
+ <string>Default for background audio elementary stream, %p =&gt; installation prefix, e.g. %%PREFIX%% (/Menu/Preferences/audio_es)</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter</set>

View File

@ -0,0 +1,11 @@
--- mainwindow.ui.pm.orig Fri Jan 13 13:55:25 2006
+++ mainwindow.ui.pm Fri Jan 13 13:55:36 2006
@@ -344,7 +344,7 @@
if ($total_selected)
{
my $capacity = $dvdr_total_sectors - $dvdr_spare_sectors;
- $compression = sprintf "%d", $capacity * 100 / ($total_selected + 0.0);
+ $compression = sprintf "%d", $capacity * 200 / ($total_selected + 0.0);
$compression = 100 if ($compression > 100);
}
else

View File

@ -1,5 +1,5 @@
--- qvamps.orig Sat Oct 8 06:04:37 2005
+++ qvamps Thu Jan 5 18:46:57 2006
+++ qvamps Wed Jan 11 10:05:26 2006
@@ -19,14 +19,14 @@
{
print STDERR "qVamps: loading modules from $qvamps_home/share/lib\n";
@ -7,12 +7,15 @@
- unshift @INC, "$qvamps_home/lib/$archname";
+ unshift @INC, "$qvamps_home/lib";
}
elsif ($load_prefix && -e "$load_prefix/share/qvamps")
- elsif ($load_prefix && -e "$load_prefix/share/qvamps")
+ elsif ($load_prefix && -e "%%DATADIR%%")
{
print STDERR "qVamps: loading modules from " .
"$load_prefix/share/qvamps/lib\n";
unshift @INC, "$load_prefix/share/qvamps/lib";
- "$load_prefix/share/qvamps/lib\n";
- unshift @INC, "$load_prefix/share/qvamps/lib";
- unshift @INC, "$load_prefix/lib/qvamps/$archname";
+ "%%DATADIR%%/lib\n";
+ unshift @INC, "%%DATADIR%%/lib";
+ unshift @INC, "$load_prefix/lib/qvamps";
}
}