summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/mp32ogg/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/mp32ogg/files')
-rw-r--r--media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch32
-rw-r--r--media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch98
-rw-r--r--media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch66
-rw-r--r--media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch16
4 files changed, 212 insertions, 0 deletions
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
new file mode 100644
index 000000000000..b617584f94de
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
@@ -0,0 +1,32 @@
+--- 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";
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
new file mode 100644
index 000000000000..38fad9bc9abc
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -0,0 +1,98 @@
+--- 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
+ }
+ }
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
new file mode 100644
index 000000000000..20361f1b9835
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -0,0 +1,66 @@
+--- mp32ogg_old 2008-01-29 10:45:06.000000000 +0100
++++ mp32ogg 2008-01-29 10:44:34.000000000 +0100
+@@ -6,6 +6,10 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+
+ # ChangeLog
++# 0.11-gentoo-r2
++# * Mathias Hablützel <mhk@mathiashabluetzel.ch>:
++# Support for german umlaut
++#
+ # 0.11-gentoo
+ # * Jeremy Huddleston <eradicator@gentoo.org>:
+ # Added support for mpg321
+@@ -82,13 +86,18 @@
+ # 0.1
+ # First Release
+
+-$version = "v0.11-gentoo";
++$version = "v0.11-gentoo-r2";
+
+ use MP3::Info;
+ use File::Find ();
+ use File::Basename;
+ use Getopt::Long;
+ use String::ShellQuote;
++use Encode;
++use POSIX qw/setlocale LC_CTYPE/;
++use I18N::Langinfo qw/langinfo CODESET/;
++
++setlocale(LC_CTYPE, '');
+
+ use_winamp_genres();
+
+@@ -111,6 +120,7 @@
+ "lowercase",
+ "no-replace",
+ "verbose",
++ "preserve-timestamp",
+ "<>", \&checkfile);
+
+ sub showhelp() {
+@@ -123,7 +133,7 @@
+ print " and %l with artist, title, and album name\n";
+ print " for the track\n";
+ print "--lowercase Force lowercase filenames when using --rename\n";
+- print "--verbose Verbose output\n";
++ print "--verbose Verbose output\n";
+ print "--help Display this help message\n";
+ exit;
+
+@@ -160,6 +170,15 @@
+
+ $info = get_mp3tag($mp3file);
+ $fileinfo = get_mp3info($mp3file);
++ # Sanity checking: Is this file really an MP3 file?
++ die "Could not determine MP3 version, aborting" if ($fileinfo->{VERSION}=="");
++
++ # get_mp3info returns magical Perl UTF-8 strings, but this script
++ # really wants to deal with plain old sequences-of-octets, so encode
++ # those strings.
++ for $key (keys %$info) {
++ $info->{$key} = encode(langinfo(CODESET), $info->{$key});
++ }
+
+ $_ = $filename;
+
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
new file mode 100644
index 000000000000..65f7a83454fa
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/328953
+http://qa.mandriva.com/53477
+
+--- mp32ogg
++++ mp32ogg
+@@ -167,7 +167,9 @@
+ }
+
+ sub ConvertFile() {
+- my $mp3file = shift(@_);
++ # force arg stringfication to get actual filename, not getopt::long
++ # callback
++ my $mp3file = "" . shift(@_);
+ my $delete = $opt_delete;
+ my $filename = $opt_rename;
+ my $lowercase = $opt_lowercase;