From 80c4e1c0b7251ac15759f8c8539999f9816c1125 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Thu, 2 Dec 2010 22:17:46 +0000 Subject: [PATCH] Don't enable CELT support for now. OK jakemsr@ --- audio/jack/Makefile | 4 ++-- audio/jack/patches/patch-configure_ac | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 8a9263ec675..9e8283423bc 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/11/23 18:14:02 jasper Exp $ +# $OpenBSD: Makefile,v 1.18 2010/12/02 22:17:46 dcoppa Exp $ SHARED_ONLY = Yes @@ -7,7 +7,7 @@ COMMENT = low latency sound server V = 0.116.1 DISTNAME = jack-audio-connection-kit-${V} PKGNAME = jack-${V} -REVISION = 6 +REVISION = 7 SHARED_LIBS += jack 0.0 # 0.28 SHARED_LIBS += jackserver 0.0 # 0.28 diff --git a/audio/jack/patches/patch-configure_ac b/audio/jack/patches/patch-configure_ac index 8a3a6ca99a1..23cc1ec24a7 100644 --- a/audio/jack/patches/patch-configure_ac +++ b/audio/jack/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.5 2009/01/12 10:45:01 jakemsr Exp $ ---- configure.ac.orig Sat Dec 6 01:32:50 2008 -+++ configure.ac Mon Jan 12 02:27:57 2009 -@@ -655,9 +655,6 @@ HAVE_SAMPLERATE=false +$OpenBSD: patch-configure_ac,v 1.6 2010/12/02 22:17:46 dcoppa Exp $ +--- configure.ac.orig Sat Dec 6 10:32:50 2008 ++++ configure.ac Thu Dec 2 11:06:17 2010 +@@ -655,14 +655,11 @@ HAVE_SAMPLERATE=false PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.2,[HAVE_SAMPLERATE=true], [true]) if test x$HAVE_SAMPLERATE = xfalse; then AC_MSG_WARN([*** the NetJack backend and internal client will not be built]) @@ -11,6 +11,12 @@ $OpenBSD: patch-configure_ac,v 1.5 2009/01/12 10:45:01 jakemsr Exp $ fi # Celt low-latency audio codec. netjack transmission via internet. + HAVE_CELT=false +-PKG_CHECK_MODULES(CELT, celt >= 0.5.0,[HAVE_CELT=true], [true]) ++# PKG_CHECK_MODULES(CELT, celt >= 0.5.0,[HAVE_CELT=true], [true]) + if test x$HAVE_CELT = xfalse; then + AC_DEFINE(HAVE_CELT,0,"Whether CELT is available") + AC_MSG_RESULT(no) @@ -680,7 +677,7 @@ fi # Check which backend drivers can be built. The last one successfully