svn commit: r353249 - in head: games/netradiant graphics/GraphicsMagick13 graphics/ImageMagick graphics/gdal graphics/gstreamer1-plugins-webp graphics/ida graphics/imageworsener graphics/leptonica ...

[Wolfgang Jenkner]

On Thu, May 08 2014, Sunpoet Po-Chuan Hsieh wrote:

> Modified: head/graphics/webp/Makefile
[...]
>  LDFLAGS+=	-L${LOCALBASE}/lib
[...]
> Modified: head/graphics/webp/pkg-plist
[...]
> -lib/libwebp.la
>  lib/libwebp.so
> -lib/libwebp.so.4
> +lib/libwebp.so.5
> +lib/libwebp.so.5.0.0
[...]
> -lib/libwebpdemux.la
>  lib/libwebpdemux.so
> -lib/libwebpdemux.so.0
> +lib/libwebpdemux.so.1
> +lib/libwebpdemux.so.1.0.0

Updating from webp-0.3.1_5 to webp-0.4.0 appeared to succeed, but

$ ldd /usr/local/lib/libwebpdemux.so.1
/usr/local/lib/libwebpdemux.so.1:
	libwebp.so.4 => /usr/local/lib/compat/pkg/libwebp.so.4 (0x801603000)
	libthr.so.3 => /lib/libthr.so.3 (0x801858000)
	libc.so.7 => /lib/libc.so.7 (0x80081e000)
	libm.so.5 => /lib/libm.so.5 (0x801a7d000)
$ 

So, in the staging phase, libtool picks up the old libwebp.so.4 instead
of linking to the new libwebp.so.5.  Now, while there seem to be some
limitations in libtool's support for staging - see the explanation of
the -inst-prefix-dir switch in the `(libtool) Install mode' info node -
I don't understand if they apply here.

In any case, the following patch seems to be a work-around, at least.

Index: webp/Makefile
===================================================================
--- webp/Makefile	(revision 353374)
+++ webp/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	webp
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
@@ -24,7 +25,11 @@
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
+# While staging, trick libtool into linking libwebp(de)?mux with the
+# already staged libwebp, not with some previously installed one.
+# Those LDFLAGS end up in the *.la files, but we don't install them
+# anyway;-)
+LDFLAGS+=	-L${STAGEDIR}${PREFIX}/lib -L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-libwebpdecoder \
 		--enable-libwebpdemux  \
 		--enable-libwebpmux \