Permalink
Browse files

cairo: make it work without libX11

xlib-libxcb code was required before. This breaks a build without libX11.
  • Loading branch information...
v4hn committed Apr 17, 2013
1 parent 99fbbd5 commit cde5496f44785adc436bb4fa18bdd5be0547e6c2
Showing with 14 additions and 24 deletions.
  1. +10 −19 graphics/cairo/BUILD
  2. +4 −5 graphics/cairo/DEPENDS
View
@@ -1,22 +1,13 @@
-(
+OPTS+=" --disable-static" &&
- OPTS+=" --disable-static --enable-xlib-xcb " &&
+if in_depends $MODULE qt4 ; then
+ . /etc/profile.d/qt4.rc
+fi &&
- if in_depends $MODULE qt4 ; then
- . /etc/profile.d/qt4.rc
- fi &&
+if [ "`get_module_config DOCS`" = "n" ] ; then
+ sedit 's/SUBDIRS = src doc util/SUBDIRS = src util/g' Makefile.in
+fi &&
- if in_depends $MODULE libX11 ; then
- # tee is required by firefox 4 when compiled with system cairo, and doesn't otherwise make any difference
- OPTS+=" --enable-tee"
- fi &&
-
- if [ "`get_module_config DOCS`" = "n" ] ; then
- sedit 's/SUBDIRS = src doc util/SUBDIRS = src util/g' Makefile.in
- fi &&
-
- # LIBS is needed for cairo-sphinx and others with --as-needed
- LIBS="-lstdc++" \
- default_build
-
-) > $C_FIFO 2>&1
+# LIBS is needed for cairo-sphinx and others with --as-needed
+LIBS="-lstdc++" \
+default_build
View
@@ -1,5 +1,4 @@
depends pixman
-depends libxcb
optional_depends "libpng" \
"--enable-png --enable-svg" \
@@ -12,14 +11,14 @@ optional_depends "zlib" \
"for PostScript and PDF surface backend (recommended)"
optional_depends "libX11" \
- "--enable-xlib" \
- "--disable-xlib" \
- "for Xlib surface backend"
+ "--enable-xlib --enable-xcb --enable-xlib-xcb --enable-tee" \
+ "--disable-xlib --disable-xlib-xcb" \
+ "for Xlib/XCB surface backend (strongly recommended)"
optional_depends "libXrender" \
"--enable-xlib-xrender" \
"--disable-xlib-xrender" \
- "for Xlib Xrender surface backend (enables Xlib)"
+ "for Xlib Xrender surface backend (requires Xlib)"
optional_depends "qt4" \
"--enable-qt" \

0 comments on commit cde5496

Please sign in to comment.