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

Fix after celt update

Browse Source 
ok ajacoutot@
This commit is contained in:
dcoppa 2012-04-20 13:28:50 +00:00
parent 9e7619ca15
commit 5e98afa5bd
5 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/jack/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2012/01/24 08:03:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2012/04/20 13:28:50 dcoppa Exp $
SHARED_ONLY = Yes
@ -7,6 +7,7 @@ COMMENT = low latency sound server
V = 0.121.3
DISTNAME = jack-audio-connection-kit-${V}
PKGNAME = jack-${V}
REVISION = 0
SHARED_LIBS += jack 0.0 # 0.28
SHARED_LIBS += jackserver 0.0 # 0.28
@ -22,14 +23,14 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c celt0 m pthread readline samplerate sndfile sndio
WANTLIB += termcap
WANTLIB += c celt0>=1 m pthread readline samplerate sndfile
WANTLIB += sndio termcap
MASTER_SITES = ${HOMEPAGE}downloads/
LIB_DEPENDS = audio/libsndfile \
audio/libsamplerate \
audio/celt
audio/celt>=0.11.0
# uses macros from libtool.m4
BUILD_DEPENDS = devel/libtool

24
audio/jack/patches/patch-drivers_netjack_netjack_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-drivers_netjack_netjack_c,v 1.1 2012/04/20 13:28:50 dcoppa Exp $
Fix with celt>=0.11
--- drivers/netjack/netjack.c.orig Wed Apr 18 13:04:54 2012
+++ drivers/netjack/netjack.c Wed Apr 18 13:05:48 2012
@@ -407,7 +407,7 @@ void netjack_attach( netjack_driver_state_t *netj )
if( netj->bitdepth == CELT_MODE ) {
#if HAVE_CELT
#if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
- netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( netj->celt_mode, 1, NULL ) );
+ netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create_custom( netj->celt_mode, 1, NULL ) );
#else
netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( netj->celt_mode ) );
#endif
@@ -454,7 +454,7 @@ void netjack_attach( netjack_driver_state_t *netj )
#if HAVE_CELT
#if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
CELTMode *celt_mode = celt_mode_create( netj->sample_rate, netj->period_size, NULL );
- netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) );
#else
CELTMode *celt_mode = celt_mode_create( netj->sample_rate, 1, netj->period_size, NULL );
netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode ) );

24
audio/jack/patches/patch-tools_netsource_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-tools_netsource_c,v 1.6 2012/04/20 13:28:50 dcoppa Exp $
Fix with celt>=0.11
--- tools/netsource.c.orig Wed Apr 18 13:06:08 2012
+++ tools/netsource.c Wed Apr 18 13:06:50 2012
@@ -139,7 +139,7 @@ alloc_ports (int n_capture_audio, int n_playback_audio
#if HAVE_CELT
#if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL );
- capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
+ capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create_custom( celt_mode, 1, NULL ) );
#else
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL );
capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) );
@@ -182,7 +182,7 @@ alloc_ports (int n_capture_audio, int n_playback_audio
#if HAVE_CELT
#if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL );
- playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) );
#else
CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL );
playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) );

10
net/opal/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2012/03/02 09:04:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2012/04/20 13:28:50 dcoppa Exp $
SHARED_ONLY= Yes
@ -6,6 +6,8 @@ COMMENT= Open Phone Abstraction Library
DISTNAME= opal-3.10.4
REVISION= 0
SHARED_LIBS= opal 2.0 # 3.10.3
EXTRACT_SUFX= .tar.bz2
@ -22,13 +24,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += c celt0 crypto gsm m ogg pt pthread spandsp speex speexdsp
WANTLIB += stdc++ theora tiff x264
WANTLIB += c celt0>=1 crypto gsm m ogg pt pthread spandsp speex
WANTLIB += speexdsp stdc++ theora tiff x264
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/}
LIB_DEPENDS= devel/ptlib>=2.10.4 \
audio/celt \
audio/celt>=0.11.0 \
telephony/spandsp
# dlopen(3) libavcodec.so; shows as Extra: in check-lib-depends but

24
net/opal/patches/patch-plugins_audio_celt_celtcodec_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-plugins_audio_celt_celtcodec_c,v 1.1 2012/04/20 13:28:50 dcoppa Exp $
Fix with celt>=0.11
--- plugins/audio/celt/celtcodec.c.orig Wed Apr 18 13:45:31 2012
+++ plugins/audio/celt/celtcodec.c Wed Apr 18 13:46:04 2012
@@ -83,7 +83,7 @@ static void * celt_create_encoder(const struct PluginC
#if CELT_VERSION<700
celt->encoder_state = celt_encoder_create(celt->mode);
#else
- celt->encoder_state = celt_encoder_create(celt->mode, 1, NULL);
+ celt->encoder_state = celt_encoder_create_custom(celt->mode, 1, NULL);
#endif
if (celt->encoder_state == NULL ) {
celt_mode_destroy(celt->mode);
@@ -109,7 +109,7 @@ static void * celt_create_decoder(const struct PluginC
#if CELT_VERSION<700
celt->decoder_state = celt_decoder_create(celt->mode);
#else
- celt->decoder_state = celt_decoder_create(celt->mode, 1, NULL);
+ celt->decoder_state = celt_decoder_create_custom(celt->mode, 1, NULL);
#endif
if (celt->decoder_state == NULL ) {
celt_mode_destroy(celt->mode);