From 20d0f47bf0f556927fbc48aeb40d24c195050e51 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 22 Dec 2011 12:04:40 +0100
Subject: packages sdl_image vigra: use pkg-config for png and tiff

---
 src/sdl_image.mk | 3 +--
 src/vigra.mk     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/sdl_image.mk b/src/sdl_image.mk
index ac2cc0a..b140ef3 100644
--- a/src/sdl_image.mk
+++ b/src/sdl_image.mk
@@ -20,8 +20,7 @@ define $(PKG)_UPDATE
 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 --git a/src/vigra.mk b/src/vigra.mk
index e0e0150..3243e3d 100644
--- a/src/vigra.mk
+++ b/src/vigra.mk
@@ -39,5 +39,5 @@ define $(PKG)_BUILD
     $(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
-- 
cgit v0.12