summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-03 19:04:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-03 19:04:56 +0000
commitd68e2024b52011672d8a70ae7d1d1d924d901859 (patch)
tree81c8372405af629d573c86bc9801a88b9b74a5f8 /media-libs
parentCleanup (diff)
downloadhistorical-d68e2024b52011672d8a70ae7d1d1d924d901859.tar.gz
historical-d68e2024b52011672d8a70ae7d1d1d924d901859.tar.bz2
historical-d68e2024b52011672d8a70ae7d1d1d924d901859.zip
Pull in || ( nasm yasm ) also for ~x64-macos wrt #419497 by Andrew Udvare
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog6
-rw-r--r--media-libs/libjpeg-turbo/Manifest18
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild3
3 files changed, 16 insertions, 11 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 490e608ef9b9..bdc651327bfe 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.43 2012/05/31 19:12:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.44 2012/06/03 19:04:56 ssuominen Exp $
+
+ 03 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+ libjpeg-turbo-1.2.0-r2.ebuild:
+ Pull in || ( nasm yasm ) also for ~x64-macos wrt #419497 by Andrew Udvare
*libjpeg-turbo-1.2.0-r2 (31 May 2012)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 871249485913..60e4d558c9ec 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -5,17 +5,17 @@ AUX libjpeg-turbo-1.2.0-guard_against_bad_num_components_value.patch 889 RMD160
DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
EBUILD libjpeg-turbo-1.2.0-r1.ebuild 2717 RMD160 0794ed5957eac1203db8dc2ac15b13913ef8a9ee SHA1 1aebcad8acca47bf04a876e722e1361c7833a6d0 SHA256 cf7a4de5a32d8309c2b784e984f2dacfe9437daec6f3e49b9e37e599f2c726dc
-EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2793 RMD160 9cddae3c0164bde3a5e487ad93f3ebf812087f26 SHA1 8a143bc09b05e39e2b3698f51663feae575b31d6 SHA256 7d962098c4b3e36f74309c96c1ae3c454bb3476f49512f103cc8ba783b17fc88
-MISC ChangeLog 6605 RMD160 256660a4556341fd7b0411d73ca386ca33907563 SHA1 20ce54a0e893499201e4ba13166aefd7772772ec SHA256 e058e5b163ef915558d29fc94379c3f74249d7820ec223d1fd708da185a58a04
+EBUILD libjpeg-turbo-1.2.0-r2.ebuild 2823 RMD160 3ddcfab2f166692ea5e33f66ca64901a860cff8d SHA1 87a0d445437879878dc033a831ed24c50904de54 SHA256 05f7b56ed09eb4075794dd0dc2a7221bc7db449c20ae634a2893f17c89eae8a0
+MISC ChangeLog 6769 RMD160 e0eaf4075944e7d2a5b1a4c0aa704da458fb97ea SHA1 be9a2422d3749d183cb1e97dc916fb16e224fea9 SHA256 94e3caa3d402bc8725aa62cc48aa75cf930b3b076479dfd99a4784d10f45b1b2
MISC metadata.xml 367 RMD160 904c022029879a401ebec35c5a94e8092cf2f5ad SHA1 86a0413cf0356331eda8202c54241c7f712a4d1f SHA256 6b8c81649360de8af20a434749d90a9ee689026f959c814e22dac83513c5b0d4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPx8G2AAoJEEdUh39IaPFN1tgH/0SYvdShY8KMrAWOtrxvBoPW
-Br07h1zQknc7QeRO3aTMPgkzMMsjJ9slBCBNGDZfJGduhRz4tlGL1Ykc2uou7u3W
-YgCbpdi25SXp7nnEXo4VayWp5TjvpMPqGXH6wCjkmuzhFf9xMbU2HqwcRe6jbraj
-svxquyyNXuG4/XHVF8gg++MxFlb+S62jnT5osCnGvIOtKKDes4bE2nPLk76txb3e
-nTI8l3ZnZTjyKBrhmUlj3WW3Ns2WLEW/wUXigz/R4I99ClS2ocTiiAQlVSofPt3g
-2kIfdGcA54cMLK/Q3fvIpXn+o25tatmD4YHQ3f4fN1ccaWoItLHYo2GOd7o08DQ=
-=jPMp
+iQEcBAEBAgAGBQJPy7R9AAoJEEdUh39IaPFNbDsH/2jnUH/uXpXV3Gd+OQsWaVBL
+jeYEUTKZkxbrSki/CbXyKW3laKtZnUJBSA48YxviB1F5vr93oao2+kmW2TR4WNZV
+qFN1BelUFM55AR6aQyjHdATt35Zzz6wZ+5KcheYyP4H19gRySBlglKHPHAl9HYNB
+66Z6DqEzTByndBf/WHpoTAMfonmpBxdMlRtdloYRda066w8694NtplD/Ljnn6Fk9
+7hFRnwi+8dYf7Ik45RaWut02knw2/d8JqeOMiODOT2tapDKjFLDGDXgMm7tbJCcq
+t/qkzEQKqXKsyxshlIL1DLRp3LFRf3XP7xUdqb74OjOYz4FceBRP5TmI+TVfpq0=
+=k7OJ
-----END PGP SIGNATURE-----
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
index 3bd09fe58678..1b2d18564c1b 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.1 2012/05/31 19:12:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r2.ebuild,v 1.2 2012/06/03 19:04:56 ssuominen Exp $
EAPI=4
@@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
x86-fbsd? ( ${ASM_DEPEND} )
amd64-linux? ( ${ASM_DEPEND} )
x86-linux? ( ${ASM_DEPEND} )
+ x64-macos? ( ${ASM_DEPEND} )
java? ( >=virtual/jdk-1.5 )"
src_prepare() {