Date: Sat, 2 Feb 2013 20:35:48 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311443 - head/multimedia/vlc Message-ID: <201302022035.r12KZm5C088164@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sat Feb 2 20:35:48 2013 New Revision: 311443 URL: http://svnweb.freebsd.org/changeset/ports/311443 Log: - 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. Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sat Feb 2 20:10:42 2013 (r311442) +++ head/multimedia/vlc/Makefile Sat Feb 2 20:35:48 2013 (r311443) @@ -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 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302022035.r12KZm5C088164>