Fix for openjpeg-2.1 (bug 520774).

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 37 insertions, 11 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index ed1f884ea68f..1d72cb8e572f 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.107 2014/08/25 09:06:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.108 2014/08/25 09:38:00 xmw Exp $
+
+  25 Aug 2014; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.5-openjpeg-2.1.patch, mupdf-1.5.ebuild, mupdf-9999.ebuild:
+  Fix for openjpeg-2.1 (bug 520774).
 
   25 Aug 2014; Michael Weber <xmw@gentoo.org> mupdf-1.1_p20121127.ebuild,
   mupdf-1.3_p20140118.ebuild, mupdf-1.4-r1.ebuild, mupdf-1.5.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 22fb1b03c511..0f5d955638cf 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -16,6 +16,7 @@ AUX mupdf-1.3-sys_curl.patch 272 SHA256 0fc67e0b7678967527124ae65555f762664cd935
 AUX mupdf-1.3-zoom-2.patch 214 SHA256 450b10fd3b9ed1d91df283db0086f89b02b9ff7f8a4d24f792ce6ea76f0c93e8 SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3 WHIRLPOOL 47eb252b06e32cea80c5861f94ae5f391c6f803a0ee7dc8765d4eb7decc516936a0821c821957d17ab9a6f5b6d5c16bf071ad201bb1eea14cd04911059d3735d
 AUX mupdf-1.4-old-debian-files.patch 13411 SHA256 469c1d1fe0806687d26d04a7352aab86f88e871a52f8fdc29dec2d74eddc1169 SHA512 b52f8bd62d515797875204f7aab516f7f24eaade7976d78b470f351579f649a4cad40d085d79d3fcb1ea58356683dac6c39e4aee2131894a2673ce09bb574748 WHIRLPOOL 37eda12ef5b3817d0cecfe6f67a7cc9f2808452e727e1c1aa680c4ab30ccfcfe8817602a8ab980415022a380a0728694fb30241960c9f712acdb51df23ee9774
 AUX mupdf-1.5-Makerules-openssl-curl.patch 750 SHA256 5c485ac279d895afd25f2ced4a557de61182abc29ff09ef89a06718921863b10 SHA512 39d01ebd668abbbe544919f718d6ae3b150e3144e0c6dc01f36a97f5fb6e96fb6740f625a8d258cfc5a47705c9e1481c0ede782d7a817288e8052f223e456615 WHIRLPOOL 66ed76bf45f57f778fb3f39f947d936e967521b01d9f56673b8344f42d77d35be24f984467cce62e564ee2d023979722d274f5f291263b4bd29fee435438499e
+AUX mupdf-1.5-openjpeg-2.1.patch 455 SHA256 7b49af879df5eb2c79884a0983635fa335422edc9854bc4fbc44f653892827f2 SHA512 0a07dc0a0312ef0b6a20f6a89da7a2010008cf804a1c9b33667b17f263a69e46047a34dcb24e8015a98a61e28e1e302dc302c0fbb7303a61b00d9490146b7b83 WHIRLPOOL c971fbb370c83b2c25b180ee05149c030a67b887091d623f77e8a56b48a6eb93a586599029f16abe4355bc3ff490b266324fb8877626022d134e7f4d178057e6
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
 DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
