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

fixes from Brad;

Browse Source 
- Missing dependencies.
- Using wrong commandline options for modern FFmpeg.
- ImageMagick check broken since it wasn't checking the
  correct return code.
This commit is contained in:
sthen 2011-06-01 00:04:16 +00:00
parent b54c819e8e
commit 89bd457672
4 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/p5-gnupod/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2010/11/15 00:22:48 espie Exp $
# $OpenBSD: Makefile,v 1.11 2011/06/01 00:04:16 sthen Exp $
COMMENT = collection of perl scripts to manage your iPod
DISTNAME = gnupod-0.99.8
PKGNAME = p5-${DISTNAME}
REVISION = 1
REVISION = 2
CATEGORIES = audio
HOMEPAGE = http://www.gnu.org/software/gnupod/
@ -33,7 +33,11 @@ RUN_DEPENDS = security/p5-Digest-SHA1 \
audio/p5-Ogg-Vorbis-Header-PurePerl \
graphics/ffmpeg \
graphics/ImageMagick \
net/curl
net/curl \
audio/faac \
audio/flac \
audio/lame \
audio/vorbis-tools
BUILD_DEPENDS= ${RUN_DEPENDS}
NO_REGRESS = Yes

21
audio/p5-gnupod/patches/patch-configure Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2011/06/01 00:04:16 sthen Exp $
--- configure.orig Tue Aug 4 01:49:56 2009
+++ configure Mon May 30 13:44:37 2011
@@ -1872,7 +1872,7 @@ echo " done"
echo $ECHO_N "checking for ffmpeg with AAC support... "
-ffmpeg -formats 2>&1|egrep " aac" > /dev/null
+ffmpeg -codecs 2>&1|egrep " aac" > /dev/null
if test $? = 0; then
echo "found!"
ENCS="mpeg4 $ENCS"
@@ -1884,7 +1884,7 @@ ffmpeg -formats 2>&1|egrep " aac" > /dev/null
echo $ECHO_N "checking for ImageMagick..."
convert --version > /dev/null 2>&1
- if test $? = 0; then
+ if test $? = 1; then
echo "found!"
IMAGIC="Yes"
else

12
audio/p5-gnupod/patches/patch-src_gnupod_convert_FLAC_pl Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gnupod_convert_FLAC_pl,v 1.1 2011/06/01 00:04:16 sthen Exp $
--- src/gnupod_convert_FLAC.pl.orig Mon May 30 12:05:46 2011
+++ src/gnupod_convert_FLAC.pl Mon May 30 12:06:44 2011
@@ -122,7 +122,7 @@ else {
# Check if ffmpeg knows how to encode 'alac'
sub check_ffmpeg_alac {
my @alac_support = grep(/\s+DEA\s+alac/,split(/\n/,
- `ffmpeg -formats 2> /dev/null`));
+ `ffmpeg -codecs 2> /dev/null`));
return (defined(@alac_support));
}

21
audio/p5-gnupod/patches/patch-src_gnupod_convert_RIFF_pl Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_gnupod_convert_RIFF_pl,v 1.1 2011/06/01 00:04:16 sthen Exp $
--- src/gnupod_convert_RIFF.pl.orig Mon May 30 11:56:59 2011
+++ src/gnupod_convert_RIFF.pl Mon May 30 12:07:42 2011
@@ -45,7 +45,7 @@ elsif($gimme eq "GET_VIDEO") {
my $x = system("ffmpeg", "-i", $file, "-acodec", $acodec, "-ab", "128k", "-vcodec", "mpeg4",
"-b", "1200kb", "-mbd", 2, "-flags", "+4mv+trell", "-aic", 2, "-cmp", 2,
- "-subcmp", 2, "-s", "320x240", "-r", "29.97", $tmpout);
+ "-subcmp", 2, "-s", "320x240", "-r", "29.97", "-strict", "experimental", $tmpout);
print "PATH:$tmpout\n";
}
else {
@@ -58,7 +58,7 @@ else {
# still shall call it with AAC
sub check_ffmpeg_aac {
my @newstyle = grep(/\s+EA\s+libfaac/,split(/\n/,
- `ffmpeg -formats 2> /dev/null`));
+ `ffmpeg -codecs 2> /dev/null`));
return (defined(@newstyle) ? 'libfaac' : 'aac');
}