Backport webp detection patch from upstream, thanks Charlie Gehlin <charlie@gehlin.com> in bug #537240

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 85 insertions, 7 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index bb715369ce86..96fe43c371e6 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.150 2015/01/21 09:59:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.151 2015/01/22 09:24:32 voyageur Exp $
+
+  22 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  windowmaker-0.95.6.ebuild, +files/windowmaker-0.95.6-webp_detection.patch:
+  Backport webp detection patch from upstream, thanks Charlie Gehlin
+  <charlie@gehlin.com> in bug #537240
 
   21 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org>
   windowmaker-0.92.0-r11.ebuild, -windowmaker-0.95.3-r1.ebuild,
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 9ede5d42ad02..e6b04384e55f 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051f06672b80b59ddf7a75805ae22376565f958c9682 SHA512 9ebf6ec14cfe821eb69d8385b3009953bfc58da576f06d22291d2acb112635ffd0a89c5388656fff76f07d7aef8f68a6226b8621b776b1f7437f73159ef6d349 WHIRLPOOL edde5e6d86da9fee9d9acb1cd75244554c455fabe0bb5705a25837e09f5cb0f6c2a825a96584ae7068c1194bfe63632ff28d7136832217f3dbb694d77809ae9c
 AUX windowmaker-0.95.5-bsd_crash.patch 963 SHA256 189bde88d72d65b0412bf7f08d2bddc8f952d942d7a0cab49d3391292dcd47ba SHA512 66611ecb7b8aa43c8884734472bd41f2912a5a86c93ad908313171041a2665d08e9131270b21d3466dd3c844dab09faa099bf01e2fa2a4a81bb3910073490c3e WHIRLPOOL 78ec84ed9c61b6ece3db15bc0e5137c66d37335c9e64494bc1cd82f4a157c8e26e73796d0fb7c2706dc2cb3b9bd84b759d8570a1a3a17eb9d7d6ac9a623803ae
+AUX windowmaker-0.95.6-webp_detection.patch 2992 SHA256 66e3abff872d1d54cf3bd0926a03c96c7b8a4f9677e07d4878a3cb45441df3bc SHA512 af7d7c77f06f2cea11d1271174cbb9e8ec2177f24ee889e97b5c10e8ec82ae24f82140af8aee65949aae24caf4318f1189dee025d02f3934aa9207cf4dd798db WHIRLPOOL 3677e6d6e618e6856cf7a998ec81551a6c2ffb9ed4d539dd21f84669c960a4ea3794cfa4b8562ebc631704cf75db02e584fc783b5d0b94ff14d55a01a9003a41
 AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b
 DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 SHA512 3db6d7128d49ecd87d46893c63efcdda07f841bdfd5961462c0c9247d4f3937835f637dc7f4fa7169f6999595afca914c611f4249915700a461130c5a3c865d2 WHIRLPOOL 8d9395c79cdb23d4d6011dc5a1383852890f2d02fa0038a80cf81e2135b4a904065b4051fd1be07818136442f5ac792459f5cc81bc75ba090c1728aa4e4ef4cd
 DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da
@@ -11,13 +12,13 @@ DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da3723
 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc SHA512 9edc25386658e5ddeaee2e3c7f396adbe16e9fdccde906f7b69bca95b1e0b33a2b2481fa445f5cf5b8e6b2492ca1b8409615e7a66f7d039d449d099523c4c779 WHIRLPOOL 62b42d533f2c2c22259aa0004ab995472e455997ccb6074e3f5b599b22cdd1c640003b6903c104e8663e62be312254afbc4d4147366af72eb16227b36eacd77c
 EBUILD windowmaker-0.92.0-r11.ebuild 6334 SHA256 0ceefd4d41b7b50ae6aed6e78b6b3eeb142f33d310d03017046f580711310b72 SHA512 ec73ab2a357ea8957e5692ff3a823ec3dbeec1492ea71229bbc0e6344b044e5957d241f735bdda79519a1c0b756f8ff642f53029922386efa6bfcfef2e84b6a2 WHIRLPOOL 392cd74ecb34fc3c424020b9900e8e56592cb39af969a8bc4c621150e44d98051d2df54880c00beb49bee8feb43ae50b7bf3878210a785809e0d0cdb5ac49026
 EBUILD windowmaker-0.95.5-r1.ebuild 3026 SHA256 59857274e47be506e5970c20ac91632bd422c970beb22749c24f686883c1b8a6 SHA512 cd3cdaf31a2bc6ebd1b31f5b2aebcfced0fc3cd1a84d4f8b3a7607e7b30c0e63d79141f5e77dbf8f31b8a13f2f2d379da0a3b6bc9c8c40c4715fd8aebae58071 WHIRLPOOL 141078c578746fbad61e9f40158d37cabd07610e5cb839230241609cd8b5bd976c19e6dcc25d48f8db6fc1bb742d48c8bd799ac944e8c01b47fc31dec227c129
