From 3d99fb32a06523e85972e51a21c923acf3564ab5 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Thu, 5 May 2016 09:41:35 +0000 Subject: [PATCH] Fix build in the presence of system-wide installed ffmpeg PR: 209064 Reported by: admin@vladiom.com.ua Submitted by: scf --- multimedia/handbrake/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 67135f5c895c..22b475aef47a 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -43,7 +43,6 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ 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//}