# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1324551880 -3600
# Node ID 0a1c7cb195fa573be43d9a45df61e87c85b6a4f2
# Parent  a30157a3ce8e3005fc2fc46b81a3bed560dce56e
packages sdl_image vigra: use pkg-config for png and tiff

diff -r a30157a3ce8e -r 0a1c7cb195fa src/sdl_image.mk
--- a/src/sdl_image.mk	Thu Dec 22 09:58:03 2011 +0100
+++ b/src/sdl_image.mk	Thu Dec 22 12:04:40 2011 +0100
@@ -20,8 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i 's,^\(Requires:.*\),\1 libpng,' '$(1)/SDL_image.pc.in'
-    echo 'Libs.private: -ltiff -ljpeg -lz' >> '$(1)/SDL_image.pc.in'
+    $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng,' '$(1)/SDL_image.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
diff -r a30157a3ce8e -r 0a1c7cb195fa src/vigra.mk
--- a/src/vigra.mk	Thu Dec 22 09:58:03 2011 +0100
+++ b/src/vigra.mk	Thu Dec 22 12:04:40 2011 +0100
@@ -39,5 +39,5 @@
     $(TARGET)-g++ \
         '$(2).cpp' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \
         -DVIGRA_STATIC_LIB \
-        -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR --cflags --libs` -ltiff -lpng -ljpeg -lz
+        -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg
 endef