diff options
| author | nox <nox@FreeBSD.org> | 2013-02-03 04:35:48 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2013-02-03 04:35:48 +0800 |
| commit | b45ecf6aa838c71f50d68ab446d7f457d2507c36 (patch) | |
| tree | a77cd5cdf6d8b4849761482243f3d47e606d90c4 /multimedia | |
| parent | bd124c78c6de86d4dc105906f30b56a0953c75a4 (diff) | |
| download | freebsd-ports-gnome-b45ecf6aa838c71f50d68ab446d7f457d2507c36.tar.gz freebsd-ports-gnome-b45ecf6aa838c71f50d68ab446d7f457d2507c36.tar.zst freebsd-ports-gnome-b45ecf6aa838c71f50d68ab446d7f457d2507c36.zip | |
- Prefer clang on 9.1+ (instead of gcc 4.6+ only on i386.)
- Fix build without V4L option (the multimedia/libdvbpsi dependency is
no longer optional.)
- No PORTREVISION bump since the resulting package should behave the same.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index f3b07c78dd98..8f5a875ec722 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -16,7 +16,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ - proxy:${PORTSDIR}/net/libproxy + proxy:${PORTSDIR}/net/libproxy \ + dvbpsi:${PORTSDIR}/multimedia/libdvbpsi BUILD_DEPENDS= ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} RUN_DEPENDS= ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} @@ -583,8 +584,7 @@ CONFIGURE_ARGS+=--disable-upnp .endif .if ${PORT_OPTIONS:MV4L} || ${PORT_OPTIONS:MDVB} -LIB_DEPENDS+= v4l1:${PORTSDIR}/multimedia/libv4l \ - dvbpsi:${PORTSDIR}/multimedia/libdvbpsi +LIB_DEPENDS+= v4l1:${PORTSDIR}/multimedia/libv4l CONFIGURE_ARGS+=--enable-v4l2 .else CONFIGURE_ARGS+=--disable-v4l2 @@ -679,9 +679,16 @@ IGNORE= base clang version too old, set NO_IGNORE to override CONFIGURE_ARGS+=--enable-altivec # VLC's config script doesn't know to do this .endif +# prefer clang on 9.1+ +.if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang) +CC= clang +CXX= clang++ +CPP= clang-cpp +.else .if ${ARCH} == "i386" USE_GCC?= 4.6+ # sse/3dnow detection on i386 needs newer gcc .endif +.endif # End OS specific hacks |