X-Git-Url: http://gitweb/?a=blobdiff_plain;f=imlib2%2FPkgfile;h=5908783c837aca035e4b53149e67fb0fdfe66f20;hb=70fa2a187ce30bba0de2b216bb0798d115afd3da;hp=787e3e92629300bdfbd1011a36e6fd119cdc4cac;hpb=8f3b1bae18dfaf72bc71e311f8260cf6b9d0bfaa;p=attic%2Fports%2Fopt-cross.git

diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile
index 787e3e9..5908783 100644
--- a/imlib2/Pkgfile
+++ b/imlib2/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://freshmeat.net/projects/imlib2/
 # Packager: Matt Housh jaeger at morpheus dot net
 # Maintainer: Jose V Beneyto sepen at users dot sourceforge dot net
-# 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: freetype libpng libtiff libungif xorg-libsm xorg-libxext
 
 name=imlib2
 version=1.4.2
-release=1
+release=2
 source=(http://dl.sourceforge.net/sourceforge/enlightenment/$name-$version.tar.bz2)
 
 build() {
@@ -23,7 +23,9 @@ build() {
   export BZ2LIBS="$DEFAULT_LIBS"
   export ZLIBLIBS="$DEFAULT_LIBS"
   export X_LIBS="$DEFAULT_LIBS -lX11 -lXext -lSM"
-
+  export my_libs="-lfreetype -lz -L$CLFS/usr/lib -lX11 -lXext -ldl -lm"
+  export my_includes="-I$CLFS/usr/include/freetype2 -I$CLFS/usr/include"
+  
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -34,8 +36,16 @@ build() {
               --with-bzip2 \
               --with-zlib \
               --with-x \
-              --without-id3
+              --without-id3 \
+              --x-includes=$CLFS/usr/include/X11 \
+              --x-libraries=$CLFS/usr/lib/X11
 
+  sed "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib|g" -i imlib2-config
+  find -type f -name 'Makefile*' \
+    -exec sed -e "s|-I/usr/include|-I$CLFS/usr/include|g" \
+    -e "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib|g" \
+    -e "s|-L/usr/lib|-L$CLFS/usr/lib|g" -i {} \;
+  
   make
   make DESTDIR=$PKG install
 }