Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

1 files changed, 23 insertions, 9 deletions

diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 657e7e20f..13c45840d 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 176849 2013-02-01 14:30:42Z andyrtr $
+# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.12
-pkgrel=1
+pkgver=1.12.14
+pkgrel=3
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
+# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') 
+makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
+             # for the test suite:
+             'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
-optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82')
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -26,18 +28,30 @@ build() {
 	--localstatedir=/var \
 	--disable-static \
 	--enable-tee \
-	--disable-xlib-xcb \
+	--enable-gl \
+	--enable-egl \
+	--enable-svg \
+	--enable-ps \
+	--enable-pdf \
+	--enable-gobject #\
+	# --enable-test-surfaces
+	
+	#--disable-xlib-xcb \
 	# --enable-test-surfaces \ takes ages
 	#--enable-drm # breaks build
+	
   make
 }
 
 #check() {
 #  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
 #}
 
 package() {
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') 
+
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }