[20910] trunk/dports/audio/vorbis-tools
source_changes at macosforge.org
source_changes at macosforge.org
Sat Dec 9 16:09:13 PST 2006
Revision: 20910
http://trac.macosforge.org/projects/macports/changeset/20910
Author: vinc17 at macports.org
Date: 2006-12-09 16:08:49 -0800 (Sat, 09 Dec 2006)
Log Message:
-----------
Added patches to vorbis-tools (bug #10821 has been opened for more than
2 months and the maintainer didn't react; moreover, since the upgrade of
curl, vorbis-tools couldn't be built any longer; hence the commit).
Modified Paths:
--------------
trunk/dports/audio/vorbis-tools/Portfile
Added Paths:
-----------
trunk/dports/audio/vorbis-tools/files/
trunk/dports/audio/vorbis-tools/files/debian-patches
trunk/dports/audio/vorbis-tools/files/patch-http_transport.c
Modified: trunk/dports/audio/vorbis-tools/Portfile
===================================================================
--- trunk/dports/audio/vorbis-tools/Portfile 2006-12-09 20:34:24 UTC (rev 20909)
+++ trunk/dports/audio/vorbis-tools/Portfile 2006-12-10 00:08:49 UTC (rev 20910)
@@ -3,6 +3,7 @@
PortSystem 1.0
name vorbis-tools
version 1.1.1
+revision 2
categories audio
maintainers toby at opendarwin.org
description The Ogg Vorbis CODEC tools
@@ -28,6 +29,12 @@
--without-flac \
--without-speex
+# Patches from the Debian vorbis-tools package (version 1.1.1-6) and
+# a patch to be able to compile vorbis-tools against the latest curl
+# version in MacPorts (7.16.0) [upstream bug #1097].
+patchfiles debian-patches patch-http_transport.c
+patch.pre_args -p1
+
variant player {
depends_lib-append lib:libao.2:libao
configure.args-delete --without-ao --disable-ogg123
@@ -46,7 +53,7 @@
configure.args-append --with-speex
}
-post-destroot {
+post-destroot {
file delete -force ${destroot}${prefix}/share/locale/locale.alias
file delete -force ${destroot}${prefix}/lib/charset.alias
}
Added: trunk/dports/audio/vorbis-tools/files/debian-patches
===================================================================
--- trunk/dports/audio/vorbis-tools/files/debian-patches (rev 0)
+++ trunk/dports/audio/vorbis-tools/files/debian-patches 2006-12-10 00:08:49 UTC (rev 20910)
@@ -0,0 +1,426 @@
+diff -Naurd vorbis-tools-1.1.1.old/ogg123/file_transport.c vorbis-tools-1.1.1/ogg123/file_transport.c
+--- vorbis-tools-1.1.1.old/ogg123/file_transport.c 2005-06-03 10:15:09.000000000 +0000
++++ vorbis-tools-1.1.1/ogg123/file_transport.c 2006-10-02 23:23:26.000000000 +0000
+@@ -26,6 +26,7 @@
+ typedef struct file_private_t {
+ FILE *fp;
+ data_source_stats_t stats;
++ int seekable;
+ } file_private_t;
+
+
+@@ -51,6 +52,7 @@
+ source->transport = &file_transport;
+ source->private = private;
+
++ private->seekable = 1;
+ private->stats.transfer_rate = 0;
+ private->stats.bytes_read = 0;
+ private->stats.input_buffer_used = 0;
+@@ -60,9 +62,10 @@
+ }
+
+ /* Open file */
+- if (strcmp(source_string, "-") == 0)
++ if (strcmp(source_string, "-") == 0) {
+ private->fp = stdin;
+- else
++ private->seekable = 0;
++ } else
+ private->fp = fopen(source_string, "r");
+
+ if (private->fp == NULL) {
+@@ -84,6 +87,8 @@
+ int items;
+ long start;
+
++ if (!private->seekable) return 0;
++
+ /* Record where we are */
+ start = ftell(fp);
+
+@@ -118,6 +123,8 @@
+ file_private_t *private = source->private;
+ FILE *fp = private->fp;
+
++ if (!private->seekable) return -1;
++
+ return fseek(fp, offset, whence);
+ }
+
+@@ -135,6 +142,8 @@
+ file_private_t *private = source->private;
+ FILE *fp = private->fp;
+
++ if (!private->seekable) return -1;
++
+ return ftell(fp);
+ }
+
+diff -Naurd vorbis-tools-1.1.1.old/ogg123/ogg123.1 vorbis-tools-1.1.1/ogg123/ogg123.1
+--- vorbis-tools-1.1.1.old/ogg123/ogg123.1 2005-06-03 10:15:09.000000000 +0000
++++ vorbis-tools-1.1.1/ogg123/ogg123.1 2006-10-02 23:28:05.000000000 +0000
+@@ -144,7 +144,7 @@
+ .RE
+ .RE
+
+-.IP alsa
++.IP alsa09
+ Advanced Linux Sound Architecture.
+ .RS
+ Options:
+@@ -254,7 +254,7 @@
+ .RE
+ .PP
+
+-Stress test your harddrive:
++Stress test your hard drive:
+ .RS
+ .B ogg123 -d oss -d wav -f 1.wav -d wav -f 2.wav -d wav -f 3.wav -d wav -f 4.wav -d wav -f 5.wav test.ogg
+ .RE
+diff -Naurd vorbis-tools-1.1.1.old/ogg123/ogg123.c vorbis-tools-1.1.1/ogg123/ogg123.c
+--- vorbis-tools-1.1.1.old/ogg123/ogg123.c 2005-06-03 10:15:09.000000000 +0000
++++ vorbis-tools-1.1.1/ogg123/ogg123.c 2006-03-27 02:11:27.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include "ogg123.h"
+ #include "i18n.h"
+
++extern int exit_status; /* from status.c */
+
+ void exit_cleanup ();
+ void play (char *source_string);
+@@ -396,10 +397,9 @@
+
+ playlist_array_destroy(playlist_array, items);
+
+- exit (0);
++ exit (exit_status);
+ }
+
+-
+ void play (char *source_string)
+ {
+ transport_t *transport;
+@@ -615,7 +615,7 @@
+ status_message(1, _("Done."));
+
+ if (sig_request.exit)
+- exit (0);
++ exit (exit_status);
+ }
+
+
+diff -Naurd vorbis-tools-1.1.1.old/ogg123/status.c vorbis-tools-1.1.1/ogg123/status.c
+--- vorbis-tools-1.1.1.old/ogg123/status.c 2005-06-03 10:15:09.000000000 +0000
++++ vorbis-tools-1.1.1/ogg123/status.c 2006-03-27 02:11:27.000000000 +0000
+@@ -25,6 +25,7 @@
+ char temp_buffer[200];
+ int last_line_len = 0;
+ int max_verbosity = 0;
++int exit_status = EXIT_SUCCESS;
+
+ pthread_mutex_t output_lock = PTHREAD_MUTEX_INITIALIZER;
+
+@@ -449,6 +450,8 @@
+ pthread_mutex_unlock(&output_lock);
+
+ pthread_cleanup_pop(0);
++
++ exit_status = EXIT_FAILURE;
+ }
+
+
+@@ -462,4 +465,6 @@
+ pthread_mutex_unlock(&output_lock);
+
+ pthread_cleanup_pop(0);
++
++ exit_status = EXIT_FAILURE;
+ }
+diff -Naurd vorbis-tools-1.1.1.old/oggenc/man/oggenc.1 vorbis-tools-1.1.1/oggenc/man/oggenc.1
+--- vorbis-tools-1.1.1.old/oggenc/man/oggenc.1 2005-06-03 10:15:10.000000000 +0000
++++ vorbis-tools-1.1.1/oggenc/man/oggenc.1 2006-10-02 23:28:05.000000000 +0000
+@@ -247,7 +247,7 @@
+ set closer to 0, the bitrate manager attempts to hoard bits for future
+ use in sudden bitrate increases (biasing toward better transient
+ reproduction). When set closer to 1, the bitrate manager neglects
+-transients in favor using bits for homogenous passages. In the
++transients in favor using bits for homogeneous passages. In the
+ middle, the manager uses a balanced approach. The default setting is \.2,
+ thus biasing slightly toward transient reproduction.
+
+@@ -293,25 +293,25 @@
+
+ Specifying a high-quality encoding averaging 256 kbps (but still VBR).
+ .RS
+-oggenc infile.wav -b 256 out.ogg
++oggenc infile.wav -b 256 -o out.ogg
+ .RE
+ .PP
+
+ Specifying a maximum and average bitrate, and enforcing these.
+ .RS
+-oggenc infile.wav --managed -b 128 -M 160 out.ogg
++oggenc infile.wav --managed -b 128 -M 160 -o out.ogg
+ .RE
+ .PP
+
+ Specifying quality rather than bitrate (to a very high quality mode)
+ .RS
+-oggenc infile.wav -q 6 out.ogg
++oggenc infile.wav -q 6 -o out.ogg
+ .RE
+ .PP
+
+ Downsampling and downmixing to 11 kHz mono before encoding.
+ .RS
+-oggenc --resample 11025 --downmix infile.wav -q 1 out.ogg
++oggenc --resample 11025 --downmix infile.wav -q 1 -o out.ogg
+ .RE
+ .PP
+
+@@ -319,7 +319,7 @@
+ .RS
+ oggenc somefile.wav -t "The track title" -a "artist who performed this" -l
+ "name of album" -c
+-"OTHERFIELD=contents of some other field not explictly supported"
++"OTHERFIELD=contents of some other field not explicitly supported"
+ .RE
+ .PP
+
+diff -Naurd vorbis-tools-1.1.1.old/oggenc/oggenc.c vorbis-tools-1.1.1/oggenc/oggenc.c
+--- vorbis-tools-1.1.1.old/oggenc/oggenc.c 2005-06-03 10:15:10.000000000 +0000
++++ vorbis-tools-1.1.1/oggenc/oggenc.c 2006-10-02 23:27:34.000000000 +0000
+@@ -379,7 +379,7 @@
+ {
+ fprintf(stdout,
+ _("%s%s\n"
+- "Usage: oggenc [options] input.wav [...]\n"
++ "Usage: oggenc [options] inputfile [...]\n"
+ "\n"
+ "OPTIONS:\n"
+ " General:\n"
+diff -Naurd vorbis-tools-1.1.1.old/po/fr.po vorbis-tools-1.1.1/po/fr.po
+--- vorbis-tools-1.1.1.old/po/fr.po 2005-06-27 09:34:57.000000000 +0000
++++ vorbis-tools-1.1.1/po/fr.po 2006-10-02 23:28:24.000000000 +0000
+@@ -771,7 +771,7 @@
+ #: oggenc/encode.c:391
+ #, fuzzy, c-format
+ msgid "\tEncoding [%2dm%.2ds so far] %c "
+-msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
++msgstr "\tCodage [%2dm%.2ds pour l'instant] %c"
+
+ #: oggenc/encode.c:409
+ #, c-format
+@@ -830,7 +830,7 @@
+ " %s%s%s \n"
+ "at average bitrate %d kbps "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
More information about the macports-changes
mailing list