diff options
| author | marcus <marcus@FreeBSD.org> | 2006-04-08 13:14:22 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-04-08 13:14:22 +0800 |
| commit | 6980711c77d2f29b8fd9b241535a763bbba69575 (patch) | |
| tree | 7375e469315cdceb83c41dcf2277bffe19f851dc /net/opal | |
| parent | 913c9fa34d999d673e4a03d26ec1949fddf49087 (diff) | |
| download | freebsd-ports-gnome-6980711c77d2f29b8fd9b241535a763bbba69575.tar.gz freebsd-ports-gnome-6980711c77d2f29b8fd9b241535a763bbba69575.tar.zst freebsd-ports-gnome-6980711c77d2f29b8fd9b241535a763bbba69575.zip | |
* Remove the double underscore from the library names
* Add WITH_FFMPEG knob
* Add WITH_SPEEX knob to build with speex-devel instead of the bundled version
NOTE: there is an explicit BUILD_DEPENDS to make sure audio/speex-devel
is installed as audio/speex and audio/speex-devel install the same shared
library version!!
PR: 95464
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Approved by: maintainer
Diffstat (limited to 'net/opal')
| -rw-r--r-- | net/opal/Makefile | 19 | ||||
| -rw-r--r-- | net/opal/files/patch-opal_inc.mak.in | 11 | ||||
| -rw-r--r-- | net/opal/pkg-plist | 8 |
3 files changed, 33 insertions, 5 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile index a55dc216386c..1548e3c442a9 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -7,6 +7,7 @@ PORTNAME= opal PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.voxgratia.org/releases/ DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- @@ -24,8 +25,24 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +NO_FILTER_SHLIBS= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.ifdef (WITH_FFMPEG) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+= --enable-h263avcodec=${LOCALBASE}/include/ffmpeg +.endif + +.ifdef (WITH_SPEEX) +LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex-devel +BUILD_DEPENDS+= ${LOCALBASE}/include/speex/speex_echo.h:${PORTSDIR}/audio/speex-devel +CONFIGURE_ARGS+= --enable-localspeex=no +.else +CONFIGURE_ARGS+= --enable-localspeex=yes +.endif + +.include <bsd.port.post.mk> diff --git a/net/opal/files/patch-opal_inc.mak.in b/net/opal/files/patch-opal_inc.mak.in new file mode 100644 index 000000000000..1b879aae2153 --- /dev/null +++ b/net/opal/files/patch-opal_inc.mak.in @@ -0,0 +1,11 @@ +--- opal_inc.mak.in.orig Fri Apr 7 08:12:16 2006 ++++ opal_inc.mak.in Fri Apr 7 08:13:55 2006 +@@ -103,7 +103,7 @@ + endif + + +-OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX) ++OPAL_BASE = opal_$(OPAL_SUFFIX) + OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX) + + LDFLAGS += -L$(OPAL_LIBDIR) diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist index 56ea517dd808..9da7083ae6e4 100644 --- a/net/opal/pkg-plist +++ b/net/opal/pkg-plist @@ -108,11 +108,11 @@ include/opal/t120/x224.h include/opal/t38/h323t38.h include/opal/t38/t38proto.h lib/libopal.so -lib/libopal__r.so -lib/libopal__r.so.2.2 -lib/libopal__r.so.2.2.1 +lib/libopal_r.so +lib/libopal_r.so.2 +lib/libopal_r.so.2.2 +lib/libopal_r.so.2.2.1 share/opal/opal_inc.mak -@unexec rm %D/lib/libopal__r.so.2.2 2>/dev/null || true @dirrm share/opal @dirrm include/opal/t38 @dirrm include/opal/t120 |