# ChangeLog for media-sound/mp32ogg
-# Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.9 2004/09/15 16:11:42 eradicator Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/ChangeLog,v 1.10 2005/01/01 15:59:45 chainsaw Exp $
+
+*mp32ogg-0.11-r4 (01 Jan 2005)
+
+ 01 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+ +files/mp32ogg-0.11-r4-mpg321.patch, +files/mp32ogg-0.11-r4-quality.patch,
+ +mp32ogg-0.11-r4.ebuild:
+ Ported debian patches for --quality commandline option and non-zero exitcode
+ on failure. Closes bug #76267.
15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
mp32ogg-0.11-r3.ebuild:
-MD5 3cb696981544039f0834befcd513533f ChangeLog 1589
+MD5 535b4a092933b5e59dc9bb5e50461e8f mp32ogg-0.11-r3.ebuild 719
+MD5 f0d7111cf68cf0e796b3c4f3a9344885 mp32ogg-0.11-r4.ebuild 762
+MD5 25e5b93c423052675c387de167d1d96f ChangeLog 1885
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 105b363636b3e4785ba47daf3d7b65f0 mp32ogg-0.11-r3.ebuild 721
+MD5 8a1a0f2baeac67e5e561aa9112aacf02 files/mp32ogg-0.11-r4-mpg321.patch 781
MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r3 50
+MD5 4fcc8bfffdd7c8012b2eb9afeb2daa4a files/digest-mp32ogg-0.11-r4 50
+MD5 ddb7a92debd73a42b9ed9746856f1077 files/mp32ogg-0.11-r4-quality.patch 2749
MD5 8a1a0f2baeac67e5e561aa9112aacf02 files/mp32ogg-0.11-r3-mpg321.patch 781
--- /dev/null
+MD5 7da7d3b125d2d0a6c12bbb0e9cdb93ff mp32ogg 9216
--- /dev/null
+--- mp32ogg.orig 2004-02-03 01:09:20.000000000 -0800
++++ mp32ogg 2004-02-03 01:25:01.000000000 -0800
+@@ -6,6 +6,9 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+
+ # ChangeLog
++# 0.11-gentoo
++# * Jeremy Huddleston <eradicator@gentoo.org>:
++# Added support for mpg321
+ #
+ # 0.11
+ # * Have output reflect change in license (doh)
+@@ -79,7 +82,7 @@
+ # 0.1
+ # First Release
+
+-$version = "v0.11";
++$version = "v0.11-gentoo";
+
+ use MP3::Info;
+ use File::Find ();
+@@ -93,6 +96,10 @@
+ $ogginfo = "/usr/bin/ogginfo";
+ $mpg123 = "/usr/bin/mpg123";
+
++if(! -x $mpg123) {
++ $mpg123 = "/usr/bin/mpg321";
++}
++
+ print "mp32ogg $version\n";
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
--- /dev/null
+--- mp32ogg.orig 2005-01-01 15:32:32.138906448 +0000
++++ mp32ogg 2005-01-01 15:52:33.061338488 +0000
+@@ -9,6 +9,8 @@
+ # 0.11-gentoo
+ # * Jeremy Huddleston <eradicator@gentoo.org>:
+ # Added support for mpg321
++# * --quality option support (from Debian 0.11-r3 release)
++# * Non-zero exit code on failure (from Debian 0.11-r3 release)
+ #
+ # 0.11
+ # * Have output reflect change in license (doh)
+@@ -104,8 +106,10 @@
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
+
++my $userquality=-2.0;
+
+ GetOptions("help|?",\&showhelp,
++ "quality=f" => \$userquality,
+ "delete",
+ "rename=s",
+ "lowercase",
+@@ -116,6 +120,8 @@
+ sub showhelp() {
+ print "Usage: $0 [options] dir1 dir2 file1 file2 ...\n\n";
+ print "Options:\n";
++ print "--quality=[-1..10] Set Ogg/Vorbis quality level\n";
++ print " Defaults to bitrate of original .mp3\n";
+ print "--delete Delete files after converting\n";
+ print "--rename=format Instead of simply replacing the .mp3 with\n";
+ print " .ogg for the output file, produce output \n";
+@@ -174,20 +180,26 @@
+ }
+
+ $mp3bitrate = $fileinfo->{BITRATE};
+- if($mp3bitrate ne "") {
+- if($mp3bitrate > 256) {
+- $quality = 8;
+- } elsif($mp3bitrate > 192) {
+- $quality = 7;
+- } elsif($mp3bitrate > 128) {
+- $quality = 6;
+- } else {
+- $quality = 5;
+- }
++ if (($userquality < -1) || ($userquality > 10)) {
++ # Set quality adjacent to mp3 bitrate
++ if($mp3bitrate ne "") {
++ if($mp3bitrate > 256) {
++ $quality = 8;
++ } elsif($mp3bitrate > 192) {
++ $quality = 7;
++ } elsif($mp3bitrate > 128) {
++ $quality = 6;
++ } else {
++ $quality = 5;
++ }
++ }
+ } else {
+ $quality = 5;
+ print "MP3::Info didn't report the bitrate... weird. Corrupt MP3 file? Bug?\n";
++ # User defined quality
++ $quality = $userquality;
+ }
++
+ if($filename eq "" ||
+ ((/\%a/) && $info->{ARTIST} eq "") ||
+ ((/\%t/) && $info->{TITLE} eq "") ||
+@@ -276,19 +288,19 @@
+ {
+ warn "Conversion failed ($oggoutputfile truncated).\n";
+ close CHECK;
+- return;
++ exit 1;
+ }
+ elsif($_ eq "header_integrity=fail\n")
+ {
+ warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ close CHECK;
+- return;
++ exit 1;
+ }
+ elsif($_ eq "stream_integrity=fail\n")
+ {
+ warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ close CHECK;
+- return;
++ exit 1;
+ }
+ }
+ close CHECK;
+@@ -300,5 +312,6 @@
+ }
+ else {
+ warn "Conversion failed ($oggenc returned $result).\n";
++ exit 1
+ }
+ }
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.6 2004/09/15 16:11:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r3.ebuild,v 1.7 2005/01/01 15:59:45 chainsaw Exp $
inherit eutils
IUSE=""
--- /dev/null
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp32ogg/mp32ogg-0.11-r4.ebuild,v 1.1 2005/01/01 15:59:45 chainsaw Exp $
+
+inherit eutils
+IUSE=""
+
+DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files."
+
+HOMEPAGE="http://faceprint.com/code/"
+SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
+
+LICENSE="Artistic"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64"
+
+DEPEND=""
+RDEPEND="virtual/mpg123
+ dev-perl/MP3-Info
+ dev-perl/String-ShellQuote
+ media-sound/vorbis-tools"
+
+S=${WORKDIR}/
+
+src_unpack(){
+ cp ${DISTDIR}/${A} ${S}
+ epatch ${FILESDIR}/${PF}-mpg321.patch
+ epatch ${FILESDIR}/${PF}-quality.patch
+}
+
+src_install() {
+ dobin mp32ogg
+}
projects / gentoo.git / commitdiff