update to 1.2.0; speexdsp has been spun off into a separate port
ok jca@
This commit is contained in:
naddy
parent
5d42ca2629
commit
09b859ee18
@ -1,13 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2016/03/11 20:28:22 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2017/08/15 01:05:13 naddy Exp $
|
||||
|
||||
COMMENT= patent-free speech codec
|
||||
|
||||
DISTNAME= speex-1.2rc1
|
||||
REVISION= 1
|
||||
DISTNAME= speex-1.2.0
|
||||
CATEGORIES= audio
|
||||
HOMEPAGE= http://www.speex.org/
|
||||
SHARED_LIBS += speex 8.0 # .6.0
|
||||
SHARED_LIBS += speexdsp 1.0 # .6.0
|
||||
HOMEPAGE= https://speex.org/
|
||||
SHARED_LIBS= speex 8.0 # 6.1
|
||||
|
||||
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
|
||||
|
||||
@ -16,15 +14,15 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MASTER_SITES= http://downloads.xiph.org/releases/speex/
|
||||
|
||||
LIB_DEPENDS= audio/libogg
|
||||
WANTLIB= c m ogg>=5 sndio
|
||||
LIB_DEPENDS= audio/libogg \
|
||||
audio/speexdsp
|
||||
WANTLIB= c m ogg sndio speexdsp
|
||||
|
||||
SEPARATE_BUILD= Yes
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
|
||||
# binaries are intended to be enabled by default, but the configure
|
||||
# script is wrong
|
||||
CONFIGURE_ARGS= --enable-binaries
|
||||
CONFIGURE_ENV= CPPFLAGS="-DUSE_SNDIO"
|
||||
|
||||
MAKE_FLAGS= docdir=${TRUEPREFIX}/share/doc/speex \
|
||||
mandir=${TRUEPREFIX}/man
|
||||
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (speex-1.2rc1.tar.gz) = NC8w3Fe9Sm2tQTmDZbqqaQQpZgsQ2Ga31Qjo8Rect6Y=
|
||||
SIZE (speex-1.2rc1.tar.gz) = 1061882
|
||||
SHA256 (speex-1.2.0.tar.gz) = 6q6K8Kx0LcfVQslDmscvHzhc6Dg5LchJyuRTavkhAJQ=
|
||||
SIZE (speex-1.2.0.tar.gz) = 1047080
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/01/02 20:44:19 jakemsr Exp $
|
||||
--- src/Makefile.in.orig Mon Dec 28 00:38:06 2009
|
||||
+++ src/Makefile.in Mon Dec 28 00:38:31 2009
|
||||
@@ -228,7 +228,7 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2017/08/15 01:05:13 naddy Exp $
|
||||
Index: src/Makefile.in
|
||||
--- src/Makefile.in.orig
|
||||
+++ src/Makefile.in
|
||||
@@ -370,7 +370,7 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la
|
||||
|
||||
speexdec_SOURCES = speexdec.c wav_io.c
|
||||
speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
|
||||
- $(OGG_LIBS) @FFT_LIBS@
|
||||
+ $(OGG_LIBS) @FFT_LIBS@ -lsndio
|
||||
- $(OGG_LIBS) @WINMM_LIBS@ @FFT_LIBS@
|
||||
+ $(OGG_LIBS) @WINMM_LIBS@ @FFT_LIBS@ -lsndio
|
||||
|
||||
all: all-am
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
$OpenBSD: patch-src_speexdec_c,v 1.4 2010/01/02 20:44:19 jakemsr Exp $
|
||||
--- src/speexdec.c.orig Fri May 30 00:34:16 2008
|
||||
+++ src/speexdec.c Sat Jan 2 12:40:42 2010
|
||||
@@ -68,6 +68,9 @@
|
||||
$OpenBSD: patch-src_speexdec_c,v 1.5 2017/08/15 01:05:13 naddy Exp $
|
||||
Index: src/speexdec.c
|
||||
--- src/speexdec.c.orig
|
||||
+++ src/speexdec.c
|
||||
@@ -67,6 +67,9 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
@ -11,9 +12,9 @@ $OpenBSD: patch-src_speexdec_c,v 1.4 2010/01/02 20:44:19 jakemsr Exp $
|
||||
#elif defined HAVE_SYS_AUDIOIO_H
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
@@ -92,6 +95,10 @@
|
||||
@@ -91,6 +94,10 @@
|
||||
((buf[base+1]<<8)&0xff00)| \
|
||||
(buf[base]&0xff))
|
||||
(buf[base]&0xff))
|
||||
|
||||
+#ifdef USE_SNDIO
|
||||
+struct sio_hdl *hdl;
|
||||
@ -22,7 +23,7 @@ $OpenBSD: patch-src_speexdec_c,v 1.4 2010/01/02 20:44:19 jakemsr Exp $
|
||||
static void print_comments(char *comments, int length)
|
||||
{
|
||||
char *c=comments;
|
||||
@@ -187,6 +194,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan
|
||||
@@ -186,6 +193,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan
|
||||
exit(1);
|
||||
}
|
||||
fout = fdopen(audio_fd, "w");
|
||||
@ -55,7 +56,7 @@ $OpenBSD: patch-src_speexdec_c,v 1.4 2010/01/02 20:44:19 jakemsr Exp $
|
||||
#elif defined HAVE_SYS_AUDIOIO_H
|
||||
audio_info_t info;
|
||||
int audio_fd;
|
||||
@@ -746,6 +779,10 @@ int main(int argc, char **argv)
|
||||
@@ -745,6 +778,10 @@ int main(int argc, char **argv)
|
||||
#if defined WIN32 || defined _WIN32
|
||||
if (strlen(outFile)==0)
|
||||
WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
|
||||
|
||||
@ -1,30 +1,19 @@
|
||||
@comment $OpenBSD: PLIST,v 1.7 2015/03/16 18:07:37 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.8 2017/08/15 01:05:13 naddy Exp $
|
||||
@bin bin/speexdec
|
||||
@bin bin/speexenc
|
||||
include/speex/
|
||||
include/speex/speex.h
|
||||
include/speex/speex_bits.h
|
||||
include/speex/speex_buffer.h
|
||||
include/speex/speex_callbacks.h
|
||||
include/speex/speex_config_types.h
|
||||
include/speex/speex_echo.h
|
||||
include/speex/speex_header.h
|
||||
include/speex/speex_jitter.h
|
||||
include/speex/speex_preprocess.h
|
||||
include/speex/speex_resampler.h
|
||||
include/speex/speex_stereo.h
|
||||
include/speex/speex_types.h
|
||||
lib/libspeex.a
|
||||
lib/libspeex.la
|
||||
@lib lib/libspeex.so.${LIBspeex_VERSION}
|
||||
lib/libspeexdsp.a
|
||||
lib/libspeexdsp.la
|
||||
@lib lib/libspeexdsp.so.${LIBspeexdsp_VERSION}
|
||||
lib/pkgconfig/speex.pc
|
||||
lib/pkgconfig/speexdsp.pc
|
||||
@man man/man1/speexdec.1
|
||||
@man man/man1/speexenc.1
|
||||
share/aclocal/
|
||||
share/aclocal/speex.m4
|
||||
share/doc/speex/
|
||||
share/doc/speex/manual.pdf
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user