diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-06-06 13:40:04 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-06-06 13:40:04 +0000 |
| commit | adb8b9c693b3366598b33c22337474bfd7bfe350 (patch) | |
| tree | 5b938d819a2df7621e2cd6d50eb21d44c64c8e17 /app-text | |
| parent | Drop unnecessary coot mask (diff) | |
| download | historical-adb8b9c693b3366598b33c22337474bfd7bfe350.tar.gz historical-adb8b9c693b3366598b33c22337474bfd7bfe350.tar.bz2 historical-adb8b9c693b3366598b33c22337474bfd7bfe350.zip | |
update to openjpeg-2
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/mupdf/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/mupdf/Manifest | 13 | ||||
| -rw-r--r-- | app-text/mupdf/files/mupdf-9999-openjpeg2.patch | 13 | ||||
| -rw-r--r-- | app-text/mupdf/mupdf-9999.ebuild | 8 |
4 files changed, 30 insertions, 10 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog index cb7d72b38d7c..da007bac1661 100644 --- a/app-text/mupdf/ChangeLog +++ b/app-text/mupdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/mupdf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.65 2013/05/04 14:14:52 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.66 2013/06/06 13:39:50 xmw Exp $ + + 06 Jun 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-9999-openjpeg2.patch, + mupdf-9999.ebuild: + update to openjpeg-2 04 May 2013; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild: Fix LICENSE to AGPL-3 diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 0ebbf871eeec..797096d767be 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -9,6 +9,7 @@ AUX mupdf-1.1_rc1-buildsystem.patch 521 SHA256 b98072f9fab9a687fddd2ba13a0883646 AUX mupdf-1.1_rc1-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1 AUX mupdf-1.2-mubusy_rename_fix.patch 621 SHA256 63b2c440da458c470b276fa59271c6d2fe58b1f254937e621be4580ce16b2ad6 SHA512 7b9d3d8c10bc09bc2b755cc7d27fba8b78bbf7eaf83c93f76f31bb214a61346eca92469f0f1c8ae9ea2b15354fd280b6b0b478175928daa66c84fb4927d805f2 WHIRLPOOL c659fa6e5e29aae26b29e58d96acbe975c2dc847c6819d5648853505d64967f4b6c15b26156652ad5689dfa821f2a9f0a0f0130f686334c8df853dd3705335e1 AUX mupdf-9999-buildsystem.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0fac71d64165b582c086c1f21 SHA512 6563e8e28e713e605c1b180903c1097e54d7e35780e0f6b08d7ff86420d707a21ac59262bd34fd69f5fb458d34fb346f2e0f8fcc15bbcfb20199d3d34162a423 WHIRLPOOL 55c3035f21fbf484db631e4db09590611c134540db1859206c8b3930009ac57492a77056dd9b4134244434b334a56024cb1ac9c24bbc22205ab1a361d1482040 +AUX mupdf-9999-openjpeg2.patch 515 SHA256 a0ec431dd6651499cc09ccc31e50737991cd7e95b7f15d5750aa62cd3cf97d40 SHA512 1d0f2f2645089f5d47333aaf7b99837f8f6d0a6aa6a3841e7f00b575c31eb716da950928adfdb6e66fe0de90875dda1c78cfc0229490d716a1f750fc7ac62aaa WHIRLPOOL 0641fcea823df283872ac4f4aa271de476480b8c007c6df53b883e3d20cb99f4cecd4c98e035e2860ab865bec7e3325cfec106898ad81fe8cbeb8b1c29d681ed DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3 DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e @@ -17,13 +18,13 @@ EBUILD mupdf-1.0.ebuild 1450 SHA256 adb98f309fc176c11b733031fd5ff0393b1701431e4b EBUILD mupdf-1.1.ebuild 1498 SHA256 51ec7fe0291b2708d250311853759d5effec27909ad7a9d59e34b6f7b4275d10 SHA512 8de2fe07d68490b1a5ee0300716f09b591f55f86c74e9461194eecfd96cdfd6fafd833de8e70d5d98a4c8a821f1c6989f971d258cacf28b8765e1a3a7a510be6 WHIRLPOOL 7e3071d8d522dd11fefc49bccc19799ca4f1da9e59f7839735eda9e4cc2934c52d2772b8004ed2480612d887d628ac245b4418c866a48f1783afdcb97a65b5c0 EBUILD mupdf-1.1_p20121127.ebuild 1485 SHA256 f29531913679f351da509670d7f1cddb3ca73d228457d142e6d36e9aab53510f SHA512 8d84a1a086e815e8a76fae0f9a0f1625661e703e6abc89633cf6a4e3b1e6b38e46e19311875af7a37a4b577be91d8d6deb17cb63853e8237cf5868146a328f74 WHIRLPOOL 8c689e8009958c2db556d1fb6a2b6d39ef050b232bed39ed531b76a8e72a894beba77df8a77f54e8f61989463799d57e10741f143f820e9649074f500f7a7568 EBUILD mupdf-1.2.ebuild 1648 SHA256 b0129759e53b731342e8e2d6a5ff9ff1198529fcb052b671b757d9295c2f1189 SHA512 68256260e9e978047c9c758c19812e9dab1579a5bd42964a94ebe9c56d796948e6dfb123eb6e4ebf9b2c160549dcc674fe6df48f1b0fffe9f522b46a9fab3b6b WHIRLPOOL d822969624756d707fb32a4b9789e2f0419bab627dd5f71aaa9682b0935f71139a7adf6ced22a57b2e4549476d0b4c9bbd1965ea273d27f72fdba1115a2fd880 -EBUILD mupdf-9999.ebuild 1375 SHA256 f3339956d96c494eae5b8ba9548ef9699228281e1fc4a13d0a81436944f9084e SHA512 def60d45689fd3fb1b5cda71618747173e670bfdaef96d48b6f7c0efc90f7f74b7c58e8e083e5fc87691a93b1971341a281c595ff20ae64d287f2c0981ca0401 WHIRLPOOL 088027efcc868a483465fcdfd883be1cc06deb74c050f5c3b062c53c25e93deca12022726aca086f1821ae4b85aebe2f2af9263c5b1af61a4f1ede5d651705ee -MISC ChangeLog 10270 SHA256 23436abbd4b8daad8d22aac77e4478f9f5f03f34d1aece2cd9f66583627a609a SHA512 67fa5e8f2ece4a8423e99f6662a39a38efc7f0a3c283e61749a61d5cbb8a351383f73283b6e1f3a751329f9943697d1a17c9c226b1832e6daeb9e2e21dc77e91 WHIRLPOOL 3b3574e1b9b90ee534e1600828fbf2a0a8a6c8e630921129e5c663f03fd45c8ed77b35d5d97d47908f0a6e6547f3156d4c161f576132f22994c1fc6cb6a7dec5 +EBUILD mupdf-9999.ebuild 1420 SHA256 d6ef02bae7b94abbcf281ff6e931227dbe77589cf571ce7ee0ac2e69c63c40e4 SHA512 bd83aeed0b7fd53b71a7e3e7034902e6b6526cc492b92adc2629f6c7ab6fdb8b7ee6d5c4ff6f8d81e277986e2f9d7c0b7a30701dd80c3ebc9190a692ac339169 WHIRLPOOL c15760de884a171da12e9ac9ba0d2d02e4f0be5808977dc8d68b7617b71f69f603bd60b16b05a4b47203b8c9776e25156089a0a93f6591f5a94934174f5f564a +MISC ChangeLog 10396 SHA256 b38b2655426178d5201a359fb6eca216830f40de51103385c7ecb669cdcdc742 SHA512 d6c46a86353951d8a4af575cbb7cfaa8b1cfcb3fdb4abe349814c2b691c36908c19a8d9a58469086f8f7599e3bb56a4875ab925ac7832c50d683814dea06c9e9 WHIRLPOOL adc1bc63ca980112b6523379f2dd0cfe0f584014e8bc2b3f72226ad365f6efd06be7ec4a182f7673b48337e3f40df018ad030ecbeae83724bf03cd5cdcad2db4 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iF4EAREIAAYFAlGFF9wACgkQknrdDGLu8JA/hAD8Ce05FTuAdLCG3i+sNhnLbmxs -CLNrSxsu1HV8uwtt3xwBAIxWxnYWb5uwnO5qr+kmJ+Ly4WvX2AR7t/Y0UQlEAc4g -=HNu8 +iF4EAREIAAYFAlGwkSkACgkQknrdDGLu8JDA0AD/X3YOHCgdGUdh1FMoup07RXxu +eFSwdUfJGpHOjC3QoI8A/Ak0f3Qe1unsw+wtFsDiFReScWAq5gWHVY1njcqSGzIy +=hYxe -----END PGP SIGNATURE----- diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch new file mode 100644 index 000000000000..00f5e391ff5a --- /dev/null +++ b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch @@ -0,0 +1,13 @@ +--- mupdf-9999/Makerules ++++ mupdf-9999/Makerules +@@ -52,8 +52,8 @@ + + SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) + SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) +-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) +-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) ++SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) ++SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild index fbbd8ef8213e..4d38466e3898 100644 --- a/app-text/mupdf/mupdf-9999.ebuild +++ b/app-text/mupdf/mupdf-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.26 2013/05/04 14:14:52 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.27 2013/06/06 13:39:50 xmw Exp $ EAPI=4 @@ -17,7 +17,7 @@ IUSE="X vanilla" RDEPEND="media-libs/freetype:2 media-libs/jbig2dec - >=media-libs/openjpeg-1.5 + media-libs/openjpeg:2 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )" @@ -25,7 +25,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch + epatch \ + "${FILESDIR}"/${PN}-9999-buildsystem.patch \ + "${FILESDIR}"/${PN}-9999-openjpeg2.patch if ! use vanilla ; then epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch |