diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-05-05 17:41:35 +0800 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-05-05 17:41:35 +0800 |
| commit | 3d99fb32a06523e85972e51a21c923acf3564ab5 (patch) | |
| tree | b6f5998eaad6fe6843b8071fdb344516728d7ade /multimedia | |
| parent | 48c0b89226d6d19ee2676ae8ce57ceec3a1848ed (diff) | |
| download | freebsd-ports-gnome-3d99fb32a06523e85972e51a21c923acf3564ab5.tar.gz freebsd-ports-gnome-3d99fb32a06523e85972e51a21c923acf3564ab5.tar.zst freebsd-ports-gnome-3d99fb32a06523e85972e51a21c923acf3564ab5.zip | |
Fix build in the presence of system-wide installed ffmpeg
PR: 209064
Reported by: admin@vladiom.com.ua
Submitted by: scf
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/handbrake/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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//} |