mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
vorbis_tools, bump to 1.4.3 (#13259)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,59 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
SUMMARY="Tools for using the Ogg Vorbis sound file format"
|
||||
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="2"
|
||||
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.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
|
||||
PROVIDES="
|
||||
vorbis_tools = $portVersion
|
||||
cmd:ogg123
|
||||
cmd:oggdec
|
||||
cmd:oggenc
|
||||
cmd:ogginfo
|
||||
cmd:vcut
|
||||
cmd:vorbiscomment
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
lib:libao
|
||||
lib:libcurl
|
||||
lib:libFLAC
|
||||
lib:libintl
|
||||
lib:libogg
|
||||
lib:libspeex
|
||||
lib:libssl
|
||||
lib:libvorbis
|
||||
lib:libvorbis
|
||||
lib:libvorbisenc
|
||||
lib:libvorbisfile
|
||||
lib:libz
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:libao
|
||||
devel:libcurl
|
||||
devel:libFLAC
|
||||
devel:libogg
|
||||
devel:libspeex
|
||||
devel:libssl >= 3
|
||||
devel:libvorbis
|
||||
devel:libvorbis
|
||||
devel:libvorbisenc
|
||||
devel:libvorbisfile
|
||||
devel:libz
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:automake
|
||||
cmd:autoreconf
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
rm -rf $prefix/lib
|
||||
}
|
||||
95
media-sound/vorbis_tools/vorbis_tools-1.4.3.recipe
Normal file
95
media-sound/vorbis_tools/vorbis_tools-1.4.3.recipe
Normal file
@@ -0,0 +1,95 @@
|
||||
SUMMARY="Tools for using the Ogg Vorbis sound file format"
|
||||
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="1"
|
||||
SOURCE_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="a1fe3ddc6777bdcebf6b797e7edfe0437954b24756ffcc8c6b816b63e0460dde"
|
||||
SOURCE_DIR="vorbis-tools-$portVersion"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
|
||||
commandBinDir=$binDir
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
vorbis_tools$secondaryArchSuffix = $portVersion
|
||||
cmd:ogg123$commandSuffix
|
||||
cmd:oggdec$commandSuffix
|
||||
cmd:oggenc$commandSuffix
|
||||
cmd:ogginfo$commandSuffix
|
||||
cmd:vcut$commandSuffix
|
||||
cmd:vorbiscomment$commandSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libao$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libFLAC$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libspeex$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libvorbis$secondaryArchSuffix
|
||||
lib:libvorbis$secondaryArchSuffix
|
||||
lib:libvorbisenc$secondaryArchSuffix
|
||||
lib:libvorbisfile$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
if [ "$targetArchitecture" == x86_gcc2 ]; then
|
||||
REPLACES="
|
||||
vorbis_tools
|
||||
"
|
||||
fi
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libao$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libFLAC$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libogg$secondaryArchSuffix
|
||||
devel:libspeex$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix >= 3
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvorbisenc$secondaryArchSuffix
|
||||
devel:libvorbisfile$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:automake
|
||||
cmd:autoreconf
|
||||
cmd:bison
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt$secondaryArchSuffix
|
||||
cmd:msgmerge$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
|
||||
autoreconf -fi
|
||||
runConfigure --omit-dirs binDir ./configure \
|
||||
--bindir=$commandBinDir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
Reference in New Issue
Block a user