summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gdk-pixbuf2-xlib/Makefile45
-rw-r--r--graphics/gdk-pixbuf2-xlib/PLIST6
-rw-r--r--graphics/gdk-pixbuf2/Makefile22
-rw-r--r--graphics/gdk-pixbuf2/Makefile.version5
-rw-r--r--graphics/gdk-pixbuf2/PLIST72
-rw-r--r--graphics/gdk-pixbuf2/distinfo13
-rw-r--r--graphics/gdk-pixbuf2/patches/patch-configure14
-rw-r--r--graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in24
-rw-r--r--graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in25
9 files changed, 68 insertions, 158 deletions
diff --git a/graphics/gdk-pixbuf2-xlib/Makefile b/graphics/gdk-pixbuf2-xlib/Makefile
index 5160c47df04..b6b698fb0da 100644
--- a/graphics/gdk-pixbuf2-xlib/Makefile
+++ b/graphics/gdk-pixbuf2-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/08 16:52:11 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/07/21 10:11:13 wiz Exp $
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
PKGNAME= gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
@@ -7,33 +7,46 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.gnome.org/
-COMMENT= Image loaders for gtk2
+HOMEPAGE= https://developer.gnome.org/gdk-pixbuf
+COMMENT= Image loaders for gtk2 (X11 support)
LICENSE= gnu-gpl-v2
PATCHDIR= ${.CURDIR}/../../graphics/gdk-pixbuf2/patches
DISTINFO_FILE= ${.CURDIR}/../../graphics/gdk-pixbuf2/distinfo
-BUILD_DIRS= contrib/gdk-pixbuf-xlib
-INSTALL_DIRS= contrib/gdk-pixbuf-xlib
CONFLICTS+= gtk2+<2.22
.include "../../graphics/gdk-pixbuf2/Makefile.version"
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-libjpeg
-CONFIGURE_ARGS+= --without-libpng
-CONFIGURE_ARGS+= --without-libtiff
-CONFIGURE_ARGS+= --with-x11
-PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
-PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
+USE_TOOLS+= gmake pkg-config
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
+MESON_ARGS+= -D installed_tests=false
+MESON_ARGS+= -D x11=true
+PKGCONFIG_OVERRIDE_STAGE=pre-install
+PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-xlib-2.0.pc
+
+post-install:
+ ${RM} -rf ${DESTDIR}${PREFIX}/*
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
+ ${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
+ ${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so* ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdk-pixbuf-xlib-2.0.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../devel/py-meson/build.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection:= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf2-xlib/PLIST b/graphics/gdk-pixbuf2-xlib/PLIST
index 9faad05bcc9..47fcbff94b8 100644
--- a/graphics/gdk-pixbuf2-xlib/PLIST
+++ b/graphics/gdk-pixbuf2-xlib/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/16 16:46:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/21 10:11:13 wiz Exp $
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-lib/libgdk_pixbuf_xlib-2.0.la
+lib/libgdk_pixbuf_xlib-2.0.so
+lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.so.0.3800.1
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 5291f3f59ff..83ab80b1f95 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/10/15 23:19:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.36 2019/07/21 10:11:13 wiz Exp $
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
PKGNAME= ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -15,22 +15,18 @@ CONFLICTS+= gtk2+<2.22
.include "../../graphics/gdk-pixbuf2/Makefile.version"
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
-PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
+USE_TOOLS+= gmake pkg-config
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
+
+MESON_ARGS+= -D installed_tests=false
+MESON_ARGS+= -D x11=false
+PKGCONFIG_OVERRIDE_STAGE=pre-install
+PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-2.0.pc
_BUILDING_GTK2= yes
.include "loaders.mk"
-# We remove the loader database during post-install since we create it
-# anew in the +INSTALL script as part of the POST-INSTALL action.
-#
-post-install:
- ${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
-
+.include "../../devel/py-meson/build.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
.include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf2/Makefile.version b/graphics/gdk-pixbuf2/Makefile.version
index 86856cdf521..33a75ca0f24 100644
--- a/graphics/gdk-pixbuf2/Makefile.version
+++ b/graphics/gdk-pixbuf2/Makefile.version
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.version,v 1.21 2018/04/16 12:22:40 wiz Exp $
+# $NetBSD: Makefile.version,v 1.22 2019/07/21 10:11:13 wiz Exp $
#
# used by graphics/gdk-pixbuf2/Makefile
-# used by graphics/gdk-pixbuf2-jasper/Makefile
# used by graphics/gdk-pixbuf2-xlib/Makefile
-PIXBUF2_VERSION= 2.36.12
+PIXBUF2_VERSION= 2.38.1
MSITE_VERSION= ${PIXBUF2_VERSION:R}
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index d2855985de7..c6638e6ec62 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/05/14 12:55:16 spz Exp $
+@comment $NetBSD: PLIST,v 1.17 2019/07/21 10:11:13 wiz Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-pixdata
bin/gdk-pixbuf-query-loaders
@@ -16,61 +16,27 @@ include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
-lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
+lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
lib/girepository-1.0/GdkPixbuf-2.0.typelib
-lib/libgdk_pixbuf-2.0.la
+lib/girepository-1.0/GdkPixdata-2.0.typelib
+lib/libgdk_pixbuf-2.0.so
+lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf-2.0.so.0.3800.1
lib/pkgconfig/gdk-pixbuf-2.0.pc
-man/man1/gdk-pixbuf-csource.1
-man/man1/gdk-pixbuf-query-loaders.1
share/gir-1.0/GdkPixbuf-2.0.gir
-share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
-share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
-share/gtk-doc/html/gdk-pixbuf/api-index-full.html
-share/gtk-doc/html/gdk-pixbuf/composite.png
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Scaling.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Utilities.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-XlibRGB.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
-share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
-share/gtk-doc/html/gdk-pixbuf/home.png
-share/gtk-doc/html/gdk-pixbuf/index.html
-share/gtk-doc/html/gdk-pixbuf/left-insensitive.png
-share/gtk-doc/html/gdk-pixbuf/left.png
-share/gtk-doc/html/gdk-pixbuf/license.html
-share/gtk-doc/html/gdk-pixbuf/right-insensitive.png
-share/gtk-doc/html/gdk-pixbuf/right.png
-share/gtk-doc/html/gdk-pixbuf/rn01.html
-share/gtk-doc/html/gdk-pixbuf/rn02.html
-share/gtk-doc/html/gdk-pixbuf/style.css
-share/gtk-doc/html/gdk-pixbuf/up-insensitive.png
-share/gtk-doc/html/gdk-pixbuf/up.png
+share/gir-1.0/GdkPixdata-2.0.gir
share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index ce5b7ffb2f7..5730b2120d3 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.39 2018/04/16 12:22:40 wiz Exp $
+$NetBSD: distinfo,v 1.40 2019/07/21 10:11:13 wiz Exp $
-SHA1 (gdk-pixbuf-2.36.12.tar.xz) = 2a32bf71fd7c47b22abd9843bc3116e771772fbe
-RMD160 (gdk-pixbuf-2.36.12.tar.xz) = 283963dfc2e04e7f51a3b195afb514379ecfda7b
-SHA512 (gdk-pixbuf-2.36.12.tar.xz) = 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
-Size (gdk-pixbuf-2.36.12.tar.xz) = 5675768 bytes
-SHA1 (patch-configure) = 8078e64aae9b3897819635851c72d0ba6d377b18
-SHA1 (patch-contrib_gdk-pixbuf-xlib_Makefile.in) = 636ab94c6bfde10c118b7833b4637a586781bfd5
-SHA1 (patch-gdk-pixbuf_Makefile.in) = 9173c4dbc89e4a4d34359e52885121c19a8a7ba6
+SHA1 (gdk-pixbuf-2.38.1.tar.xz) = 52a3ac673ec558e3eabb611256b74432b29945d7
+RMD160 (gdk-pixbuf-2.38.1.tar.xz) = 4404509b3d51958afbba6bb2c3e8a10671622092
+SHA512 (gdk-pixbuf-2.38.1.tar.xz) = e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
+Size (gdk-pixbuf-2.38.1.tar.xz) = 5509328 bytes
SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
diff --git a/graphics/gdk-pixbuf2/patches/patch-configure b/graphics/gdk-pixbuf2/patches/patch-configure
deleted file mode 100644
index 12c8281871f..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2017/10/16 09:37:27 adam Exp $
-
-Fix libtiff detection.
-
---- configure.orig 2017-08-19 17:24:07.000000000 +0000
-+++ configure
-@@ -18799,6 +18800,7 @@ $as_echo "yes" >&6; }
-
- fi
- libtiff_found=yes
-+ LIBTIFF=-ltiff
- fi
-
- if test x$with_libtiff != xno && test x$libtiff_found = xno; then
diff --git a/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in b/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in
deleted file mode 100644
index a8e8ad3b2bd..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-contrib_gdk-pixbuf-xlib_Makefile.in,v 1.1 2017/01/29 06:09:51 tsutsui Exp $
-
-* Adjust dependencies for pkgsrc/graphics/gdk-pixbuf2-xlib
-
---- contrib/gdk-pixbuf-xlib/Makefile.in.orig 2017-01-16 18:32:24.000000000 +0000
-+++ contrib/gdk-pixbuf-xlib/Makefile.in
-@@ -141,7 +141,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
-+libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = \
- $(am__DEPENDENCIES_1)
- am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \
- gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \
-@@ -439,7 +439,7 @@ libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
- -version-info $(LT_VERSION_INFO)
-
- libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
-+ $(prefix)/lib/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
- $(GDK_PIXBUF_XLIB_DEP_LIBS)
-
- libgdk_pixbuf_xlib_2_0_la_SOURCES = \
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in
deleted file mode 100644
index a8ff04c1a58..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-gdk-pixbuf_Makefile.in,v 1.1 2017/01/29 06:09:51 tsutsui Exp $
-
-* Adjust dependencies for pkgsrc/graphics/gdk-pixbuf2-jasper
-
---- gdk-pixbuf/Makefile.in.orig 2017-01-16 18:32:24.000000000 +0000
-+++ gdk-pixbuf/Makefile.in
-@@ -394,8 +394,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
- $(LDFLAGS) -o $@
- @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \
- @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ $(loaderdir)
--libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_2)
-+libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
- libpixbufloader_jasper_la_OBJECTS = \
- $(am_libpixbufloader_jasper_la_OBJECTS)
-@@ -1136,7 +1135,7 @@ libpixbufloader_icns_la_LIBADD = $(modul
- libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
- libpixbufloader_jasper_la_SOURCES = io-jasper.c
- libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
-+libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(PREFIX)/lib/libgdk_pixbuf-2.0.la
-
- #
- # The QTIF loader