@@ -25,16 +26,16 @@ EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 a08ee7cf473fdc0dc524ae23356484895c
 EBUILD mupdf-1.2.ebuild 3259 SHA256 00fa6f25eceae7e70590e37dc6173830d3042fc7ce4ae24f4969f3dbf3ac17cc SHA512 495388528ca026e6d5b1b33e0b7449c48c34006791bd969cd181757175928e7003a4cb0f72839627442feee1eaee49065f0db68e4cf11912da2c970e5d8f32bf WHIRLPOOL 0c010b3dee2bb4378f96b95637867a88d139f9f7dbdf083705a1fbd7491849556f7721ee49cef0afcaf8cedd2793c17df6c14e08a919e875eeb23debfb4820ba
 EBUILD mupdf-1.3_p20140118.ebuild 3881 SHA256 e03bf913055b98d0b80951994c1159588c923dee925e0ea23e0b1f3de8a1f29b SHA512 558d3244a5e71f3c7b984f0a408381ebe79717395fe4ae93849eecad6a1f30239503f15615464491b94a7957c2dfee7d89dd1b52688b31abb7bbd080131ec035 WHIRLPOOL 0c1e94309219a7873afd4cfd5d73da9d7ab21f89048314b0372f31e5d6cdc909d83d09ffe04f9fd8d56a46cd9a547b61567f330f155e2e07418417b5c7b5d036
 EBUILD mupdf-1.4-r1.ebuild 3866 SHA256 b1a968f042f4b8ea6e841735bf50b477efe7092ad3829a9aa9b770da2e09782b SHA512 c5aab9af29eca124fccc31dc91ce8345ee3935415db49851af17164363f07a0592a04aa7279fb10629be32936fd2189ec010cf22f01b2c74ff1f1000b9418039 WHIRLPOOL 9695ce9cf72afaa9299b3c5d4ab646b7f9321f74297716a83a676fb75557a7fa65a12be7ecd1be5a0df8f5e7a3823b5c0d1407c98d31e20aa9c03f72c6df89e3
-EBUILD mupdf-1.5.ebuild 3836 SHA256 f323bc2ddbc8d7645354258b87eb46e1cab68349f23bfed428347ced399c5573 SHA512 e15da8ae68b071e6da1bb8e52f1a4cc301e6cef7b6d32dd72a967218052087c9c4598348638408fdd60e79812870f49e8b57cf41e831f9e866d5a506fc2722b6 WHIRLPOOL 5ced0903ffcc34a7049a01813909fbd1240f3ea9f1c4c1059f5bc486af6f7a1029f352aa4842d85dfb1a7ab622ff5213777fef314833bca3809951e60ff61245
-EBUILD mupdf-9999.ebuild 3673 SHA256 7a95c3a456f455ae73f5ee5f3b09aea841782dc628dbb0a93680d68a4db37917 SHA512 91ac75caf38430ea879a5589fd0a310577a44b3ccb099f03e141821a46f466b40babcc03ad011fe4a805961d762c9bef070c97dd0132130c82d865c50af3c2df WHIRLPOOL bf089af58e99d3c06f8a056ee4413c6c8b2024500e9a8cc7d98ac152c5b829fb3233cfbe57a7b8c0580b5a6ec818ee349a1b2ce3dfcbf76ea0f1866560603131
-MISC ChangeLog 16845 SHA256 57e4ae822208b4edd176d1751a672312f07ffe7b443f8d831179255158d1ded5 SHA512 cdd196884a9a19f62e7995664b44506f1c61e37a5ebbcbb5b0c018702e22b8f89b48bac6563d89b9efedcff2823b3ca18e19f48f8fbf744144ac13a0a1b35837 WHIRLPOOL ba8f5fdf9859a876b4aff2b7562adeffc249d3104fa7fee6cb253abc140d434d6442305fe0bc64fc77220f534380c990c7a0f59b9046743d44a6085bfdbd0f72
+EBUILD mupdf-1.5.ebuild 3946 SHA256 124080478798f50dc1eaf88ff672d6ce2e51e41199929c8b3162a1e7e0aecb7e SHA512 20f0467fdf622273d9bd897ad02ca44af53bb0f7fd66075f7d0170109c13956743ba4c01e9d5c4d89393d3bd2a52483fddc8ef7e37dde5adc5fb803fd8085353 WHIRLPOOL e4255e36e2c73401a2adaf942e366161888deb3d700d696183f31294241dd7b15a87a2797f585d2480454464315d31321fffdcb6061f26ac630a5dc9e8b12373
+EBUILD mupdf-9999.ebuild 3788 SHA256 2d0daaa0a3e09118c906218241bad6e7ac4b14d55b0c92c109f07b61441d1be6 SHA512 d7e10b1a6075050a905866699292cb3cdc9b068b85b73dc78f271e685f3c1434505b0b3ffff640d2dc649cb9bde10c224c67a6fc080bd23ea19aac82231597e2 WHIRLPOOL bc9ac56b1ed7412452f8bbd5a7a3cc101d74d000ae0669ec599c0387eedb716f54ecc118a95319b7c8b662c7415f3e24fd5c5530a2140bd7fc4557eaf7e7e651
+MISC ChangeLog 17005 SHA256 61b8f304cd784dd2d1ec58c5d7d1adade2e5b99897a64302f1930ef5ed36160d SHA512 c94c896654eec6f46bae4738a7aee9f8323cf2bdb8313dbf54af9e6cb37bc8a618daac06091373262ba7c1f56f5389a9675a318446ba07b05bc8ddd6eba15872 WHIRLPOOL 6d59de58f95594d9d7b4e7909666dd246829c6d3ffef5aa0f9cd5ae9a9a00f04c9bc1c56bc8b635a9656089ab0b843006db23a1756710aa02fc6cb310538b57d
 MISC metadata.xml 302 SHA256 bde1ed5d5b77f24350d5708444153fdfc15593205bfbc58f115d2b7e292d404b SHA512 4c1b0f1ba4c185f0d80e10b094cbb41e8467308367bc6d37f51d82aba522c7d60189f3c6efa22f433d7ce25ec77ac25e9a5fdb9b00aef31c9e3fc1dd00fdbc08 WHIRLPOOL cf4814a563fd457b6e2979939fe693d765a6b87465f66ee9883c3d06723122dfe8de59e96055d7acbd8924d4d61f8627a704289e3bcc0c01a4742426780931b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlP6/LtfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlP7A/xfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JB8cgEAlmdIZNuTvH5BeM1HFgy7qZ4y
