Move get_iplayer to a self-packaged tarball from git upstream, fixes include:

- ensure correct file extension is used if certain modes fail
- convert AAC radio recordings to m4a format with metadata tags
This commit is contained in:
sthen 2011-05-28 20:42:17 +00:00
parent 5b3c471c81
commit dfd6bc277a
3 changed files with 19 additions and 51 deletions

View File

@ -1,23 +1,24 @@
# $OpenBSD: Makefile,v 1.55 2011/04/20 23:07:24 sthen Exp $
# $OpenBSD: Makefile,v 1.56 2011/05/28 20:42:17 sthen Exp $
COMMENT = download/stream programmes from BBC iPlayer
DISTNAME = get_iplayer-2.79
REVISION = 1
DISTNAME = get_iplayer-2.79pl1
CATEGORIES = multimedia
# http://git.infradead.org/get_iplayer.git
HOMEPAGE = http://www.infradead.org/get_iplayer/
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
MASTER_SITES = ftp://ftp.infradead.org/pub/get_iplayer/
# repackaged from git
MASTER_SITES = http://spacehopper.org/mirrors/
#MASTER_SITES = ftp://ftp.infradead.org/pub/get_iplayer/
RUN_DEPENDS = audio/id3lib \
multimedia/atomicparsley \

View File

@ -1,5 +1,5 @@
MD5 (get_iplayer-2.79.tar.gz) = gNr1oiLcmbKJPk2u6/NVrA==
RMD160 (get_iplayer-2.79.tar.gz) = pHCyMpreQ3N7wrCbLz4c30di74k=
SHA1 (get_iplayer-2.79.tar.gz) = +VHPeynigO13ONvQ8GqIHatZm/M=
SHA256 (get_iplayer-2.79.tar.gz) = ertz+Oa/6WGOsOPPE19KsNai0XpS51AoAIiMJ4tqUsI=
SIZE (get_iplayer-2.79.tar.gz) = 226627
MD5 (get_iplayer-2.79pl1.tar.gz) = vYejt/SjvWzEJ8P7PBxF5A==
RMD160 (get_iplayer-2.79pl1.tar.gz) = ZkPzPw9jOF6sOoOfyKVMwl/8RWA=
SHA1 (get_iplayer-2.79pl1.tar.gz) = ohFjrDNStnagUp+p7hhJHSlCJuc=
SHA256 (get_iplayer-2.79pl1.tar.gz) = Cc9Mb1FduL2qo6fG4J6DWE0ZbuXKdShgkzH4nbcSza8=
SIZE (get_iplayer-2.79pl1.tar.gz) = 226332

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
--- get_iplayer.orig Sun Jan 9 16:13:43 2011
+++ get_iplayer Wed Apr 20 13:04:32 2011
@@ -295,6 +295,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
$OpenBSD: patch-get_iplayer,v 1.45 2011/05/28 20:42:17 sthen Exp $
--- get_iplayer.orig Sat May 28 21:00:47 2011
+++ get_iplayer Sat May 28 21:04:09 2011
@@ -296,6 +296,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
$opt->{quiet} = 1 if $opt_pre->{quiet};
$opt->{pvr} = 1 if $opt_pre->{pvr};
$opt->{stdout} = 1 if $opt_pre->{stdout} || $opt_pre->{stream};
@ -9,7 +9,7 @@ $OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
# show version and exit
if ( $opt_pre->{showver} ) {
@@ -331,7 +332,7 @@ mkpath $profile_dir if ! -d $profile_dir;
@@ -332,7 +333,7 @@ mkpath $profile_dir if ! -d $profile_dir;
# get list of additional user plugins and load plugin
@ -18,7 +18,7 @@ $OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
my $plugin_dir_user = "$profile_dir/plugins";
for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
if ( opendir( DIR, $plugin_dir ) ) {
@@ -659,7 +660,7 @@ sub init_search {
@@ -660,7 +661,7 @@ sub init_search {
delete $binopts->{vlc};
push @{ $binopts->{vlc} }, '-vv' if $opt->{debug};
@ -27,7 +27,7 @@ $OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
$bin->{atomicparsley} = $opt->{atomicparsley} || 'AtomicParsley';
$bin->{tee} = 'tee';
@@ -1987,7 +1988,7 @@ sub update_script {
@@ -1988,7 +1989,7 @@ sub update_script {
} elsif ( $opt->{packagemanager} =~ /disable/i ) {
logger "ERROR: get_iplayer should only be updated using your local package management system, for more information see http://linuxcentre.net/installation\n";
} else {
@ -36,7 +36,7 @@ $OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
}
exit 1;
}
@@ -4253,7 +4254,7 @@ sub tag_file {
@@ -4254,7 +4255,7 @@ sub tag_file {
my ( $id3_name, $id3_episode, $id3_desc, $id3_channel ) = ( $prog->{name}, $prog->{episode}, $prog->{desc}, $prog->{channel} );
s|"|\\"|g for ($id3_name, $id3_episode, $id3_desc, $id3_channel);
# Only tag if the required tool exists
@ -45,36 +45,3 @@ $OpenBSD: patch-get_iplayer,v 1.44 2011/04/20 23:07:24 sthen Exp $
main::logger "INFO: id3 tagging $prog->{ext} file\n";
my @cmd = (
$bin->{id3v2},
@@ -5823,7 +5824,7 @@ sub get_stream_data_cdn {
# Common attributes
# swfurl = Default iPlayer swf version
my $conn = {
- swfurl => "http://www.bbc.co.uk/emp/10player.swf?revision=18269_21576",
+ swfurl => "http://www.bbc.co.uk/emp/revisions/18269_21576_10player.swf?revision=18269_21576",
ext => $ext,
streamer => $streamer,
bitrate => $mattribs->{bitrate},
@@ -7086,6 +7087,7 @@ sub channels {
'bbc_radio_two' => 'BBC Radio 2',
'bbc_radio_three' => 'BBC Radio 3',
'bbc_radio_four' => 'BBC Radio 4',
+ 'bbc_radio_four_extra' => 'BBC Radio 4 Extra',
'bbc_radio_five_live' => 'BBC Radio 5 live',
'bbc_radio_five_live_sports_extra' => 'BBC 5 live Sports Extra',
'bbc_6music' => 'BBC 6 Music',
@@ -7156,6 +7158,7 @@ sub channels_schedule {
'radio3/programmes/schedules' => 'BBC Radio 3',
'radio4/programmes/schedules/fm' => 'BBC Radio 4 FM',
'radio4/programmes/schedules/lw' => 'BBC Radio 4 LW',
+ 'radio4extra/programmes/schedules' => 'BBC Radio 4 Extra',
'5live/programmes/schedules' => 'BBC Radio 5 live',
'5livesportsextra/programmes/schedules' => 'BBC 5 live Sports Extra',
'6music/programmes/schedules' => 'BBC 6 Music',
@@ -7565,6 +7568,7 @@ sub channels {
'bbc_radio_three' => 'BBC Radio 3',
'bbc_radio_fourfm' => 'BBC Radio 4 FM',
'bbc_radio_fourlw' => 'BBC Radio 4 LW',
+ 'bbc_radio_four_extra' => 'BBC Radio 4 Extra',
'bbc_radio_five_live' => 'BBC Radio 5 live',
'bbc_radio_five_live_sports_extra' => 'BBC 5 live Sports Extra',
'bbc_6music' => 'BBC 6 Music',