svn commit: r414637 - head/multimedia/handbrake

[Thomas Zander]

Author: riggs
Date: Thu May  5 09:41:35 2016
New Revision: 414637
URL: https://svnweb.freebsd.org/changeset/ports/414637

Log:
  Fix build in the presence of system-wide installed ffmpeg
  
  PR:		209064
  Reported by:	admin at vladiom.com.ua
  Submitted by:	scf

Modified:
  head/multimedia/handbrake/Makefile

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Thu May  5 09:12:32 2016	(r414636)
+++ head/multimedia/handbrake/Makefile	Thu May  5 09:41:35 2016	(r414637)
@@ -43,7 +43,6 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/
 		libsamplerate.so:audio/libsamplerate \
 		libx264.so:multimedia/libx264 \
 		libmp3lame.so:audio/lame
-CONFLICTS_BUILD=	x265
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed)
@@ -67,6 +66,9 @@ MAKE_JOBS_UNSAFE=	yes
 
 NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 
+# Enforce linking to bundled libraries instead of system libraries
+LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib
+
 # Enforce linking to the system c++ standard lib
 LDFLAGS+=	-l${COMPILER_FEATURES:Mlib*c++:S/lib//}