-U+gN/kWlNd0As7bcbvwA/1cVKOkjZhmKS6ODApq3+NK4nCu/x76xYafl17UL1XX5
-=Bf+5
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCkagEAjKHi9rwWucM97lnRFw8ewUSR
+2qqP7WaY/xaeRBr/zy0A/R7hxppebADB0jONo7sD5BfGqlTQrE7eCa/JzYaqCNcb
+=pz6W
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
new file mode 100644
index 000000000000..70481400edde
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.5/source/fitz/load-jpx.c
++++ mupdf-1.5/source/fitz/load-jpx.c
+@@ -116,7 +116,7 @@
+ 	opj_stream_set_read_function(stream, fz_opj_stream_read);
+ 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-	opj_stream_set_user_data(stream, &sb);
++	opj_stream_set_user_data(stream, &sb, NULL);
+ 	/* Set the length to avoid an assert */
+ 	opj_stream_set_user_data_length(stream, size);
+ 
diff --git a/app-text/mupdf/mupdf-1.5.ebuild b/app-text/mupdf/mupdf-1.5.ebuild
index 23058f81a3ab..f87ae7c5dc9d 100644
--- a/app-text/mupdf/mupdf-1.5.ebuild
+++ b/app-text/mupdf/mupdf-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.2 2014/08/25 09:06:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5.ebuild,v 1.3 2014/08/25 09:38:00 xmw Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE="X vanilla +curl +openssl static static-libs"
 LIB_DEPEND="dev-libs/openssl[static-libs?]
 	media-libs/freetype:2[static-libs?]
 	media-libs/jbig2dec[static-libs?]
-	<media-libs/openjpeg-2.1:2[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
 	net-misc/curl[static-libs?]
 	virtual/jpeg[static-libs?]
 	X? ( x11-libs/libX11[static-libs?]
@@ -42,6 +42,11 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
 		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
 
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
 		-i platform/debian/${PN}.pc || die
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 7e847f1b472b..e6b485b54185 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.47 2014/07/21 22:00:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.48 2014/08/25 09:38:00 xmw Exp $
 
 EAPI=5
 
@@ -43,6 +43,11 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
 		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
 
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		epatch \
+			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
+	fi
+
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
 		-i platform/debian/${PN}.pc || die