[34010] trunk/dports/audio/vorbis-tools
ram at macports.org
ram at macports.org
Sun Feb 10 09:44:01 PST 2008
Revision: 34010
http://trac.macosforge.org/projects/macports/changeset/34010
Author: ram at macports.org
Date: 2008-02-10 09:44:01 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
audio/vorbis-tools: fix lint warnings
Modified Paths:
--------------
trunk/dports/audio/vorbis-tools/Portfile
Added Paths:
-----------
trunk/dports/audio/vorbis-tools/files/patch-debian.diff
trunk/dports/audio/vorbis-tools/files/patch-http_transport.c.diff
Removed Paths:
-------------
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 2008-02-10 17:37:28 UTC (rev 34009)
+++ trunk/dports/audio/vorbis-tools/Portfile 2008-02-10 17:44:01 UTC (rev 34010)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+
name vorbis-tools
version 1.1.1
revision 2
@@ -31,22 +32,22 @@
# 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
+patchfiles patch-debian.diff patch-http_transport.c.diff
patch.pre_args -p1
-variant player {
+variant player description "Build ogg123" {
depends_lib-append lib:libao.2:libao
configure.args-delete --without-ao --disable-ogg123
configure.args-append --with-ao --enable-ogg123
}
-variant flac {
+variant flac description "Enable FLAC support" {
depends_lib-append lib:libFLAC.7:flac
configure.args-delete --without-flac
configure.args-append --with-flac
}
-variant speex {
+variant speex description "Enable Speex support" {
depends_lib-append lib:libspeex.1:speex
configure.args-delete --without-speex
configure.args-append --with-speex
Deleted: trunk/dports/audio/vorbis-tools/files/debian-patches
===================================================================
--- trunk/dports/audio/vorbis-tools/files/debian-patches 2008-02-10 17:37:28 UTC (rev 34009)
+++ trunk/dports/audio/vorbis-tools/files/debian-patches 2008-02-10 17:44:01 UTC (rev 34010)
@@ -1,426 +0,0 @@
-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"
- "au d\xE9bit moyen de %d kbps "
-
-@@ -851,7 +851,7 @@
- " %s%s%s \n"
- "at approximate bitrate %d kbps (VBR encoding enabled)\n"
- msgstr ""
--"Encodage de %s%s%s \n"
-+"Codage de %s%s%s \n"
- " en %s%s%s \n"
- "au d\xE9bit approximatif de %d kbps (encodage VBR en cours)\n"
-
-@@ -862,7 +862,7 @@
- " %s%s%s \n"
- "at quality level %2.2f using constrained VBR "
- msgstr ""
--"Encodage de %s%s%s \n"
-+"Codage de %s%s%s \n"
- " en %s%s%s \n"
- "au niveau de qualit\xE9 %2.2f en utilisant un VBR contraint "
-
-@@ -873,7 +873,7 @@
- " %s%s%s \n"
- "at quality %2.2f\n"
- msgstr ""
--"Encodage de %s%s%s \n"
-+"Codage de %s%s%s \n"
- " en %s%s%s \n"
- "\xE0 la qualit\xE9 %2.2f\n"
-
-@@ -884,7 +884,7 @@
- " %s%s%s \n"
- "using bitrate management "
- msgstr ""
--"Encodage de %s%s%s \n"
-+"Codage de %s%s%s \n"
- " en %s%s%s \n"
- "en utilisant la gestion du d\xE9bit "
-
-diff -Naurd vorbis-tools-1.1.1.old/share/charset.c vorbis-tools-1.1.1/share/charset.c
---- vorbis-tools-1.1.1.old/share/charset.c 2005-06-03 10:15:10.000000000 +0000
-+++ vorbis-tools-1.1.1/share/charset.c 2006-10-02 23:24:04.000000000 +0000
-@@ -27,6 +27,10 @@
- * 8-bit char, 16-bit short and 32-bit int.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
-
- #include <stdlib.h>
-diff -Naurd vorbis-tools-1.1.1.old/share/iconvert.c vorbis-tools-1.1.1/share/iconvert.c
---- vorbis-tools-1.1.1.old/share/iconvert.c 2005-06-03 10:15:10.000000000 +0000
-+++ vorbis-tools-1.1.1/share/iconvert.c 2006-10-02 23:24:04.000000000 +0000
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef HAVE_ICONV
-
- #include <assert.h>
-diff -Naurd vorbis-tools-1.1.1.old/share/utf8.c vorbis-tools-1.1.1/share/utf8.c
---- vorbis-tools-1.1.1.old/share/utf8.c 2005-06-03 10:15:10.000000000 +0000
-+++ vorbis-tools-1.1.1/share/utf8.c 2006-10-02 23:24:04.000000000 +0000
-@@ -21,6 +21,10 @@
- * Convert a string between UTF-8 and the locale's charset.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
-
-diff -Naurd vorbis-tools-1.1.1.old/vorbiscomment/vcomment.c vorbis-tools-1.1.1/vorbiscomment/vcomment.c
---- vorbis-tools-1.1.1.old/vorbiscomment/vcomment.c 2005-06-13 13:11:43.000000000 +0000
-+++ vorbis-tools-1.1.1/vorbiscomment/vcomment.c 2006-10-02 23:23:49.000000000 +0000
-@@ -63,7 +63,7 @@
- void free_param(param_t *param);
- void parse_options(int argc, char *argv[], param_t *param);
- void open_files(param_t *p);
--void close_files(param_t *p);
-+void close_files(param_t *p, int output_written);
-
-
- /**********
-@@ -107,7 +107,7 @@
- {
- fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
- vcedit_error(state));
-- close_files(param);
-+ close_files(param, 0);
- free_param(param);
- vcedit_clear(state);
- return 1;
-@@ -120,7 +120,7 @@
- /* done */
- vcedit_clear(state);
-
-- close_files(param);
-+ close_files(param, 0);
- free_param(param);
- return 0;
- }
-@@ -133,7 +133,7 @@
- {
- fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
- vcedit_error(state));
-- close_files(param);
-+ close_files(param, 0);
- free_param(param);
- vcedit_clear(state);
- return 1;
-@@ -174,7 +174,7 @@
- {
- fprintf(stderr, _("Failed to write comments to output file: %s\n"),
- vcedit_error(state));
-- close_files(param);
-+ close_files(param, 0);
- free_param(param);
- vcedit_clear(state);
- return 1;
-@@ -183,7 +183,7 @@
- /* done */
- vcedit_clear(state);
-
-- close_files(param);
-+ close_files(param, 1);
- free_param(param);
- return 0;
- }
-@@ -527,23 +527,31 @@
-
- ***********/
-
--void close_files(param_t *p)
-+void close_files(param_t *p, int output_written)
- {
-- if (p->in != NULL && p->in != stdin) fclose(p->in);
-- if (p->out != NULL && p->out != stdout) fclose(p->out);
-- if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
-+ if (p->in != NULL && p->in != stdin) fclose(p->in);
-+ if (p->out != NULL && p->out != stdout) fclose(p->out);
-+ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
-
-- if(p->tempoutfile) {
-- /* Some platforms fail to rename a file if the new name already exists,
-- * so we need to remove, then rename. How stupid.
-- */
-- if(rename(p->outfilename, p->infilename)) {
-- if(remove(p->infilename))
-- fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
-- else if(rename(p->outfilename, p->infilename))
-- fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
-- p->infilename);
-- }
-+ if(p->tempoutfile) {
-+ if(output_written) {
-+ /* Some platforms fail to rename a file if the new name already
-+ * exists, so we need to remove, then rename. How stupid.
-+ */
-+ if(rename(p->outfilename, p->infilename)) {
-+ if(remove(p->infilename))
-+ fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
-+ else if(rename(p->outfilename, p->infilename))
-+ fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
-+ p->infilename);
-+ }
-+ }
-+ else {
-+ if(remove(p->outfilename)) {
-+ fprintf(stderr, _("Error removing erroneous temporary file %s\n"),
-+ p->outfilename);
-+ }
- }
-+ }
- }
-
-diff -Naurd vorbis-tools-1.1.1.old/vorbiscomment/vorbiscomment.1 vorbis-tools-1.1.1/vorbiscomment/vorbiscomment.1
---- vorbis-tools-1.1.1.old/vorbiscomment/vorbiscomment.1 2005-06-03 10:15:08.000000000 +0000
-+++ vorbis-tools-1.1.1/vorbiscomment/vorbiscomment.1 2006-10-02 23:28:05.000000000 +0000
-@@ -44,6 +44,8 @@
- Specify a new tag on the command line. Each tag is given as a single string. The part before the '=' is treated as the tag name and the part after as the value.
- .IP "-w"
- Replace comments with the new set given either on the command line with -t or from a file with -c.
-+.IP "-R"
-+Read and write comments in utf8, rather than converting to the user's character set.
-
- .\" Examples go here
- .SH EXAMPLES
-@@ -55,7 +57,7 @@
- To edit those comments:
-
- vorbiscomment -l file.ogg > file.txt
-- [edit the comments in file.txt to your statisfaction]
-+ [edit the comments in file.txt to your satisfaction]
- vorbiscomment -w -c file.txt file.ogg newfile.ogg
-
- To simply add a comment:
Copied: trunk/dports/audio/vorbis-tools/files/patch-debian.diff (from rev 34009, trunk/dports/audio/vorbis-tools/files/debian-patches)
===================================================================
--- trunk/dports/audio/vorbis-tools/files/patch-debian.diff (rev 0)
+++ trunk/dports/audio/vorbis-tools/files/patch-debian.diff 2008-02-10 17:44:01 UTC (rev 34010)
@@ -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"
+ "au d\xE9bit moyen de %d kbps "
+
+@@ -851,7 +851,7 @@
+ " %s%s%s \n"
+ "at approximate bitrate %d kbps (VBR encoding enabled)\n"
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "au d\xE9bit approximatif de %d kbps (encodage VBR en cours)\n"
+
+@@ -862,7 +862,7 @@
+ " %s%s%s \n"
+ "at quality level %2.2f using constrained VBR "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "au niveau de qualit\xE9 %2.2f en utilisant un VBR contraint "
+
+@@ -873,7 +873,7 @@
+ " %s%s%s \n"
+ "at quality %2.2f\n"
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "\xE0 la qualit\xE9 %2.2f\n"
+
+@@ -884,7 +884,7 @@
+ " %s%s%s \n"
+ "using bitrate management "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "en utilisant la gestion du d\xE9bit "
+
+diff -Naurd vorbis-tools-1.1.1.old/share/charset.c vorbis-tools-1.1.1/share/charset.c
+--- vorbis-tools-1.1.1.old/share/charset.c 2005-06-03 10:15:10.000000000 +0000
++++ vorbis-tools-1.1.1/share/charset.c 2006-10-02 23:24:04.000000000 +0000
+@@ -27,6 +27,10 @@
+ * 8-bit char, 16-bit short and 32-bit int.
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
+
+ #include <stdlib.h>
+diff -Naurd vorbis-tools-1.1.1.old/share/iconvert.c vorbis-tools-1.1.1/share/iconvert.c
+--- vorbis-tools-1.1.1.old/share/iconvert.c 2005-06-03 10:15:10.000000000 +0000
++++ vorbis-tools-1.1.1/share/iconvert.c 2006-10-02 23:24:04.000000000 +0000
+@@ -16,6 +16,10 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef HAVE_ICONV
+
+ #include <assert.h>
+diff -Naurd vorbis-tools-1.1.1.old/share/utf8.c vorbis-tools-1.1.1/share/utf8.c
+--- vorbis-tools-1.1.1.old/share/utf8.c 2005-06-03 10:15:10.000000000 +0000
++++ vorbis-tools-1.1.1/share/utf8.c 2006-10-02 23:24:04.000000000 +0000
+@@ -21,6 +21,10 @@
+ * Convert a string between UTF-8 and the locale's charset.
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <stdlib.h>
+ #include <string.h>
+
+diff -Naurd vorbis-tools-1.1.1.old/vorbiscomment/vcomment.c vorbis-tools-1.1.1/vorbiscomment/vcomment.c
+--- vorbis-tools-1.1.1.old/vorbiscomment/vcomment.c 2005-06-13 13:11:43.000000000 +0000
++++ vorbis-tools-1.1.1/vorbiscomment/vcomment.c 2006-10-02 23:23:49.000000000 +0000
+@@ -63,7 +63,7 @@
+ void free_param(param_t *param);
+ void parse_options(int argc, char *argv[], param_t *param);
+ void open_files(param_t *p);
+-void close_files(param_t *p);
++void close_files(param_t *p, int output_written);
+
+
+ /**********
+@@ -107,7 +107,7 @@
+ {
+ fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -120,7 +120,7 @@
+ /* done */
+ vcedit_clear(state);
+
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ return 0;
+ }
+@@ -133,7 +133,7 @@
+ {
+ fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -174,7 +174,7 @@
+ {
+ fprintf(stderr, _("Failed to write comments to output file: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -183,7 +183,7 @@
+ /* done */
+ vcedit_clear(state);
+
+- close_files(param);
++ close_files(param, 1);
+ free_param(param);
+ return 0;
+ }
+@@ -527,23 +527,31 @@
+
+ ***********/
+
+-void close_files(param_t *p)
++void close_files(param_t *p, int output_written)
+ {
+- if (p->in != NULL && p->in != stdin) fclose(p->in);
+- if (p->out != NULL && p->out != stdout) fclose(p->out);
+- if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
++ if (p->in != NULL && p->in != stdin) fclose(p->in);
++ if (p->out != NULL && p->out != stdout) fclose(p->out);
++ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
+
+- if(p->tempoutfile) {
+- /* Some platforms fail to rename a file if the new name already exists,
+- * so we need to remove, then rename. How stupid.
+- */
+- if(rename(p->outfilename, p->infilename)) {
+- if(remove(p->infilename))
+- fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
+- else if(rename(p->outfilename, p->infilename))
+- fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
+- p->infilename);
+- }
++ if(p->tempoutfile) {
++ if(output_written) {
++ /* Some platforms fail to rename a file if the new name already
++ * exists, so we need to remove, then rename. How stupid.
++ */
++ if(rename(p->outfilename, p->infilename)) {
++ if(remove(p->infilename))
++ fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
++ else if(rename(p->outfilename, p->infilename))
++ fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
++ p->infilename);
++ }
++ }
++ else {
++ if(remove(p->outfilename)) {
++ fprintf(stderr, _("Error removing erroneous temporary file %s\n"),
++ p->outfilename);
++ }
+ }
++ }
+ }
+
+diff -Naurd vorbis-tools-1.1.1.old/vorbiscomment/vorbiscomment.1 vorbis-tools-1.1.1/vorbiscomment/vorbiscomment.1
+--- vorbis-tools-1.1.1.old/vorbiscomment/vorbiscomment.1 2005-06-03 10:15:08.000000000 +0000
++++ vorbis-tools-1.1.1/vorbiscomment/vorbiscomment.1 2006-10-02 23:28:05.000000000 +0000
+@@ -44,6 +44,8 @@
+ Specify a new tag on the command line. Each tag is given as a single string. The part before the '=' is treated as the tag name and the part after as the value.
+ .IP "-w"
+ Replace comments with the new set given either on the command line with -t or from a file with -c.
++.IP "-R"
++Read and write comments in utf8, rather than converting to the user's character set.
+
+ .\" Examples go here
+ .SH EXAMPLES
+@@ -55,7 +57,7 @@
+ To edit those comments:
+
+ vorbiscomment -l file.ogg > file.txt
+- [edit the comments in file.txt to your statisfaction]
++ [edit the comments in file.txt to your satisfaction]
+ vorbiscomment -w -c file.txt file.ogg newfile.ogg
+
+ To simply add a comment:
Deleted: trunk/dports/audio/vorbis-tools/files/patch-http_transport.c
===================================================================
--- trunk/dports/audio/vorbis-tools/files/patch-http_transport.c 2008-02-10 17:37:28 UTC (rev 34009)
+++ trunk/dports/audio/vorbis-tools/files/patch-http_transport.c 2008-02-10 17:44:01 UTC (rev 34010)
@@ -1,11 +0,0 @@
-diff -Naurd vorbis-tools-1.1.1.old/ogg123/http_transport.c vorbis-tools-1.1.1.new/ogg123/http_transport.c
---- vorbis-tools-1.1.1.old/ogg123/http_transport.c 2005-06-13 15:11:44.000000000 +0200
-+++ vorbis-tools-1.1.1.new/ogg123/http_transport.c 2006-12-10 00:50:48.000000000 +0100
-@@ -116,7 +116,6 @@
- if (inputOpts.ProxyTunnel)
- curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
- */
-- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
- curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
- curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
- curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
Copied: trunk/dports/audio/vorbis-tools/files/patch-http_transport.c.diff (from rev 34009, trunk/dports/audio/vorbis-tools/files/patch-http_transport.c)
===================================================================
--- trunk/dports/audio/vorbis-tools/files/patch-http_transport.c.diff (rev 0)
+++ trunk/dports/audio/vorbis-tools/files/patch-http_transport.c.diff 2008-02-10 17:44:01 UTC (rev 34010)
@@ -0,0 +1,11 @@
+diff -Naurd vorbis-tools-1.1.1.old/ogg123/http_transport.c vorbis-tools-1.1.1.new/ogg123/http_transport.c
+--- vorbis-tools-1.1.1.old/ogg123/http_transport.c 2005-06-13 15:11:44.000000000 +0200
++++ vorbis-tools-1.1.1.new/ogg123/http_transport.c 2006-12-10 00:50:48.000000000 +0100
+@@ -116,7 +116,6 @@
+ if (inputOpts.ProxyTunnel)
+ curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
+ */
+- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
+ curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
+ curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
+ curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080210/9399e1f0/attachment-0001.html
More information about the macports-changes
mailing list