cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to celt-0.10.0.

Browse Source 
celt 0.11.x is broken in a subtle way.
This commit is contained in:
dcoppa 2011-04-05 14:17:55 +00:00
parent 283e931805
commit 42ded441c6
6 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/celt/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.3 2011/04/04 08:38:35 dcoppa Exp $ # $OpenBSD: Makefile,v 1.4 2011/04/05 14:17:55 dcoppa Exp $
COMMENT = ultra-low delay audio codec COMMENT = ultra-low delay audio codec
DISTNAME = celt-0.11.1 DISTNAME = celt-0.10.0
CATEGORIES = audio CATEGORIES = audio
HOMEPAGE = http://www.celt-codec.org/ HOMEPAGE = http://www.celt-codec.org/
SHARED_LIBS += celt0 1.0 # 2.0 SHARED_LIBS += celt0 0.0 # 1.0
# BSD # BSD
PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_CDROM = Yes

10
audio/celt/distinfo
View File

@ -1,5 +1,5 @@
MD5 (celt-0.11.1.tar.gz) = lP5KzSQdqHAsKVvNE6VV5g== MD5 (celt-0.10.0.tar.gz) = plb2F26b6EAnwOUc7t1xDw==
RMD160 (celt-0.11.1.tar.gz) = 0Vm4dSDFJe0/VKiWWg9b9TVfRSs= RMD160 (celt-0.10.0.tar.gz) = k1aqzfoeNTxb/xV9/s4HPqsT08g=
SHA1 (celt-0.11.1.tar.gz) = YgtBa7xbJafRn+O3lOBNHaBjwCw= SHA1 (celt-0.10.0.tar.gz) = EStkHlanwOp7HDURrBcW+dSo6lQ=
SHA256 (celt-0.11.1.tar.gz) = AcJXn7qLKDyQaMtwSnCm5lSqdM7QZMCRyv/75vsdTL8= SHA256 (celt-0.10.0.tar.gz) = FHxbyMajeyrSyLivF8kcs1SUQh7JtoEQAYpLzscuRdw=
SIZE (celt-0.11.1.tar.gz) = 465853 SIZE (celt-0.10.0.tar.gz) = 435953

19
audio/celt/patches/patch-libcelt_celt_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-libcelt_celt_c,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
Missing commas (from upstream git)
--- libcelt/celt.c.orig Tue Dec 21 03:14:48 2010
+++ libcelt/celt.c Thu Dec 30 14:11:11 2010
@@ -428,9 +428,9 @@ static void comb_filter(celt_word32 *y, celt_word32 *x
static const signed char tf_select_table[4][8] = {
{0, -1, 0, -1, 0,-1, 0,-1},
- {0, -1, 0, -2, 1, 0, 1 -1},
- {0, -2, 0, -3, 2, 0, 1 -1},
- {0, -2, 0, -3, 2, 0, 1 -1},
+ {0, -1, 0, -2, 1, 0, 1,-1},
+ {0, -2, 0, -3, 2, 0, 1,-1},
+ {0, -2, 0, -3, 2, 0, 1,-1},
};
static celt_word32 l1_metric(const celt_norm *tmp, int N, int LM, int width)

16
audio/celt/patches/patch-tests_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-tests_Makefile_in,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
Remove broken test
See: http://lists.xiph.org/pipermail/celt-dev/2010-November/000519.html
--- tests/Makefile.in.orig Thu Dec 2 11:12:18 2010
+++ tests/Makefile.in Thu Dec 2 11:13:04 2010
@@ -36,7 +36,7 @@ build_triplet = @build@
host_triplet = @host@
TESTS = type-test$(EXEEXT) ectest$(EXEEXT) cwrs32-test$(EXEEXT) \
dft-test$(EXEEXT) laplace-test$(EXEEXT) mdct-test$(EXEEXT) \
- mathops-test$(EXEEXT) tandem-test$(EXEEXT)
+ mathops-test$(EXEEXT)
noinst_PROGRAMS = type-test$(EXEEXT) ectest$(EXEEXT) \
cwrs32-test$(EXEEXT) dft-test$(EXEEXT) laplace-test$(EXEEXT) \
mdct-test$(EXEEXT) mathops-test$(EXEEXT) tandem-test$(EXEEXT)

8
audio/celt/patches/patch-tools_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_Makefile_in,v 1.2 2011/04/04 08:38:35 dcoppa Exp $ $OpenBSD: patch-tools_Makefile_in,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
Use sndio for audio Use sndio for audio
--- tools/Makefile.in.orig Tue Feb 15 06:15:57 2011 --- tools/Makefile.in.orig Thu Dec 2 08:12:27 2010
+++ tools/Makefile.in Mon Apr 4 10:13:59 2011 +++ tools/Makefile.in Thu Dec 2 08:13:31 2010
@@ -236,7 +236,8 @@ noinst_HEADERS = wav_io.h @@ -237,7 +237,8 @@ noinst_HEADERS = wav_io.h
celtenc_SOURCES = celtenc.c wav_io.c skeleton.c celtenc_SOURCES = celtenc.c wav_io.c skeleton.c
celtenc_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la $(OGG_LIBS) celtenc_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la $(OGG_LIBS)
celtdec_SOURCES = celtdec.c wav_io.c celtdec_SOURCES = celtdec.c wav_io.c

14
audio/celt/patches/patch-tools_celtdec_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_celtdec_c,v 1.2 2011/04/04 08:38:35 dcoppa Exp $ $OpenBSD: patch-tools_celtdec_c,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
Use sndio for audio Use sndio for audio
--- tools/celtdec.c.orig Sat Feb 12 03:55:45 2011 --- tools/celtdec.c.orig Thu Dec 2 08:16:46 2010
+++ tools/celtdec.c Mon Apr 4 10:13:59 2011 +++ tools/celtdec.c Thu Dec 2 08:17:40 2010
@@ -66,6 +66,9 @@ @@ -70,6 +70,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -14,7 +14,7 @@ Use sndio for audio
#elif defined HAVE_SYS_AUDIOIO_H #elif defined HAVE_SYS_AUDIOIO_H
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
@@ -88,6 +91,10 @@ @@ -92,6 +95,10 @@
((buf[base+1]<<8)&0xff00)| \ ((buf[base+1]<<8)&0xff00)| \
(buf[base]&0xff)) (buf[base]&0xff))
@ -25,7 +25,7 @@ Use sndio for audio
static void print_comments(char *comments, int length) static void print_comments(char *comments, int length)
{ {
char *c=comments; char *c=comments;
@@ -183,6 +190,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan @@ -187,6 +194,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan
exit(1); exit(1);
} }
fout = fdopen(audio_fd, "w"); fout = fdopen(audio_fd, "w");
@ -58,7 +58,7 @@ Use sndio for audio
#elif defined HAVE_SYS_AUDIOIO_H #elif defined HAVE_SYS_AUDIOIO_H
audio_info_t info; audio_info_t info;
int audio_fd; int audio_fd;
@@ -611,6 +644,10 @@ int main(int argc, char **argv) @@ -615,6 +648,10 @@ int main(int argc, char **argv)
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
if (strlen(outFile)==0) if (strlen(outFile)==0)
WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels); WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);