- fix WANTLIB after pwlib FLAVORs merge

- cope with new speex version
This commit is contained in:
ajacoutot 2008-05-22 19:30:41 +00:00
parent 9b89accee8
commit c0119eb049
2 changed files with 15 additions and 5 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/04/29 07:01:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2008/05/22 19:30:41 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= Open Phone Abstraction Library
DISTNAME= opal-2.2.11
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= opal 0.0 # .2.2.11
CATEGORIES= net devel
@ -20,9 +21,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/admin/downloads/latest/sources/sources/
WANTLIB= crypto expat ossaudio ssl
WANTLIB= SDL crypto expat lber ldap ldap_r ossaudio sasl2 ssl
LIB_DEPENDS= speex.>=4::audio/speex \
LIB_DEPENDS= speex.>=7,speexdsp::audio/speex \
pt.>=2::devel/pwlib
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64" \

View File

@ -1,6 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/04/29 07:01:18 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2008/05/22 19:30:41 ajacoutot Exp $
--- Makefile.in.orig Sat Apr 22 16:06:54 2006
+++ Makefile.in Mon Apr 28 15:00:01 2008
+++ Makefile.in Thu May 22 20:21:08 2008
@@ -534,7 +534,7 @@ SOURCES += $(OPAL_SRCDIR)/codec/speexcodec.cxx
ifdef OPAL_SYSTEM_SPEEX
-ENDLDLIBS := -lspeex $(ENDLDLIBS)
+ENDLDLIBS := -lspeex -lspeexdsp $(ENDLDLIBS)
else
@@ -762,9 +762,6 @@ ifeq ($(P_SHAREDLIB),1)
endif