diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2014-07-30 07:14:09 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2014-07-30 07:14:09 +0000 |
| commit | 8ee2ce171dfa895d32bf9d8d7edd2de5b295225a (patch) | |
| tree | 377860c386165ff6b5d6d848bfc0b039838b8cff /media-libs/leptonica | |
| parent | Make upgrade logic more robust #506570 by Cănărău Constantin. (diff) | |
| download | historical-8ee2ce171dfa895d32bf9d8d7edd2de5b295225a.tar.gz historical-8ee2ce171dfa895d32bf9d8d7edd2de5b295225a.tar.bz2 historical-8ee2ce171dfa895d32bf9d8d7edd2de5b295225a.zip | |
Add compatibility with openjpeg-2.0 (bug #518540)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC
Diffstat (limited to 'media-libs/leptonica')
| -rw-r--r-- | media-libs/leptonica/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/leptonica/Manifest | 11 | ||||
| -rw-r--r-- | media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch | 26 | ||||
| -rw-r--r-- | media-libs/leptonica/leptonica-1.71.ebuild | 4 |
4 files changed, 40 insertions, 7 deletions
diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog index fbf9d76f8124..25f163a66016 100644 --- a/media-libs/leptonica/ChangeLog +++ b/media-libs/leptonica/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/leptonica # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.17 2014/07/30 06:36:54 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.18 2014/07/30 07:13:09 tomka Exp $ + + 30 Jul 2014; Thomas Kahle <tomka@gentoo.org> + +files/leptonica-1.71-openjpeg-2.0.patch, leptonica-1.71.ebuild: + Add compatibility with openjpeg-2.0 (bug #518540) 30 Jul 2014; Thomas Kahle <tomka@gentoo.org> leptonica-1.71.ebuild: expose jpeg2k support via openjpeg (bug 518540) diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest index c55a5ffc287a..60de591e7dc0 100644 --- a/media-libs/leptonica/Manifest +++ b/media-libs/leptonica/Manifest @@ -2,6 +2,7 @@ Hash: SHA256 AUX leptonica-1.68-zlib-include.patch 426 SHA256 49e5795d29a9e9c356fa1b2cfbf477300feb78679a584acb4649becff51a0837 SHA512 351777d7da5ab63db7dda71f66fc1d8193f6732ce3465ea2bcf495c4b1307850d631cd8ff16407568586a96c01cd8aecb4d05b41bd52aada79f493d7fb73f36b WHIRLPOOL bb2937c067c26e2dd3be1adb6afdd41e124f6ce77dac4bbfb4bdbb8791abfdcee7f58d7f0ed023dcb78787703f220f29efc3ff828cae1dac94316d61e727f898 +AUX leptonica-1.71-openjpeg-2.0.patch 617 SHA256 4ab0602952d0591a9bf85e174b2f862ed1092fa35dec3b824c0360d53ba2da64 SHA512 4af87c9ee26a814089304f94b7cdeb0fdfd1154db4be5b7c4ff57ee6b2151982be5a7f976f884a5f3f4eb0e793d35c0f8c844df0a8edd7115a7144876e272e52 WHIRLPOOL 62a8a588e2c90e0ae482e51d5e112b029210c1f08238109742af1cd2b151b0ff7674f5bb5259a3c5acbd7aec75d433b46712a285d85e9c5dddf76c9a363ca518 DIST leptonica-1.68.tar.gz 6695020 SHA256 acefb6c50db2913f117afdbb19a549f7409cf8fa5d9a435692cb10ff89a81f8f SHA512 3dad38279c328e671f65018d86c04da59a6dff481ff48530a6341505abbd3e2a526a5825a0995d77c690f54acbaa0818832bd44dd4246a87d726862e0c31d82b WHIRLPOOL e680f898ddabff46bedc0a8aed6bee95a3a748beaa5e68be3d8ea170fbfad501a68277f243a9d5aeab698aca068b8ef8be427fe69ba99f8d630fd207f913ff1f DIST leptonica-1.69.tar.gz 7618131 SHA256 3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d SHA512 b30eb3fec393e48579fd29417f6e79977b727c80fec894fc04122118ee536a7749218af45a05de327bfe05c01b3bd677552a8fff4410c318713e3914f58a5e71 WHIRLPOOL e9beb2b73110601abef76ff56969a8e0979fabd175e2b84b63dec2c2cb6d2ca7eee4aa8062e1d51946759846c3c111ff46d440d33d7131c540db6b9eb41d11d7 DIST leptonica-1.70.tar.gz 9890585 SHA256 d3d209a1f6d1f7a80119486b5011bc8c6627e582c927ab44ba33c37edb2cfba2 SHA512 6a0769b4ff646c84582c3c81d770e72b282d941f88fa9e46548705cd4850d48a40f0af0829903cd917319c872f4679caa98bde556fa753eff65f3e9fc3679084 WHIRLPOOL 347b5976c9e701f937c0129d9764ec634a80a74040ee95ea462966b5f5cc6caddd150864bab037e2607a5481f2d00965def4cae0a973d3d0ac8b2bdb7c1c0d3d @@ -9,13 +10,13 @@ DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410 EBUILD leptonica-1.68.ebuild 1441 SHA256 fbe39a47498b2ee08bf598b8ed659ad462b06b57558ff8bb15110ddbd331df2d SHA512 102fadeb1057a868c7572561169db126c36218dfeed45f811490cc1d48f6369a0f5b6a437753520353c7c067a3a5e7f9ebe8e18a8226bb4851edaf711d79e6de WHIRLPOOL 1156264223bbefc87d28ef0bc46ae0de532e2ecb3fd38807e672a8dd2048bc7a3025c98e633c4eb96a4bd6db4cbf772f24018e611c608412069aa3d4f3111167 EBUILD leptonica-1.69.ebuild 1542 SHA256 a40918f6ef46d45e1992ce71f6363aedd1156adf6b12b25c1de8a9acb9558ca7 SHA512 ac453b8ea5baf0d154d785595a7b4eeec53353f25fe53f366f9d51184b8196dc95b0020ebb3235011348505e1d02a2c03dc713fd456bae3caa2117b2b751fb55 WHIRLPOOL 887dd8787f1a875797883f8d4b8ea7a9539c45e431d77c083487771f4dfefab6a8f208c45c7d660dc937970b6a625bf78f87acd1cdde6024c4383c8087e30df2 EBUILD leptonica-1.70.ebuild 1549 SHA256 0dfdfb73afc4ea3bd4a8fae44cd4a0ebec56551172f728c097c3eeaa793dfd04 SHA512 6b9ccbd4e82d983a868eeee3312223c269f237afa5b664a77b17fda61ffa36dbffe3f04421c81ef121e8599f6d66ed91de541671096be8ff28edb8cb55e533dc WHIRLPOOL 71fdf8c698376fad0f19df9c0a3915f5d2b0de5c56233abac4b04d81e55fbd639162ffdd8164c829ba13bb147c85b0b59ff3344ffc7bcb361d1a307addbd8ff1 -EBUILD leptonica-1.71.ebuild 1621 SHA256 4a4bb3a6a86962c7446d1104c1a7a0e034ee00dd6643452162d4fd3eb249308c SHA512 9591982432fce72296349ebb4b31a06892fd100bad1f114e001149918c9e1cfdf75b56f2a023ae07a9c073a7353c13618eda8056290f755368f3e10c2e81848a WHIRLPOOL 2c8b2d75d630bb4429110a75e9749cf18ee01809a4deac02cdaef8bdb48bbc6908f32c1ab74cfb4d03f78382b9ed38eb644742b92d7d35c953a00c814ced428d -MISC ChangeLog 2254 SHA256 443fdaa1ec993699ac80c72a8e1c3aa22a752b4abd852d7e61ebd4f655c15be5 SHA512 8d81e49bf56cbbda721ed92130e408a409e1784e865f6579bf4804e9c1d5f9fa547d68712d6a2c79f3e2f7291918430844d67f9389a8118b574b2a5b5344f26b WHIRLPOOL 1a0cbfe6ec5b90f50149c63a62f7a105a5363c107384d87eccadd19862bf817f043782693cdafeb876071bedc0f2bbdc1209f4ceafdb2749678d00a0c25ccfd0 +EBUILD leptonica-1.71.ebuild 1668 SHA256 dd9bdc247c27efb64c7b968cd712facff95f9f5450d69b096be714f37a398f24 SHA512 a69d5ad7f7012f4a64931c7637b08b75c4246c38f9d3faed3c9c345c34dbb8e12ef80dfb39f7250c263a12564b9ccc777cfcd9a601ad6264652b8273c6e41620 WHIRLPOOL 4da13288721440aabd093cdfd3ba7dbf627cddd63e9e54cf7e4622eb29545815269eb5a7d10e1c969f98a9bc785d9e81b5cc2bd1bdeb0e0e063009475f23a947 +MISC ChangeLog 2421 SHA256 5e0a7ee858a14fa656dc3c0d4a9c8a8439a91c19cfa9d9527ebc5e5e6beb8fc7 SHA512 48d7520302208dfc6a94362e84489757f59a33f24eabe8a84c34826b559cd188b666645933d683c758a251204b7a01422ac61bf82a528dfba648f115c5a54aab WHIRLPOOL 6d56508c7134096d22b9a2969232f828946b0c80744222b3d742875ac7169b4c71e648199aebefaef90361a2bca46eeb1e7523388ab60949aafa8e3fff30e9a6 MISC metadata.xml 372 SHA256 918a661a612f1dc071e2d1617a2c0572cdc28e6b99c99baf745f8b91c659ba2c SHA512 0e24442124acd590c7d761d7caa881b6157b7d94756cb4ad6ef9e5c4e9a0f7e8cc0c47a3cc275621407764ac5bd8981a3c05d2634444e3ff7f608c7da54e018e WHIRLPOOL 87ba33ad2919df255cc6f2c117fba928deb49c78ff1dd8c5ac1b8c0fb25fbada00a0c6fb03cf477af85221ca461d6ccf391f4048b248cc4f2db3106d6c1112d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlPYkpsACgkQid6yGVZcMryNigD+N5sON2UvpFLgQXBHetaMJTjy -aYQ093PNrAaIzB28g7EA/igq+zdvkmVmF3lXNcRiehJfsRfR3UZlmwmBFAoQN4Tx -=pZs7 +iF4EAREIAAYFAlPYm1EACgkQid6yGVZcMrwQHQEA0+N94BR1mNMK558IDxNbj5Wy +gOtjeQZrLNyXp0orssUA/AmMvQAysZt3mQWrBMYLivIuiKULKgoP4llSBF9D4bUO +=HvMC -----END PGP SIGNATURE----- diff --git a/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch b/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch new file mode 100644 index 000000000000..ed855729f1f6 --- /dev/null +++ b/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch @@ -0,0 +1,26 @@ +Better use `pkg-config --cflags libopenjp2` + +Michael Weber, xmw@gentoo.org + +--- leptonica-1.71/src/libversions.c ++++ leptonica-1.71/src/libversions.c +@@ -69,7 +69,7 @@ + #endif + + #if HAVE_LIBJP2K /* assuming it's 2.1 */ +-#include "openjpeg-2.1/openjpeg.h" ++#include "openjpeg-2.0/openjpeg.h" + #endif + + #define stringJoinInPlace(s1, s2) \ +--- leptonica-1.71/src/jp2kio.c ++++ leptonica-1.71/src/jp2kio.c +@@ -108,7 +108,7 @@ + + /* Leptonica supports both 2.0 and 2.1. If you have 2.0, + * change MINOR to 0. */ +-#define MINOR 1 ++#define MINOR 0 + + #if MINOR == 0 + static const l_int32 OpjMinor = 0; diff --git a/media-libs/leptonica/leptonica-1.71.ebuild b/media-libs/leptonica/leptonica-1.71.ebuild index 3c1ab9c0926e..a7a295adf24e 100644 --- a/media-libs/leptonica/leptonica-1.71.ebuild +++ b/media-libs/leptonica/leptonica-1.71.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/media-libs/leptonica/leptonica-1.71.ebuild,v 1.2 2014/07/30 06:36:54 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.71.ebuild,v 1.3 2014/07/30 07:13:09 tomka Exp $ EAPI=4 @@ -27,6 +27,8 @@ RDEPEND="${DEPEND}" DOCS=( README version-notes ) src_prepare() { + epatch "${FILESDIR}/${P}-openjpeg-2.0.patch" + # unhtmlize docs local X for X in ${DOCS[@]}; do |