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

- Remove the dependency on mpg321. pacpl does not even have

Browse Source 
support to use mpg321 in any way.
  - Switch AAC/FLAC decoding and FLAC encoding to using FFmpeg
    and eliminates the run-time dependencies on the faad/flac ports.
    - Switch WavPack decoding to FFmpeg.

    reset maintainer per andreas' request
    from brad
This commit is contained in:
jasper 2012-06-13 11:43:12 +00:00
parent 05ae52ae22
commit c887103d0a
3 changed files with 94 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/pacpl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2012/05/25 13:46:08 shadchin Exp $
# $OpenBSD: Makefile,v 1.13 2012/06/13 11:43:12 jasper Exp $
PKG_ARCH= *
@ -13,12 +13,10 @@ PKGNAME-konqueror= pacpl-konqueror-${V}
PKGNAME-amarok= pacpl-amarok-${V}
CATEGORIES= audio converters perl5
REVISION-main= 0
REVISION-main= 1
HOMEPAGE= http://pacpl.sourceforge.net/
MAINTAINER= Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
# GPLv3
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
@ -33,10 +31,7 @@ NO_REGRESS= Yes
MULTI_PACKAGES= -main -konqueror -amarok
RUN_DEPENDS= audio/bonk \
audio/faad \
audio/flac \
audio/lame \
audio/mpg321 \
audio/musepack \
audio/sox \
audio/speex \

36
audio/pacpl/patches/patch-codecs_conf Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-codecs_conf,v 1.1 2012/06/13 11:43:12 jasper Exp $
--- codecs.conf.orig Fri May 25 05:45:56 2012
+++ codecs.conf Fri May 25 05:48:04 2012
@@ -5,12 +5,12 @@
# encoders: faac, ffmpeg
# decoders: faad, ffmpeg, mplayer
#
-AAC = faac,faad
+AAC = ffmpeg,ffmpeg
# encoders: flac, ffmpeg
# decoders: flac, ffmpeg, mplayer
#
-FLAC = flac,flac
+FLAC = ffmpeg,ffmpeg
# encoders: flac
# decoders: flac, mplayer
@@ -21,8 +21,8 @@ FLA = flac,flac
# encoders: faac, ffmpeg
# decoders: faad, ffmpeg, mplayer
#
-M4A = faac,faad
-MP4 = faac,faad
+M4A = ffmpeg,ffmpeg
+MP4 = ffmpeg,ffmpeg
# encoders: lame, bladeenc, gogo, toolame, ffmpeg, sox
# decoders: lame, ffmpeg, mplayer, sox
@@ -42,5 +42,5 @@ TTA = ttaenc,ttaenc
# encoders: wavpack
# decoders: wvunpack, ffmpeg, mplayer
#
-WV = wavpack,wvunpack
+WV = wavpack,ffmpeg

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

@ -1,6 +1,6 @@
$OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
--- pacpl.orig Sat Feb 14 22:04:50 2009
+++ pacpl Fri May 25 09:46:10 2012
$OpenBSD: patch-pacpl,v 1.5 2012/06/13 11:43:12 jasper Exp $
--- pacpl.orig Sat Feb 14 12:04:50 2009
+++ pacpl Fri May 25 05:43:14 2012
@@ -130,8 +130,8 @@ my %config = (
);
@ -12,15 +12,28 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
my $mod_dir = "$conf_path/modules";
my $conf_file;
@@ -908,7 +908,7 @@ my $opts;
@@ -708,8 +708,8 @@ my $opts;
flac => {
- DEFAULT_ENCODER => "flac",
- DEFAULT_DECODER => "flac",
+ DEFAULT_ENCODER => "ffmpeg",
+ DEFAULT_DECODER => "ffmpeg",
ENCODER => {
flac => {
@@ -908,8 +908,8 @@ my $opts;
aac => {
- DEFAULT_ENCODER => "faac",
- DEFAULT_DECODER => "faad",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
+ DEFAULT_DECODER => "ffmpeg",
ENCODER => {
faac => {
@@ -927,7 +927,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
@ -39,15 +52,17 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
},
ffmpeg => {
@@ -964,7 +964,7 @@ my $opts;
@@ -964,8 +964,8 @@ my $opts;
mp4 => {
- DEFAULT_ENCODER => "faac",
- DEFAULT_DECODER => "faad",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
+ DEFAULT_DECODER => "ffmpeg",
ENCODER => {
@@ -984,7 +984,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
@ -57,15 +72,17 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
},
PROMPT => {
@@ -1022,7 +1022,7 @@ my $opts;
@@ -1022,8 +1022,8 @@ my $opts;
m4a => {
- DEFAULT_ENCODER => "faac",
- DEFAULT_DECODER => "faad",
+ DEFAULT_ENCODER => "ffmpeg",
DEFAULT_DECODER => "faad",
+ DEFAULT_DECODER => "ffmpeg",
ENCODER => {
@@ -1042,7 +1042,7 @@ my $opts;
ESTR => sub {
$opts = "-ab $bitrate.k -ar $freq -ac $channels" if $defopts == 1;
@ -75,6 +92,15 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
},
PROMPT => {
@@ -1084,7 +1084,7 @@ my $opts;
m4b => {
DEFAULT_ENCODER => "faac",
- DEFAULT_DECODER => "faad",
+ DEFAULT_DECODER => "mplayer",
ENCODER => {
@@ -1124,13 +1124,13 @@ my $opts;
mpc => {
@ -133,6 +159,15 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
DSTR => sub { "$dopts %i %o" },
},
@@ -1401,7 +1401,7 @@ my $opts;
wv => {
DEFAULT_ENCODER => "wavpack",
- DEFAULT_DECODER => "wvunpack",
+ DEFAULT_DECODER => "ffmpeg",
ENCODER => {
wavpack => {
@@ -2050,11 +2050,11 @@ sub format_tags {
$tag_name{track} = 0 if not $tag_name{track};
@ -147,3 +182,15 @@ $OpenBSD: patch-pacpl,v 1.4 2012/05/25 13:46:08 shadchin Exp $
}
}
@@ -3217,9 +3217,9 @@ show cddb information for current disc.
=item B<sox>(1) B<ffmpeg>(1) B<lame>(1) B<oggenc>(1) B<oggdec>(1)
-=item B<flac>(1) B<shorten>(1) B<faac>(1) B<faad>(1) B<mppenc>(1)
+=item B<flac>(1) B<shorten>(1) B<faac>(1) B<faad>(1) B<mpcenc>(1)
-=item B<mppdec>(1) B<mplayer>(1) B<speexenc>(1) B<speexdec>(1)
+=item B<mpcdec>(1) B<mplayer>(1) B<speexenc>(1) B<speexdec>(1)
=item B<sndfile-convert>(1) B<normalize>(1) B<cdparanoia>(1)