[SVN-Commit] r1552 - trunk/Mk

[svn-freebsd-gecko at chruetertee.ch]

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