From owner-svn-ports-head@freebsd.org Thu May 5 09:41:37 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26103B2E904; Thu, 5 May 2016 09:41:37 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E8B94179B; Thu, 5 May 2016 09:41:36 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u459faiI057801; Thu, 5 May 2016 09:41:36 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u459fa7U057800; Thu, 5 May 2016 09:41:36 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201605050941.u459fa7U057800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 5 May 2016 09:41:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414637 - head/multimedia/handbrake X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2016 09:41:37 -0000 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@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//}