X-Git-Url: http://gitweb/?a=blobdiff_plain;f=cairo%2FPkgfile;h=fba4066c7b499e6ccab580b2deed2d1053b6488e;hb=0c0500456a6f3b0d934f971d96e7e41565ed1def;hp=7a9c480ec0991eafb1930a0429ed66faffb62af4;hpb=d2fbbeb14fbfe4ae0a1d804f537774fa9ed287c6;p=attic%2Fports%2Fopt-cross.git

diff --git a/cairo/Pkgfile b/cairo/Pkgfile
index 7a9c480..fba4066 100644
--- a/cairo/Pkgfile
+++ b/cairo/Pkgfile
@@ -1,11 +1,11 @@
 # Description: A 2D graphics library with support for multiple output devices
 # URL: http://www.cairographics.org/
 # Maintainer: Tilman Sauerbeck tilman at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: fontconfig libpng xorg-libxrender xorg-libpixman
 
 name=cairo
-version=1.8.8
+version=1.8.10
 release=1
 source=(http://cairographics.org/releases/$name-$version.tar.gz)
 
@@ -24,6 +24,10 @@ build() {
   export pixman_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/pixman-1"
   export FONTCONFIG_LIBS="$DEFAULT_LIBS -lfontconfig"
   export FONTCONFIG_CFLAGS="$DEFAULT_CFLAGS"
+  export FREETYPE_LIBS="$DEFAULT_LIBS -lfreetype -lz"
+  export FREETYPE_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/freetype2"
+  export CAIRO_LIBS="$PNG_LIBS $xlib_LIBS $xlib_xrender_LIBS $pixman_LIBS $FONTCONFIG_LIBS $FREETYPE_LIBS"
+  export CAIRO_CFLAGS="$PNG_CFLAGS $xlib_CFLAGS $xlib_xrender_CFLAGS $pixman_CFLAGS $FONTCONFIG_CFLAGS $FREETYPE_CFLAGS"
 
   sed 's|use_png=no|use_png=yes|' -i configure
 
@@ -33,7 +37,24 @@ build() {
               --enable-xlib=yes \
               --enable-xlib-xrender=yes \
               --enable-png=yes \
-              --enable-ft=yes   
+              --enable-ft=yes
+
+  sed -i $(find . -type f -name Makefile) \
+      -e "s|png_LIBS =.*|png_LIBS = $png_LIBS|" \
+      -e "s|png_CFLAGS =.*|png_CFLAGS = $png_CFLAGS|" \
+      -e "s|xlib_LIBS =.*|xlib_LIBS = $xlib_LIBS|" \
+      -e "s|xlib_CFLAGS =.*|xlib_CFLAGS = $xlib_CFLAGS|" \
+      -e "s|xlib_xrender_LIBS =.*|xlib_xrender_LIBS = $xlib_xrender_LIBS|" \
+      -e "s|xlib_xrender_CFLAGS =.*|xlib_xrender_CFLAGS = $xlib_xrender_CFLAGS|" \
+      -e "s|pixman_LIBS =.*|pixman_LIBS = $pixman_LIBS|" \
+      -e "s|pixman_CFLAGS =.*|pixman_CFLAGS = $pixman_CFLAGS|" \
+      -e "s|FONTCONFIG_LIBS =.*|FONTCONFIG_LIBS = $FONTCONFIG_LIBS|" \
+      -e "s|FONTCONFIG_CFLAGS =.*|FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS|" \
+      -e "s|FREETYPE_LIBS =.*|FREETYPE_LIBS = $FREETYPE_LIBS|" \
+      -e "s|FREETYPE_CFLAGS =.*|FREETYPE_CFLAGS = $FREETYPE_CFLAGS|" \
+      -e "s|CAIRO_LIBS =.*|CAIRO_LIBS = $CAIRO_LIBS|" \
+      -e "s|CAIRO_CFLAGS =.*|CAIRO_CFLAGS = $CAIRO_CFLAGS|"
+
   make
   make DESTDIR=$PKG install
   rm -rf $PKG/usr/share