update to 2.09; note that "vmode" in /etc/options/get_iplayer should be
changed to "tvmode". (both are ok on the command line).
This commit is contained in:
parent
b7e583c8a0
commit
c27ec14099
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2009/06/24 00:21:25 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2009/07/12 19:41:43 sthen Exp $
|
||||
|
||||
COMMENT = download BBC iPlayer and ITV programmes
|
||||
|
||||
DISTNAME = get_iplayer-2.03
|
||||
PKGNAME = ${DISTNAME}p0
|
||||
DISTNAME = get_iplayer-2.09
|
||||
|
||||
CATEGORIES = multimedia
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (get_iplayer-2.03.tar.gz) = rHv6yY94fSoSIgv3Ps11hw==
|
||||
RMD160 (get_iplayer-2.03.tar.gz) = a6I1z7Ak2O6lQ3ZFIHEz41FvErA=
|
||||
SHA1 (get_iplayer-2.03.tar.gz) = xezO1akQLz7IbYVe4MccH7l5/Zg=
|
||||
SHA256 (get_iplayer-2.03.tar.gz) = b9raSNS5Yv0+4c7ezWxnUEqYbPccW6CQ7/B0RvOESyc=
|
||||
SIZE (get_iplayer-2.03.tar.gz) = 108044
|
||||
MD5 (get_iplayer-2.09.tar.gz) = jcflbh8cdVW/A+aWvJ1Waw==
|
||||
RMD160 (get_iplayer-2.09.tar.gz) = vxmJI+3uNBJreUkNBq/jlNCFUjc=
|
||||
SHA1 (get_iplayer-2.09.tar.gz) = 7tkH1UquWmU7FigtBOBTUzlMksk=
|
||||
SHA256 (get_iplayer-2.09.tar.gz) = iFT/fO157/1B4jyvk1nOWydCO2NoDWmUAml2ZibkHoU=
|
||||
SIZE (get_iplayer-2.09.tar.gz) = 112604
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: options.sample,v 1.1 2009/06/15 09:01:22 sthen Exp $
|
||||
# $OpenBSD: options.sample,v 1.2 2009/07/12 19:41:43 sthen Exp $
|
||||
|
||||
# don't ask about removing old files
|
||||
#nopurge 1
|
||||
@ -12,4 +12,4 @@
|
||||
# select default video modes; ffplay from ffmpeg-20080620p8 can handle
|
||||
# the flash formats but some other software, including mplayer-1.0rc2p24
|
||||
# and the ffmpeg converter from ffmpeg-20080620 cannot.
|
||||
#vmode flashhd,flashvhigh,flashhigh
|
||||
#tvmode flashhd,flashvhigh,flashhigh
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-get_iplayer,v 1.10 2009/06/24 00:02:20 sthen Exp $
|
||||
--- get_iplayer.orig Sat Jun 20 16:42:34 2009
|
||||
+++ get_iplayer Wed Jun 24 00:48:07 2009
|
||||
@@ -283,7 +283,7 @@ mkpath $profile_dir if ! -d $profile_dir;
|
||||
$OpenBSD: patch-get_iplayer,v 1.11 2009/07/12 19:41:43 sthen Exp $
|
||||
--- get_iplayer.orig Sun Jul 12 10:38:38 2009
|
||||
+++ get_iplayer Sun Jul 12 20:38:46 2009
|
||||
@@ -286,7 +286,7 @@ mkpath $profile_dir if ! -d $profile_dir;
|
||||
|
||||
|
||||
# get list of additional user plugins and load plugin
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-get_iplayer,v 1.10 2009/06/24 00:02:20 sthen Exp $
|
||||
my $plugin_dir_user = "$profile_dir/plugins";
|
||||
for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
|
||||
if ( opendir( DIR, $plugin_dir ) ) {
|
||||
@@ -406,6 +406,7 @@ if ( ! keys %plugin_files ) {
|
||||
@@ -403,6 +403,7 @@ if ( ! keys %plugin_files ) {
|
||||
$opt->{pluginsupdate} = 1;
|
||||
}
|
||||
# Update this script if required
|
||||
@ -18,24 +18,21 @@ $OpenBSD: patch-get_iplayer,v 1.10 2009/06/24 00:02:20 sthen Exp $
|
||||
update_script() if $opt->{update} || $opt->{pluginsupdate};
|
||||
|
||||
|
||||
@@ -576,9 +577,9 @@ sub find_matches {
|
||||
@@ -586,7 +587,7 @@ sub find_matches {
|
||||
$binopts->{lame} .= ' --quiet ' if $opt->{quiet};
|
||||
$bin->{vlc} = $opt->{vlc} || 'cvlc';
|
||||
$binopts->{vlc} = '-vv' if $opt->{verbose} || $opt->{debug};
|
||||
- $bin->{id3v2} = $opt->{id3v2} || 'id3v2';
|
||||
+ $bin->{id3v2} = $opt->{id3v2} || 'id3tag';
|
||||
$bin->{tee} = 'tee';
|
||||
- $bin->{rtmpdump} = $opt->{rtmpdump} || 'rtmpdump';
|
||||
+ $bin->{rtmpdump} = $opt->{rtmpdump} || 'flvstreamer';
|
||||
$binopts->{rtmpdump} = ' --quiet' if $opt->{quiet};
|
||||
$binopts->{rtmpdump} = ' --verbose' if $opt->{verbose};
|
||||
$binopts->{rtmpdump} = ' --debug' if $opt->{debug};
|
||||
@@ -1408,7 +1409,7 @@ sub create_ua {
|
||||
my $agent = $user_agent{ "$_[0]" } || random_ua();
|
||||
my $nocookiejar = $_[1] || 0;
|
||||
my $ua = LWP::UserAgent->new;
|
||||
- $ua->timeout([$lwp_request_timeout]);
|
||||
+ $ua->timeout($lwp_request_timeout);
|
||||
$ua->proxy( ['http'] => $opt->{proxy} ) if $opt->{proxy} && $opt->{proxy} !~ /^prepend:/;
|
||||
$ua->agent( $agent );
|
||||
main::logger "DEBUG: Using user-agent '$agent'\n" if $opt->{debug};
|
||||
$bin->{flvstreamer} = $opt->{flvstreamer} || $opt->{rtmpdump} || 'flvstreamer';
|
||||
# quote binaries which allows for spaces in the path
|
||||
@@ -4490,7 +4491,7 @@ sub optional_list_entry_format {
|
||||
# Returns the modes to try for this prog type
|
||||
sub modelist {
|
||||
my $prog = shift;
|
||||
- my $mlist = $opt->{tvmode} || $opt->{modes};
|
||||
+ my $mlist = $opt->{tvmode} || $opt->{vmode} || $opt->{modes};
|
||||
|
||||
# Defaults
|
||||
if ( ! $mlist ) {
|
||||
|
Loading…
Reference in New Issue
Block a user