summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/libdc1394/ChangeLog6
-rw-r--r--media-libs/libdc1394/Manifest16
-rw-r--r--media-libs/libdc1394/libdc1394-2.2.1.ebuild8
3 files changed, 20 insertions, 10 deletions
diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 21a598a54c93..14a6c928659c 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libdc1394
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.70 2013/08/11 15:01:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.71 2013/11/17 14:49:24 hasufell Exp $
+
+ 17 Nov 2013; Julian Ospald <hasufell@gentoo.org> libdc1394-2.2.1.ebuild:
+ fix build failure wrt #488716
*libdc1394-2.2.1 (11 Aug 2013)
@@ -388,4 +391,3 @@
11 Oct 2003; Hanno Boeck <hanno@gentoo.org> libdc1394-0.9.1.ebuild:
Ebuild submitted by Stephen Edwards <sed@flashmail.com>.
-
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 9e8c602375df..4559f12520e8 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -8,13 +8,17 @@ DIST libdc1394-2.1.4.tar.gz 576406 SHA256 c605d1f099690a71b743827f01a7733e898a45
DIST libdc1394-2.2.1.tar.gz 556544 SHA256 920c331abf8bf2e1f73dfee0df103daf9f1850a69552ee825a9824e01ce96cf2 SHA512 e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446 WHIRLPOOL 2107a2baf8090151ff5b81933dbe0e67198a87579db204bf69e574625007048d00b6b9d9a29309a026b49f7e55c10847cbe894f431ea976d5cc9f4e33a0f5499
EBUILD libdc1394-2.1.3-r1.ebuild 1142 SHA256 248fe0b9ee0255d294ee73d6c80070df04fc74f6835dc89f5062e76e3cb99158 SHA512 44394828503a9ba15011b538f1116684461a321c994f5443039ca9b416a04d58d578a17dce965af7e52f107a0189bafa81c61e41eb85a8349858c45925e73907 WHIRLPOOL b4fe2f6ec3855213f5ffccdaa65c53bd346d1edb19d8ea4bd242bef51b7a1d51c07052f1bbb9e6a7b118408d051293c02202db6228e79e02fbde73cdc0d3b343
EBUILD libdc1394-2.1.4.ebuild 1003 SHA256 c1bef09c56cc1b33e3e01dd55db92e387b8cb4f180e86bdda5fd74dcf575a3d5 SHA512 0f923a85e6487053a6e2329d4f0acc1f2d0344d77e512963692f8caee71335ae77a6abc588d22027af4c4c32f59583dd2c99a09add39d92e41fbd1da26a867fc WHIRLPOOL 2964fc72c9d781e4a2f355911ea592ed29a57fee8ec478add8530b86fd84ce27f883900b1050742cd4e2fb56cc8133bc8906a5f51e05e73db34fdc86276ddde3
-EBUILD libdc1394-2.2.1.ebuild 1290 SHA256 05a4922e7f4ef11a04d18846a906c1427946275a162263a0faf37cf01136d6b0 SHA512 43bf7af88990862f8e01e424dd42fe894cfe806687fbbc25815835741e485a2581ca4ee88f004bb604c080b2e8d241ae4a6eee812a9ba1abaaaa62ffee3a8c83 WHIRLPOOL 4dcae0077d42b7f49867b86338e862361b072655fa2c1ccbe10601848ffd95425753fae1cfe1a80df85d52a32dc67f58290df2c2b72cb412f626e7e656a81c2b
-MISC ChangeLog 14069 SHA256 77a3b72d55af287820478b59529253c4655a2f47e33fce6ce9b1752365c14dd8 SHA512 56ec7cd522ac853ef25e7daa0f616a85d8ebbab369f82e5ea06381a8009fd28140c97f61d364f7c72543b02ca7b76de38aadb694912d17226c3e891f0c902cc7 WHIRLPOOL a9bebb0c3707d7ea63e758afc746e909fd8a56d0dc48a1ec208f7238bfdc0dfb0e7361d908f4795301e0377227da424c7513a672a1b6488ccaf1b4216d5a3597
+EBUILD libdc1394-2.2.1.ebuild 1312 SHA256 f0bee24ef9b4a7f6b2db0b0d0fc3ab40e9f623eb9b022312995c11f5d12bc421 SHA512 2d2ceb587ee45d89a021298ce19a58d75b45aa214a8437069699dfb6210838bf6049e309eec429d242a503301037a1171f1d37f6f72ccbb21f94e4626205fa8d WHIRLPOOL e79bd2b7ad5f8c2362d0c92923cb7e691b06e99239f60352384cc1a3767ed24de9c913ae7f2a327871976ca7bc0bf195b928bd149502137c1cb233afe6502186
+MISC ChangeLog 14176 SHA256 d5d8ba01e21c233b02e35ba2a43297dee841368d5724c7fc6e9d48da54954368 SHA512 9a26bb9cc497bf3f1bb5832fd57018e9ac5d200f37317daf4c0b1df862a08a9a412a24f6978b928c8f5bbbde6c0e1f962b324f8662376e7dc1ac2f725b9958bd WHIRLPOOL c7f3378eb064eb72303fbfd3a1fcdebaefd91c3bdfa7b92b010fde50026f49b499f3dea8caba0d66038fe21347fa9a1f048dd406b3f60bba963962e9cb6cd6f2
MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlIHpzIACgkQvFcC4BYPU0rNlwCgn+2AqO8bYE7W2gP3dfttQ0Gl
-qzgAoIwwXLkRLbku0aNpq+wWh/9+QZgQ
-=N5ra
+iQEcBAEBCAAGBQJSiNd4AAoJEFpvPKfnPDWzvHUH/iVo4YS4y5G9yHNUl4BiFpAH
+5tm4bKL/+D8YlUl6coO2n5NvyDmD+0+CRlNk3lmITBLHGyk4L/L314AUXqdudtuX
+1fB8blQGcYK5A2WLsBO7miwrhFR/gvxScezNvvol5ZMyHjr2r3noVlXso1wHpxPp
+lYMB9/W7ktQ7nMU41AUW5cEWn5CsKiltTHlxi4odIFrma8FG8jQlsTbGlrSFZIsy
+cdZ/TT8TKBUoaHQrdhemvjezmguilCjUIpCDua9PyrpapbtVBRUYUnx88DHPz666
++QJtWEwXNekd1XBscZsKFm6bIgTS72yc5el2lkh5P3z7wtOUcaypCBE9VowYZUo=
+=cE1M
-----END PGP SIGNATURE-----
diff --git a/media-libs/libdc1394/libdc1394-2.2.1.ebuild b/media-libs/libdc1394/libdc1394-2.2.1.ebuild
index 5abe7aa6528f..b46f45c55eea 100644
--- a/media-libs/libdc1394/libdc1394-2.2.1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.1.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/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.1 2013/08/11 15:01:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.2 2013/11/17 14:49:24 hasufell Exp $
EAPI=5
@@ -21,12 +21,16 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
+src_prepare() {
+ multilib_copy_sources
+}
+
multilib_src_configure() {
local myconf="$(use_enable doc doxygen-html)"
multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples"
# X is only useful for examples that are not installed.
- ECONF_SOURCE="${S}" econf \
+ econf \
$(use_enable static-libs static) \
--program-suffix=2 \
--without-x \