cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pacpl to 4.0.4 and switch to FFmpeg for AC3 encoding. From Brad,

Browse Source 
ok with maintainer "if it works for you".

- also fix AC3 decoding, which was broken in the old version too (and found
while testing the above changes), from me.
This commit is contained in:
sthen 2012-04-28 09:02:36 +00:00
parent 7b6adaf5d8
commit 71544ab8b4
3 changed files with 95 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/pacpl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2011/09/16 08:26:10 espie Exp $
# $OpenBSD: Makefile,v 1.11 2012/04/28 09:02:36 sthen Exp $
PKG_ARCH= *
@ -6,14 +6,11 @@ COMMENT-main= PAC (Perl Audio Converter)
COMMENT-konqueror= PAC Konqueror service menu & mime types
COMMENT-amarok= PAC Amarok plugin
V= 4.0.3
V= 4.0.4
DISTNAME= pacpl-${V}
PKGNAME-main= pacpl-${V}
REVISION-main= 0
PKGNAME-konqueror= pacpl-konqueror-${V}
REVISION-konqueror= 1
PKGNAME-amarok= pacpl-amarok-${V}
REVISION-amarok = 0
CATEGORIES= audio converters perl5
HOMEPAGE= http://pacpl.sourceforge.net/
@ -28,18 +25,19 @@ PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pacpl/}
USE_GMAKE = Yes
USE_GROFF = Yes
NO_BUILD= Yes
NO_REGRESS= Yes
MULTI_PACKAGES= -main -konqueror -amarok
RUN_DEPENDS= audio/bonk \
audio/faac \
audio/faad \
audio/flac \
audio/lame \
audio/mpg321 \
audio/mppenc \
audio/sox \
audio/speex \
audio/vorbis-tools \
audio/p5-Audio-FLAC-Header \
audio/p5-Audio-Musepack \
@ -49,6 +47,7 @@ RUN_DEPENDS= audio/bonk \
audio/p5-MP3-Tag \
audio/p5-MP4-Info \
audio/p5-Ogg-Vorbis-Header \
audio/wavpack \
graphics/ffmpeg \
x11/mplayer
@ -59,6 +58,7 @@ RUN_DEPENDS-konqueror= ${BUILD_PKGPATH} \
RUN_DEPENDS-amarok= ${BUILD_PKGPATH} \
audio/amarok
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-konq \
--with-amarok

10
audio/pacpl/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pacpl-4.0.3.tar.gz) = i+jSPWn5msnMEXTRZjR6RA==
RMD160 (pacpl-4.0.3.tar.gz) = 97sxvOo4fyMPnM/XYJspqYLp+Mw=
SHA1 (pacpl-4.0.3.tar.gz) = 8EMUW6zThAvuwHfgfDItHEKvgEI=
SHA256 (pacpl-4.0.3.tar.gz) = qSVAECv5t9Kcr69fxf2/xAWOqaVTp8o75dN3R9yLBvQ=
SIZE (pacpl-4.0.3.tar.gz) = 108043
MD5 (pacpl-4.0.4.tar.gz) = dD0rW3GRnIfQ7yPXmlV2zg==
RMD160 (pacpl-4.0.4.tar.gz) = T6EzHSScolZa6XEhd7KMFpLUqxQ=
SHA1 (pacpl-4.0.4.tar.gz) = RrsZqpJXKEwThDucjBsk4EEBBaw=
SHA256 (pacpl-4.0.4.tar.gz) = rEL0FKwh7ImsGtPPWu5TQaZn9w4IeUFvYrwUf2YzPcQ=
SIZE (pacpl-4.0.4.tar.gz) = 114225

99
audio/pacpl/patches/patch-pacpl
View File

@ -1,26 +1,91 @@
$OpenBSD: patch-pacpl,v 1.2 2008/12/23 15:52:42 ajacoutot Exp $
--- pacpl.orig Sun Aug 17 05:31:57 2008
+++ pacpl Fri Nov 14 09:25:49 2008
@@ -131,8 +131,12 @@ my %config = (
$OpenBSD: patch-pacpl,v 1.3 2012/04/28 09:02:36 sthen Exp $
--- pacpl.orig Sat Feb 14 17:04:50 2009
+++ pacpl Sat Apr 28 09:59:59 2012
@@ -130,8 +130,8 @@ my %config = (
);
# location of configuration file
my $conf_path = "/etc/pacpl";
-my $conf_path = "/etc/pacpl";
-my $po_dir = "/usr/share/pacpl/locale";
+my $conf_path = "${SYSCONFDIR}/pacpl";
+my $po_dir = "${PREFIX}/share/pacpl/locale";
my $mod_dir = "$conf_path/modules";
+my $language = "en";
+if ($ENV{LANG}) {
+ $language = "$ENV{LANG}";
+}
my $conf_file;
@@ -908,7 +908,7 @@ my $opts;
@@ -203,7 +207,7 @@ sub load_codecs {
# load po file and store in %lang hash
sub load_lang {
aac => {
- my $po = "$po_dir/$ENV{LANG}.po";
+ my $po = "$po_dir/$language.po";
$po =~ s/\.UTF-8//i if $po =~ /UTF-8/i;
$po =~ s/\.utf8//i if $po =~ /utf8/i;
$po =~ s/_\w+// if not -e $po;
- DEFAULT_ENCODER => "faac",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
ENCODER => {
@@ -927,7 +927,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
$opts = '' if $defopts == 0;
- "$eopts -y -i %i $opts %o"
+ "$eopts -y -i %i $opts -strict experimental %o"
},
PROMPT => {
@@ -941,7 +941,7 @@ my $opts;
DECODER => {
faad => {
NAME => "faad",
- DSTR => sub { "$dopts -o %i %o" },
+ DSTR => sub { "$dopts -o %o %i" },
},
ffmpeg => {
@@ -964,7 +964,7 @@ my $opts;
mp4 => {
- DEFAULT_ENCODER => "faac",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
ENCODER => {
@@ -984,7 +984,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
$opts = '' if $defopts == 0;
- "$eopts -y -i %i $opts %o"
+ "$eopts -y -i %i $opts -strict experimental %o"
},
PROMPT => {
@@ -1022,7 +1022,7 @@ my $opts;
m4a => {
- DEFAULT_ENCODER => "faac",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
ENCODER => {
@@ -1042,7 +1042,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
$opts = '' if $defopts == 0;
- "$eopts -y -i %i $opts %o"
+ "$eopts -y -i %i $opts -strict experimental %o"
},
PROMPT => {
@@ -2050,11 +2050,11 @@ sub format_tags {
$tag_name{track} = 0 if not $tag_name{track};
$tag_name{year} = 0 if not $tag_name{year};
- return "-title \"$tag_name{title}\" -track \"$tag_name{track}\" -author \"$tag_name{artist}\" -album \"$tag_name{album}\" -comment \"$tag_name{comment}\" -year \"$tag_name{year}\" -genre \"$tag_name{genre}\"";
+ return "-metadata title=\"$tag_name{title}\" -metadata track=\"$tag_name{track}\" -metadata author=\"$tag_name{artist}\" -metadata album=\"$tag_name{album}\" -metadata comment=\"$tag_name{comment}\" -metadata year=\"$tag_name{year}\" -metadata genre=\"$tag_name{genre}\"";
} else {
- return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --ablum \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
+ return "--title \"$tag_name{title}\" --track \"$tag_name{track}\" --artist \"$tag_name{artist}\" --album \"$tag_name{album}\" --comment \"$tag_name{comment}\" --year \"$tag_name{year}\" --genre \"$tag_name{genre}\"";
}
}