don't pull in libjack in portsmf now that we aren't guaranteeing jack

is installed via portaudio.  there is no OpenBSD midi support in jack
anyway ...
This commit is contained in:
jakemsr 2010-06-13 15:49:10 +00:00
parent e7bce2ed58
commit dc43149a11
2 changed files with 20 additions and 9 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.24 2009/12/22 15:43:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.25 2010/06/13 15:49:10 jakemsr Exp $
COMMENT= free audio editor
V= 1.3.9
DISTNAME= audacity-minsrc-${V}
PKGNAME= audacity-${V}p0
PKGNAME= audacity-${V}p1
CATEGORIES= audio
EXTRACT_SUFX= .tar.bz2
@ -22,7 +22,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c expat glib-2.0 gobject-2.0 gtk-x11-2.0 \
jack m ogg pthread sndfile sndio stdc++
m ogg pthread sndfile sndio stdc++
BUILD_DEPENDS= ::archivers/zip
LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_qa,wx_base,wx_gtk2_core,wx_gtk2_richtext:wxWidgets-gtk2->=2.8.6:x11/wxWidgets \
@ -31,7 +31,7 @@ LIB_DEPENDS= wx_base_xml,wx_base_odbc,wx_gtk2_aui,wx_gtk2_html,wx_gtk2_adv,wx_gt
vorbis.>=5,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
id3tag.>=2::audio/libid3tag \
mad.>=2::audio/libmad \
portaudio::audio/portaudio-svn \
portaudio.>=1:portaudio-svn->=1406p1:audio/portaudio-svn \
SoundTouch::audio/soundtouch \
vamp-hostsdk.>=1::audio/vamp-plugin-sdk \
tag::audio/taglib

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.12 2009/10/28 18:40:13 jakemsr Exp $
$OpenBSD: patch-configure,v 1.13 2010/06/13 15:49:10 jakemsr Exp $
--- configure.orig Mon Aug 31 03:45:37 2009
+++ configure Sat Oct 17 15:08:27 2009
+++ configure Sun Jun 6 19:19:44 2010
@@ -822,7 +822,6 @@ JACK_CFLAGS
JACK_LIBS'
ac_subdirs_all='"lib-src/FileDialog"
@ -41,7 +41,18 @@ $OpenBSD: patch-configure,v 1.12 2009/10/28 18:40:13 jakemsr Exp $
case "${host_os}" in
darwin* | rhapsody*)
LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
@@ -9637,7 +9631,6 @@ _ACEOF
@@ -9371,9 +9365,7 @@ else
$as_echo "yes" >&6; }
have_jack=yes
fi
- if [ $have_jack = "yes" ] ; then
- LIBS="$LIBS $JACK_LIBS"
- fi
+
{ $as_echo "$as_me:$LINENO: checking for HPI_SubSysCreate in -lhpi" >&5
$as_echo_n "checking for HPI_SubSysCreate in -lhpi... " >&6; }
if test "${ac_cv_lib_hpi_HPI_SubSysCreate+set}" = set; then
@@ -9637,7 +9629,6 @@ _ACEOF
subdirs="$subdirs lib-src/portmixer"
@ -49,7 +60,7 @@ $OpenBSD: patch-configure,v 1.12 2009/10/28 18:40:13 jakemsr Exp $
fi
{ $as_echo "$as_me:$LINENO: checking for lrint" >&5
@@ -11255,7 +11248,7 @@ $as_echo "$as_me: WARNING: no configuration informatio
@@ -11255,7 +11246,7 @@ $as_echo "$as_me: WARNING: no configuration informatio
{ $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
# The eval makes quoting arguments work.
@ -58,7 +69,7 @@ $OpenBSD: patch-configure,v 1.12 2009/10/28 18:40:13 jakemsr Exp $
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
@@ -11271,9 +11264,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
@@ -11271,9 +11262,8 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
fi