Mercurial > mxe-octave

changeset 2183:0a1c7cb195fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packages sdl_image vigra: use pkg-config for png and tiff
author Mark Brand <mabrand@mabrand.nl>
date Thu, 22 Dec 2011 12:04:40 +0100
parents a30157a3ce8e
children c1915a09ac58
files src/sdl_image.mk src/vigra.mk
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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