-EBUILD windowmaker-0.95.6.ebuild 3141 SHA256 104914243ce17296a20fbcbd1ad7f8b8e043c643cf904aeaca1689d7b66f93b5 SHA512 6dd3e14ce8df38ac60a55e884eb8d5dce2fa96d89f60eb8ad330d39b542ce1155dc23bfb729244cb0a49153119c29e46d17b5ad0b12c937dccb6b0a6490403fe WHIRLPOOL dc533c0dfd29d28ca8d66a2d9e8291d592d8e04588850070c01f245d6696e8347c2bcf23b0255ac69faf6bb7d685bc79907989219b30f549879f2e657834c4df
-MISC ChangeLog 30747 SHA256 aa8acc72e2d5259bf64dba51c9be91128c7585853588bce00e0d8fdb2c9ea542 SHA512 d8fc8375e2561d9dbe33927aaac46a165742c8d111e1ae2ac06c338a71e57467db9a5b2115deb4f1841f9eac8c106b3da90855aee2a0b086715496fcde68b8d3 WHIRLPOOL c31da5e74ae5c12589d928717bb9e062acda1704a34627dba458859ffd2922a14642a68f02c6738c8a249c150c6b6f4667e9459ae33cc7ef448c0e69f52f8408
+EBUILD windowmaker-0.95.6.ebuild 3190 SHA256 21bcfae9dd9731bad4d48e1dbdaa3672c581150f3704c1f5474c0ceaa485543d SHA512 98a97dc217d0897974ea77b9690a535d9f7733e32dac0368ec1e6b7b1ff0753b077ea6baf40b6a9eb74d6d0e058ebfa7a89c7f4986a85f3ab7cb2a62e0bf2cb7 WHIRLPOOL 33b8c545b5ccb8fbabf9960522bde75d53c0df0c394c70f440e6347b82e58339d93e05c2f0b074d35769828e73d3eba47467ca7e33944ec47fea69a36cb8b1ea
+MISC ChangeLog 30987 SHA256 8bd649eaaff5889a4891595309b707da16d64a4fc9b3ff781eb01f6e76c96740 SHA512 abdc7f7bd2e79ea8c412ca4880792c402d9ceb4f98f4cebeca7f8fca4e6e82e7b26195e9b4c5e307b1f93a235ba5c85bc61c5b34b009b86ff47742baa4458ad4 WHIRLPOOL d36c868bc114bfc11de721a6d9ac0d754e620b8ed38fc0c6279a2c494d84ff74d99c0a89a208ccdd0dc248843b6512a591eaf8cb46b44ca567da548e8268c079
 MISC metadata.xml 620 SHA256 0ed7b6436038ef56a72ed6b7aaa6b90a89712e783673f28a725637fd257c1943 SHA512 fbb6a93b3ea2d0264ab6b423b90d26094c2e4b8afe97306c642e3ef7c54e58118bf417cd4e5c44425ce89fca73a9d2889986f779cbad8645a016abdaf60d2397 WHIRLPOOL c3bebfecf2ab99b90f2501185bab2641c44d55e59537eb887a23c8f19cc0779c5440c4e502dde27eba938da6078375093b1756bb4589d5355e27384e2bea1f2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS/eIYACgkQFYEBGcdFJfLddAEAnJfkG4SWakC1yLl7IPzLBwAa
