diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 2e223fde22..8524268083 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,7 +1,7 @@
 # Template build file for 'cairo'.
 pkgname=cairo
 version=1.12.16
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --disable-lto --enable-tee --enable-egl
  $(vopt_enable opengl gl) $(vopt_enable gles2 glesv2)"
@@ -23,20 +23,15 @@ pre_configure() {
 # Package build options
 build_options="gles2 opengl"
 
-# On RaspberryPi use GLES, otherwise GL.
-if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-	build_options_default="gles2"
-else
+# XXX
+# On RaspberryPi do not use GL; weston needs rpi-firmware-pcfiles which
+# conflicts with MesaLib-devel.
+if [ "$XBPS_TARGET_MACHINE" != "armv6l" ]; then
 	build_options_default="opengl"
 fi
 
 if [ "$build_option_opengl" -o "$build_option_gles2" ]; then
-	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-		# rpi use native GLES/EGL implementation
-		makedepends+=" rpi-firmware-pcfiles"
-	else
-		makedepends+=" MesaLib-devel"
-	fi
+	makedepends+=" MesaLib-devel"
 fi
 
 cairo-devel_package() {