summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2015-02-01 16:43:36 +0000
committerTim Harder <radhermit@gentoo.org>2015-02-01 16:43:36 +0000
commit2471a66c00c6b167ebf234e749bad13e564324d3 (patch)
treedaa895cd28d0ca539242014f74af21823065aab4 /media-gfx/darktable
parentVersion bump. Force SSE3 support to be enabled as it's required. (diff)
downloadhistorical-2471a66c00c6b167ebf234e749bad13e564324d3.tar.gz
historical-2471a66c00c6b167ebf234e749bad13e564324d3.tar.bz2
historical-2471a66c00c6b167ebf234e749bad13e564324d3.zip
Sync sse3 changes to live ebuild.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'media-gfx/darktable')
-rw-r--r--media-gfx/darktable/ChangeLog5
-rw-r--r--media-gfx/darktable/Manifest18
-rw-r--r--media-gfx/darktable/darktable-9999.ebuild14
3 files changed, 23 insertions, 14 deletions
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index b187ecb57aa7..187141f5a994 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/darktable
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.62 2015/02/01 16:40:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.63 2015/02/01 16:43:34 radhermit Exp $
+
+ 01 Feb 2015; Tim Harder <radhermit@gentoo.org> darktable-9999.ebuild:
+ Sync sse3 changes to live ebuild.
*darktable-1.6.2 (01 Feb 2015)
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index b4878b8e7c3b..11aa1910e259 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -13,17 +13,17 @@ EBUILD darktable-1.4.2.ebuild 3745 SHA256 ebf1644096830a076659b1ad566e804f7f1f8a
EBUILD darktable-1.6.0.ebuild 3906 SHA256 cd4f9a7e15924a9b0cef40ff220641209ab84d4dfd6fc0aee62bdfd167534c8b SHA512 80cb78774a49852c9c824d750f39ba61876ab446ed002d9a97707cedc9a9dd00466ef462cf6fac6cee9aae28a59108650095197e3ad17470b48e7811783ee22c WHIRLPOOL 5b9233c20106e3dbac9a5d15941a6c1f481da589b256f716067850a0d4548e8d1d9c3080e03593653892697f1579cd6bf457ef1831face814bbe5b1773fe9f7b
EBUILD darktable-1.6.1.ebuild 3906 SHA256 92886832b6d12f72ad8c9ca27fef63c7b09b1d38fc1b6f42cb66d3591fb6455a SHA512 dd811ebb5cd220fb81802151d2774fac8e8fb8d436deaf5b2747567ba6e6a9de2ab16736ef0ea684fc38da3a998ae56c74c1f027ecd6ab8c24beb72ed3dff0ec WHIRLPOOL afd414d9eee6c2d9c8814084c6b85f1af20e3cb63d4a625eb81b9c20c2892fa3e8b2112b4a0655d8b4e46c4464fb93d879c3cae72d91019d06af806d96863c8b
EBUILD darktable-1.6.2.ebuild 4110 SHA256 498ba72ebb8ee26f4a3f6e13868df82bdb305c4e46569152ffca8d73bf73876a SHA512 ebcd373a1839cd05e64adc88253f3812a9f4a429fa41a64267ecb23d3c7bfff72b59c1d6c317aae5e8dffe2c7d514d0fc2000328ed06c898604fa150db8a8ca4 WHIRLPOOL f840620b45b6c787f3b37f6a3ab065fa3178ab62024da3c63879f0327b6bca23df176b3118bef6595e0b1e5cb993bc258bdb8f007be6651cba5054da148276b1
-EBUILD darktable-9999.ebuild 3651 SHA256 2beb8b2300cd5b41e7dfcf61c542319c634500666ede3c89eda7a5e8bd2ceb70 SHA512 bbf4727c420f1429c2bd63aaca5bae212e44e6cd622d597b8598424e7394b3d0113728930d41ac9834ca270ccd92bea67551439a1af8133656f7a780c951e2e3 WHIRLPOOL fa8b5161c889adc5228f30db66b138c4f7c787291187a52d8690352aea72e1771610b734d419e96303d563aa89b399af5aaedc6a316c34d9b6ae5f9602cde350
-MISC ChangeLog 11534 SHA256 b51ecbc632af3201d5f474e247d659f0cecbc8ad6b6315ce84316c962daf9941 SHA512 93d201266ea7040923c3ddeb39d522e4e93d2d00634dc475f0dad049529ecbdb1761489edd7cc3696d181f17438034fa7c02ad7df221f997d691ed0bcac353c9 WHIRLPOOL dc3f221be7d98cb942f502c8c7ccc21de263d1a1c5a09057dcdc4df87c5ac4cac47377f4b0f8c57d8bd4841915380071f27b91d6bc188c88e8749d8a26998748
+EBUILD darktable-9999.ebuild 3855 SHA256 23c07d2ba4d5ac9a806f5620661137224e0f24cce66406ce271e6ae2e4565269 SHA512 6504e6799b9018ea9d8996879486352a95b21e48a7a25186c3e0db8429132ae58a87af9d49e463f8a6137a879571118be39b1b63752d31b89f6743211e957d63 WHIRLPOOL ced97d67c0bfb482c582a6b015a80d3676dc3a6a8833e64b9d0642ea585ea9ab74a8a1358a4933a37d3c4136cd3aa03f86f4469e4f79903169247edda68dc3be
+MISC ChangeLog 11643 SHA256 13a5d793d21e8c10ba939b0088296c8f35aa48d85b9d05c28fec987b2db23acb SHA512 8ce57ff20c37dfbbb9b2b41d038a7c99baf39331290668448c0f99ae4f1b4325f36d936fd38137aec057c60f3d525e330d1acb5edb16535ada717f2c7bfb5789 WHIRLPOOL 2bdfb0640f7d9076d3ed6221aec56c625bf5be76675dd4d197b916f9e49c122f0e1ade2c96ca504098c400f21d54ded739ea505940fb2bd1d0779fd47e81e1fe
MISC metadata.xml 1276 SHA256 51622e29e802579e2f22c245efa0b444e2eca5d808f9609686734778cfb54071 SHA512 13f754561d816f4a8bfc842b8301aa524eddc6fdacf80696417da0a1d4f1c3bf60876e2046c073c1ef7aa61eba8c584063f00d64ebe5583d6ba838456433ec0e WHIRLPOOL ca9435d8870458e4f92c78f89172e368b367c76d28305ae47e8d526ccf74c4bcedd6c9d3d194c2880331d8e06bc22548cd1a3d73e7c653c15b01a7e587305b73
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUzlcUAAoJEEqz6FtPBkyj6iEH/1kx/FU2jsYgjt8k7azmOjfG
-lTDQMa/HV2iQ8Py3JcoPUuUnmiqrtjYsrPC0UEp8OhyuwLCx+IZigyqfY6ArRKJe
-nGH8BgugMhFykcQ+vUVERNMVNIdzKwqtecLW41dWfYbqMcD7fJS2QE2VSFubV00W
-Tdr/AQd1/KCzBoRGwJ7vIcJkzjDMtEcUNYrA4Fn/5i99cyFTF4nwn64wS04cfVBB
-ppqZ9mcRJYTjTNFaMTKlrE7HUr2UR4ixfWIPUN37W3b05SiZyZQ9KVidLqF+iOIA
-0lRFJ1c6tROnCETptX/fOfPU2tZKJPbQiiNrqjIPy1OIn68DXBdeiR0YKlspwfo=
-=PC2/
+iQEcBAEBCAAGBQJUzle7AAoJEEqz6FtPBkyjrF0H/0YUdJvEgnHkpTab0qZcVoko
+AHhyQZJ7F19panFcfXJZgsOH5NVykYPxyv9oajVaKn3gXXBxW9gshWbPxM1FMEAk
+HocU53qL6TWvOZfSExvnC3iEQNf7jsnQcurjAsXWqg7pweFOa35MPyl8QDNukPYE
+jMQvM/VVOxINParoYluTiOynTyjfaE9f+fDZ7thIkfhtITot2xJazeKaVIIjQmZl
+A5O9hNeis8p4QEA0enteyaYg4FdMuChp0DqhLDfRZ7JyW2R8kcAFeJFkhxFVRCfD
+55Dknm8XYyN9lRZsNS0KBXzfBnNRH2Nf8paiceUX/YctqkkrP6E/HJkxgVndeCo=
+=DFvw
-----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 20c5d7ea830a..f7bd9d2d3fbd 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.15 2014/12/07 23:54:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.16 2015/02/01 16:43:34 radhermit Exp $
EAPI=5
-inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils
EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
@@ -15,7 +15,7 @@ LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
LANGS=" cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
${LANGS// / linguas_}"
@@ -65,9 +65,15 @@ pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
+
+ if ! use cpu_flags_x86_sse3 ; then
+ eerror "This package requires a CPU supporting the SSE3 instruction set." && die
+ fi
}
src_prepare() {
+ use cpu_flags_x86_sse3 && append-flags -msse3
+
sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-e "s:LICENSE::" \
-i doc/CMakeLists.txt || die