-RlCTo9NJujhqXrIi6D4A/24yZIs+EAfzUJZv2HhNa5UALDxKlQ1esF/wbG3DGdXc
-=DPtI
+iF4EAREIAAYFAlTAwdsACgkQFYEBGcdFJfKU+wD8DZMGXgcHKQTwcoi6lblafrQ8
+/jKEa4HDWPNgysCEv4sA/ijYF35jQdyZHVjgGl8At/KFilDz7MNH00PIR8zel19A
+=Wl7q
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch b/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch
new file mode 100644
index 000000000000..a451486288f6
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch
@@ -0,0 +1,70 @@
+From e1146e56e08af2a66aecedffc6ff31d8ddcb25f3 Mon Sep 17 00:00:00 2001
+From: Christophe CURIS <christophe.curis@free.fr>
+Date: Mon, 15 Dec 2014 23:49:29 +0100
+Subject: [PATCH] configure: rewrote the detection for WebP image library
+
+Unfortunately, the detection was broken because the header is using a hack
+on the function name to provide compatibility between different versions of
+the API, which means the usual link test, which uses a known name of a
+symbol, cannot work without also using the header to get the hack applied
+on the function's name.
+
+The new detection mechanism now simply check for both header and link at
+the same time, so we're probably safe until a Major API change is decided,
+in which case we will also have to update WRaster's code anyway.
+
+Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
+---
+ m4/wm_imgfmt_check.m4 |   36 ++++++++++++++++++++++++++++--------
+ 1 files changed, 28 insertions(+), 8 deletions(-)
+
+diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
+index cad2d72..d07e618 100644
+--- a/m4/wm_imgfmt_check.m4
++++ b/m4/wm_imgfmt_check.m4
+@@ -187,14 +187,34 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_TIFF],
+ # the variable 'supported_gfx'
+ # When not found, append info to variable 'unsupported'
+ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_WEBP],
+-[WM_LIB_CHECK([WEBP], ["-lwebp"], [VP8DecodeLayer], [$XLFLAGS $XLIBS],
+-    [wm_save_CFLAGS="$CFLAGS"
+-     AS_IF([wm_fn_lib_try_compile "webp/decode.h" "" "return 0" ""],
+-         [],
+-         [AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header - are you missing libwebp-dev package?])])
+-     CFLAGS="$wm_save_CFLAGS"],
+-    [supported_gfx], [GFXLIBS])dnl
+-]) dnl AC_DEFUN
++[AS_IF([test "x$enable_webp" = "xno"],
++    [unsupported="$unsupported WebP"],
++    [AC_CACHE_CHECK([for WebP support library], [wm_cv_imgfmt_webp],
++        [wm_cv_imgfmt_webp=no
++         dnl
++         dnl The library is using a special trick on the functions to provide
++         dnl compatibility between versions, so we cannot try linking against
++         dnl a symbol without first using the header to handle it
++         wm_save_LIBS="$LIBS"
++         LIBS="$LIBS -lwebp"
++         AC_TRY_LINK(
++             [@%:@include <webp/decode.h>],
++             [WebPGetFeatures(NULL, 1024, NULL);],
++             [wm_cv_imgfmt_webp="-lwebp"])
++         LIBS="$wm_save_LIBS"
++         AS_IF([test "x$enable_webp$wm_cv_imgfmt_webp" = "xyesno"],
++              [AC_MSG_ERROR([explicit WebP support requested but no library found])])dnl
++        ])
++     AS_IF([test "x$wm_cv_imgfmt_webp" = "xno"],
++         [unsupported="$unsupported WebP"
++          enable_webp="no"],
++         [supported_gfx="$supported_gfx WebP"
++          WM_APPEND_ONCE([$wm_cv_imgfmt_webp], [GFXLIBS])dnl
++          AC_DEFINE([USE_WEBP], [1],
++              [defined when valid Webp library with header was found])])dnl
++    ])
++AM_CONDITIONAL([USE_WEBP], [test "x$enable_webp" != "xno"])dnl
++])
+ 
+ 
+ # WM_IMGFMT_CHECK_XPM
+-- 
+1.7.6.6.GIT
+
diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
index 45e1dcc258b3..2b637985cbb7 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.3 2015/01/21 09:59:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.4 2015/01/22 09:24:32 voyageur Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -45,6 +45,8 @@ src_prepare() {
 	done;
 
 	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	epatch "${FILESDIR}"/${P}-webp_detection.patch
+
 	eautoreconf
 }