From owner-freebsd-gecko@FreeBSD.ORG Fri Mar 14 06:59:39 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0CD2B7A for ; Fri, 14 Mar 2014 06:59:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84D4AA5B for ; Fri, 14 Mar 2014 06:59:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s2E6xbBt003943 for ; Fri, 14 Mar 2014 06:59:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s2E6xWOt003745 for freebsd-gecko@freebsd.org; Fri, 14 Mar 2014 06:59:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 14 Mar 2014 06:59:32 GMT Message-Id: <201403140659.s2E6xWOt003745@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1552 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2014 06:59:40 -0000 Author: jbeich Date: Fri Mar 14 06:59:32 2014 New Revision: 1552 Log: decouple system pixman in order to use it after r1474 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Mar 14 06:59:26 2014 (r1551) +++ trunk/Mk/bsd.gecko.mk Fri Mar 14 06:59:32 2014 (r1552) @@ -547,11 +547,11 @@ .endif # Standard depends -_ALL_DEPENDS= cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png sqlite vorbis vpx +_ALL_DEPENDS= cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png pixman sqlite vorbis vpx cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo -cairo_MOZ_OPTIONS= --enable-system-cairo --enable-system-pixman -cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo +cairo_MOZ_OPTIONS= --enable-system-cairo +cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/cairo event_LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent @@ -592,6 +592,10 @@ opus_MOZ_OPTIONS= --with-system-opus opus_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libopus +pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman +pixman_MOZ_OPTIONS= --enable-system-pixman +pixman_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/libpixman + png_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} png_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libpng