vorbis_tools: bump version

This commit is contained in:
Jerome Duval
2021-03-03 18:26:30 +01:00
parent 3cb2ce1c0d
commit 8278152c67
3 changed files with 65 additions and 25 deletions

View File

@@ -1,20 +0,0 @@
diff -urN vorbis-tools-1.4.0/vcut/vcut.c vorbis-tools-1.4.0-gcc2/vcut/vcut.c
--- vorbis-tools-1.4.0/vcut/vcut.c 2010-03-26 07:07:07.022020096 +0000
+++ vorbis-tools-1.4.0-gcc2/vcut/vcut.c 2010-06-05 23:51:34.494927872 +0000
@@ -233,6 +233,7 @@
* Returns 0 for success, or -1 on failure. */
static int open_output_stream(vcut_state *s)
{
+ int rv;
if(!s->out && !s->drop_output)
{
if(open_output_file(s, s->output_filename)!=0)
@@ -240,7 +241,7 @@
}
/* ogg_stream_init should only fail if stream_out is null */
- int rv = ogg_stream_init(&s->stream_out, ++s->serial_out);
+ rv = ogg_stream_init(&s->stream_out, ++s->serial_out);
assert(rv == 0);
s->output_stream_open = 1;

View File

@@ -0,0 +1,59 @@
From d9e8a975610afbe61c4ed4cbba88a74111d3e302 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 9 Mar 2021 23:01:30 +0100
Subject: gcc2 patch
diff --git a/ogg123/status.c b/ogg123/status.c
index d696927..61a7369 100644
--- a/ogg123/status.c
+++ b/ogg123/status.c
@@ -171,6 +171,7 @@ int print_statistics_line (stat_format_t stats[])
#ifdef HAVE_UNISTD_H
/* If the line would break in the console, truncate it to avoid the break,
and indicate the truncation by adding points of ellipsis */
+{
struct winsize max;
int ioctlError = ioctl(STDERR_FILENO, TIOCGWINSZ, &max);
if (!ioctlError) {
@@ -180,14 +181,17 @@ int print_statistics_line (stat_format_t stats[])
if (pointsStart < 0) {
pointsStart = 0;
}
+{
int position;
for (position = pointsStart; position < limit; position++) {
str[position] = '.';
}
str[position] = 0;
len = position;
+}
}
}
+}
#endif
len += sprintf(str+len, "\r");
diff --git a/ogginfo/codec_theora.c b/ogginfo/codec_theora.c
index a106f34..43729c9 100644
--- a/ogginfo/codec_theora.c
+++ b/ogginfo/codec_theora.c
@@ -183,6 +183,7 @@ static void theora_end(stream_processor *stream)
|| (inf->ti.version_minor == 2 && inf->ti.version_subminor > 0)));
/* This should be lastgranulepos - startgranulepos, or something like that*/
+{
ogg_int64_t iframe=inf->lastgranulepos>>inf->ti.granule_shift;
ogg_int64_t pframe=inf->lastgranulepos-(iframe<<inf->ti.granule_shift);
/* The granule position starts at 0 for stream version 3.2.0, but starts at
@@ -206,6 +207,7 @@ static void theora_end(stream_processor *stream)
free(stream->data);
}
+}
void theora_start(stream_processor *stream)
--
2.30.0

View File

@@ -3,16 +3,16 @@ DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format."
HOMEPAGE="http://www.vorbis.com/"
COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
LICENSE="GNU GPL v2"
REVISION="6"
SOURCE_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"
CHECKSUM_SHA256="a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc"
REVISION="1"
SOURCE_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$portVersion.tar.gz"
CHECKSUM_SHA256="db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0"
SOURCE_DIR="vorbis-tools-$portVersion"
PATCHES="vorbis_tools-$portVersion.patch"
PATCHES="vorbis_tools-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
vorbis_tools = $portVersion compat >= 1
vorbis_tools = $portVersion
cmd:ogg123
cmd:oggdec
cmd:oggenc
@@ -25,6 +25,7 @@ REQUIRES="
lib:libao
lib:libcurl
lib:libFLAC
lib:libintl
lib:libogg
lib:libspeex
lib:libssl