vpx builds just fine with base clang instead of ports clang, unhardcode
libestdc++ accordingly.
This commit is contained in:
parent
358c9bda47
commit
45595d500d
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2017/04/10 11:45:23 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2017/05/13 10:33:14 espie Exp $
|
||||
|
||||
COMMENT = console audio player
|
||||
DISTNAME = moc-2.5.1
|
||||
@ -21,7 +21,7 @@ WANTLIB += vorbisfile vpx wavpack x264 x265 xvidcore z
|
||||
# libvpx -> libavcodec -> mocp
|
||||
# see multimedia/gstreamer1/plugins-good/Makefile for details
|
||||
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
|
||||
WANTLIB += estdc++
|
||||
WANTLIB += $(LIBECXX)
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS = audio/faad \
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2017/05/08 10:46:53 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2017/05/13 10:33:14 espie Exp $
|
||||
|
||||
# XXX ossaudio(3) is only enabled to be used as a mixing device by
|
||||
# x11/xfce4/xfce4-mixer
|
||||
@ -30,7 +30,7 @@ WANTLIB-main += v4l2 v4lconvert
|
||||
# comes from multimedia/libvpx using lang/clang MODULE on i386|amd64 only
|
||||
# which includes gcc4 MODULE with adds gcc-libs in dependency scope
|
||||
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
|
||||
WANTLIB-main += estdc++
|
||||
WANTLIB-main += $(LIBECXX)
|
||||
.endif
|
||||
|
||||
WANTLIB-pulse += ${WANTLIB}
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2017/04/10 11:46:23 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2017/05/13 10:33:14 espie Exp $
|
||||
|
||||
COMMENT= Google VP8/VP9 video codec
|
||||
|
||||
@ -18,10 +18,13 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= c m pthread ${LIBCXX}
|
||||
|
||||
MODULES= lang/clang
|
||||
.include <bsd.port.arch.mk>
|
||||
.if !${PROPERTIES:Mclang}
|
||||
MODULES = lang/clang
|
||||
|
||||
MODCLANG_ARCHS= amd64 i386
|
||||
MODCLANG_ARCHS=amd64 i386
|
||||
MODCLANG_LANGS= c c++
|
||||
.endif
|
||||
|
||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
|
||||
BUILD_DEPENDS+= devel/yasm
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.37 2017/04/10 11:46:37 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.38 2017/05/13 10:33:14 espie Exp $
|
||||
|
||||
COMMENT= C++ library to create, manipulate and render SVG files
|
||||
|
||||
@ -33,7 +33,7 @@ WANTLIB += xcb-render xcb-shm xvidcore z
|
||||
# comes from multimedia/libvpx using lang/clang MODULE on i386|amd64 only
|
||||
# which includes gcc4 MODULE with adds gcc-libs in dependency scope
|
||||
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
|
||||
WANTLIB += estdc++
|
||||
WANTLIB += $(LIBECXX)
|
||||
.endif
|
||||
|
||||
LIB_DEPENDS= graphics/ffmpeg \
|
||||
|
Loading…
Reference in New Issue
Block a user