diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-02-27 22:24:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-02-27 22:24:39 +0000 |
| commit | 1d882bb8b35a03ec416fef9a6fe197c30f992035 (patch) | |
| tree | 29a95cc11d6ecf9ade79add5d31c13057bf69687 /media-libs/chromaprint | |
| parent | Add patch to fix crasher bug triggered on hardened x86_64 machines with USE=X... (diff) | |
| download | historical-1d882bb8b35a03ec416fef9a6fe197c30f992035.tar.gz historical-1d882bb8b35a03ec416fef9a6fe197c30f992035.tar.bz2 historical-1d882bb8b35a03ec416fef9a6fe197c30f992035.zip | |
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62.
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'media-libs/chromaprint')
| -rw-r--r-- | media-libs/chromaprint/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/chromaprint/Manifest | 26 | ||||
| -rw-r--r-- | media-libs/chromaprint/chromaprint-1.2.ebuild | 13 |
3 files changed, 32 insertions, 15 deletions
diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog index c7674f25d000..91597ef27c4a 100644 --- a/media-libs/chromaprint/ChangeLog +++ b/media-libs/chromaprint/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/chromaprint -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.19 2014/11/20 17:07:44 klausman Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.20 2015/02/27 22:24:32 mgorny Exp $ + + 27 Feb 2015; Michał Górny <mgorny@gentoo.org> chromaprint-1.2.ebuild: + Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. 20 Nov 2014; Tobias Klausmann <klausman@gentoo.org> chromaprint-1.2.ebuild: Keyworded on alpha, bug 489436 diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest index f87920189faa..187e085300f6 100644 --- a/media-libs/chromaprint/Manifest +++ b/media-libs/chromaprint/Manifest @@ -15,15 +15,25 @@ DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493 EBUILD chromaprint-0.6.ebuild 1134 SHA256 4b2ed6b676f99cdb6a6f32eacab5905bcff46022b021089547bcaf819c5193a5 SHA512 fbaffe79a2ca6ccf6bc2d24ac07366086a5ddce4a68a593603af0dacd8910040bcf516e1e8425e09e76bf2dec910ae2598894a45b37fd931aeb27e496bfac352 WHIRLPOOL c4f400a10e8a30b3b27b74642ff502186860502a736156a540fc2be3e7910596692458dd491060ff047b052b58a36884a3dd8a93b9ca8d28a359531332462ddc EBUILD chromaprint-0.7.ebuild 1276 SHA256 5aa22287d247accc075ee32bf17460a60d2ef9c3de3db66e47479388fa5177fc SHA512 56ec2635e3fada5a487f5ec97455d634c052683a2471cb54124d3a7472b5e3fa08607327d5c993394125b164f9d010d76e954994d2ffcda0e57625556c0aed64 WHIRLPOOL 6c095488c20f3bcc4eff52c3970b0175403a55c11f0b2bad69b4d3a4eac562596073230aab5f7d6f895a594184b035f82899b1f87325a19c5bf2f4cd82af5178 EBUILD chromaprint-1.1.ebuild 1347 SHA256 119641030eef94248ac71976c734eb5802741ff189ade6af295d667d5c423ecf SHA512 9c999cb65bbf47edc2dda794d36a1f9d1f1c291c41b6a20030822f4aec0244d2be52a66524d51c77fae8b921a5ed3a91e3575b4ac6047d0d55274e1819e06366 WHIRLPOOL 3509f58c2fa3a85906092734c97f089ad768f6295b7843397e2bc5df85b09d236788ea53c71a51337272646ca7836b56a385122ef10db452886bd8266fa88140 -EBUILD chromaprint-1.2.ebuild 1090 SHA256 f4ca5ca8190bbc1dfc687ade5decb15e16625672da2e6bf0b463862022267137 SHA512 fc6fd89a6e0e8b93dab3449943d2a5b21bb7f50c8645de79ce5d213868edd4ec2cf481c522c86c9fb7dd68260fdae4ec4c042a52c29001dccb83eba9db7cd32e WHIRLPOOL b7277cfe20e9e088a1c7638d6e229dffca84ca3dbc82a6764344587f631a226742101a37806586625537cffa394f8d630c4245b2776d8852204249cb2c61c154 -MISC ChangeLog 3118 SHA256 f8a48de54789831b08542165256d23c7d95d52c8725b6218752f95f946a85fe8 SHA512 60093a01f5fb26a8c50ea84875bf6941fe8f6e7bca13430d081895cbbb02c240807253cfeed4856c702aca25ec35286d554821f908efa7f8b9727226870a3fa3 WHIRLPOOL 4a86714e3e39b4f174ba20133b2fa6e78528c5d708b0ed0dcf0453cef6fe7d128e2648b320fcf22193dbceec0a9766f9b256b193772fe25db0e2f0aaf7c19744 +EBUILD chromaprint-1.2.ebuild 1151 SHA256 225d4dc714689c18b74c5ab5981496487132380c656a31315b6e306e5f54b87b SHA512 58d04e3fc371ac8ea51442a88a9b11e8b79a31cf895449cb4ad681b3443fa855e9a7a8426e6e702666ff4257d0cbf8d748d7f25b3625c00dbeb555765f74fa00 WHIRLPOOL 0d2ef5a60bb7538dede5c38ab533d6041ebe385d94b8e63a4947754f18099a4b5e63d3db3815ae1e8ca5b0c1cff0d4e95e323aad2e06644f889b87e9d4817682 +MISC ChangeLog 3333 SHA256 162d342bdf6a34f67363ec8444032275798228d22ac3aabafd5ea4efa6f96a73 SHA512 567d3b1d9ffb27d4c465454bc234d5e8a29d22b08d4dbb8f31bf15dc96c3191e011ea1199f09e9f5e087d8909ac460b00799e10e81f3e8a5aedcd0eff9f04409 WHIRLPOOL 30b56416b21e5921990b9b82fd471c18c50585b814977e0de9e6e0559b297a2a7d0f9d97b2377150bb7c9f9106bc032a838226464ea19216265a907ef22e3a8d MISC metadata.xml 252 SHA256 3fe938dfdd28a5ae7ef32e2bcccd22a40d4498e9ce0b0cd8b44c0c45c4a8366c SHA512 d47ca10c747b2caa9249c6a931476beacb5d615f126a64d0ebbb03a254c3382457cc5c08d29c61c388818d84407db9458f98cb69c10d8f632bb18ed5c67d2daf WHIRLPOOL eeb84a851b4debdefcaa73bdf06b8f17494b79210ecf4f1a65b3d499848dd3b5dd8319fb6590b4b6cd8ef34d818829b689ae33d26a6d733b1070975d99847f39 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iKYEAREIAGYFAlRuH+FfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl -bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz -RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhvrACfZTJ6PFaCh4jte/vF9TxrTC+8 -0fwAnRzreMy9c35rqco0BNLwmiy8sXRO -=KOzb +iQJ8BAEBCABmBQJU8O6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLfIQAKc9RpeZacUNzgiIDTBiA3r4 +lB0625EOC7lKZF6juW6JbYbXs8gO3TzX8E9nF1L6eyM9rA0bQ0x/otAR4IzW8QDb +OPtb36dy7UM28ixOV+8L+Tr0U8UScVvGwxL9IXR7GeiPzwCSq87wZ3Mvt8VXyeJt +brZHAC97mOh7EOTSjC1KYp4Khvs0r3LqnOqfsLKuRFG+x6Wb5lJTruWMeHbKMn/g +VdNWiqhtcXs+gNQYnO4cOchODJQC0QFQV0aVp+ImnvH74nRWpsiE1ZqEWHCx4h58 +MLRjChqMcpMd9lGMYAclFGVg2nmgnVVPuqT3rPaY7Wi8w+wER2b3piJezlgrw93V +I808DQ8jtkdSAIYGiSK45fjWRxbI6rUWS7GS/5obB44FFNegZxOJQ6a8bFcAN5oW +q9K8x7tjTh5GATgypSjlNudDojbApWZkXUgeDeovBXR0seIBPMH5rYVMjkGPMo2W +W0f6UBBOwITKundpnU1NO1WECtBwFZayjjY8pwI66Ty/vTl9DO/Rt/mhGL+XjqaF +qEpuJ4q3D5gojjeBP42AXDjedeaFVClYikp3i2A7kBgaax5ASSckC01GOWThODGj +Y/LKTSKMDClE1HW22arsNPN/PtYsKkbhYmHfMq41gjnzI7PukX64vbV44xtFIRsJ +0O9cXhmZz+NsE5pfOV1+ +=eMdM -----END PGP SIGNATURE----- diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild index 67a57927c062..32b122414eab 100644 --- a/media-libs/chromaprint/chromaprint-1.2.ebuild +++ b/media-libs/chromaprint/chromaprint-1.2.ebuild @@ -1,6 +1,6 @@ -# 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-libs/chromaprint/chromaprint-1.2.ebuild,v 1.2 2014/11/20 17:07:44 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-1.2.ebuild,v 1.3 2015/02/27 22:24:32 mgorny Exp $ EAPI=5 inherit cmake-utils @@ -12,10 +12,13 @@ SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-fbsd" -IUSE="test tools" +IUSE="libav test tools" -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=">=virtual/ffmpeg-0.10" +# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools +RDEPEND=" + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) +" DEPEND="${RDEPEND} test? ( dev-cpp/gtest |