fixed missing libavcodec and libavutil linker errors, bug 490628

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 30 insertions, 15 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 7c276ddef7c4..d825b3b698fb 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kino
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.132 2012/12/12 11:43:54 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.133 2014/01/27 20:14:22 axs Exp $
+
+  27 Jan 2014; Ian Stakenvicius <axs@gentoo.org>
+  +files/kino-1.3.4-libavcodec-pkg-config.patch, kino-1.3.4.ebuild:
+  fixed missing libavcodec and libavutil linker errors, bug 490628
 
   12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> kino-1.3.4.ebuild:
   Rename kino.rules to 99-kino.rules and use udev.eclass to install it into
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 31e9917c2db5..c074aaf6e982 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -3,19 +3,16 @@ Hash: SHA256
 
 AUX kino-1.3.4-libav-0.7.patch 2001 SHA256 8397b6ca5abd86683a3998d6b283875cd49de64c99a79478549d01b518af0c3d SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a WHIRLPOOL 259370caead517108f318676b15f199884b69392730b1c447c101c597b6be42eadf4fc99055031d34f777dcd77fdd2b7a57d5e6c3f8f7c17cdc435bf3cee697e
 AUX kino-1.3.4-libav-0.8.patch 2622 SHA256 a3774d953a9a00df766129e4b8a8c7baf3bf6fd98df6c3e9f4a30c159035d4e1 SHA512 736eeb8f6902704166f48975581ebf2eb9e9edc6da8883d49e5f3710679988da57d796b5a926f27282d88584451ff03983402de66a4a707171674ad2de63d4d4 WHIRLPOOL 0c576267b21488809047f6d12cc37144bb84d2f73859d80bb8febab3061685f18592fe7864b4c0977d32bec01bdaf6720e38f470a3bc4f610202110f50a92668
+AUX kino-1.3.4-libavcodec-pkg-config.patch 473 SHA256 6d8346f17421f347c223ee9547c9665d6492515a4b7d281f36554975d1e14ac0 SHA512 3ad8bf0ed32bc6d59e8ce6aeb0d7a5f2db7811bca629da094e565cb990ca14e334c8672776ac6e0bb6a2223031a110017a13eabe0a94d476ab8147af0cc224e6 WHIRLPOOL 48508c9ccba3b041dfbf6c50b4bcf5815cad43e9e0ad613f4884cec927457ec1ac14d6a276dc8bffadb99809dc60b47d5b3cb135ce4e435a730d63713acd0c4b
 AUX kino-1.3.4-v4l1.patch 635 SHA256 1987582a359314203a3c56982e640d9f26baf53c7c78655e2f47f510c3f2fb06 SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77 WHIRLPOOL 0bf4205b96fef2ba93014f42545d9bbbb2dec29f840d87caefcc4bc29987c5712e95790cb9dfa7b7698a5f7d78a6e28be4f36dc441497f08ce0875eb70d03f67
 DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 WHIRLPOOL 9d7ecc79d23dd8d8c4c0b64da2cd425f48305a81da6b6ae6acb2cad1f4b78fb9ade26ef0e8d36c560aa5f6340fb7221ac7ff3f08b1fecfcdea7d0b7d9614c034
-EBUILD kino-1.3.4.ebuild 3438 SHA256 0b2814d2faf6476142cda73421a4980bccc1b46b704dd9921efd093d578aedcc SHA512 b264a8fde715912d8de6ed87817bb0e3dddf6ab20c5cd28269096cba87dd624a1f2b8450f7087b64b0988bb38322ecf037780b7aaddd8dbf2015ebb71c58a7b4 WHIRLPOOL 7affddd3cb9d230e363b2fbf72e8ef68d1118a0ee9f8c4a1ea5781d253060a40903915697da61a7b93b1144ada256a269afd637d6caf7ff7530035e8fd9a6f59
-MISC ChangeLog 16603 SHA256 be00340ffdde51ae72082decfa6d089c3e14819b74c784e491427caffcc0ff47 SHA512 e83ecea84b9171a39b56be1abaf083e6ec0e4e0252550bf337eddec16e2419135e0c25d6bae5f776de9fd8bafcb27567d39f849cb10f7d64a89521743e9ab1d5 WHIRLPOOL 0fde262844675124cf8804fc0341d464a3f153020d9860a41ac6373c21b4924f17406a33c49639c417de1b6b8942c23cea049ca936b8715b22b3a11cd82e8724
+EBUILD kino-1.3.4.ebuild 3512 SHA256 3958f591786e5b8f3ccc51b44b632361bef1803f5b2928cad5c7543621eb41ba SHA512 f1dbfcea048ad4dcba916689e3bab3d7d9a9e86d40517b47fc8dce948b869718917aaeb60ea469b5f00a1f22c7f6c7a34a89e3618198d2b472c382ef4d4a9541 WHIRLPOOL 228edf5d48bfb2d36abaca027221ebda59e935601c8ed295593249f88f055a80c194a0bb8a968df330ad1cde5f0af6e68fbc7263b4da6a06d90fcf35f0ba587b
+MISC ChangeLog 16782 SHA256 9e744a944ba299cb3e5c2b8905daf91083047bcc1f6d7e9bce666f81062f39ba SHA512 e0148125d50fc79deb8bdcb280f20b445dd6f69d939a93482de670984fc29e19dc04a4dc3a6d9dda697823c8276ca9139e39e593820e6190cc55a51f5802a4e3 WHIRLPOOL 804a7d95ed9f7d2a7baba1a0ebc17ba71bff49a2aeccafa0142edab2a24c2eb551d6e3651a29b2915a670d802dd6ced312df5a3ffbf551835eef4a1581cc0f16
 MISC metadata.xml 357 SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb SHA512 e849f68186ceddafdc574981e0b6404cf70518df22025b0586b65e9922cc201a5b8a98564217730b1c918b6ee75896c6612e96e2437fb1ff48342afd6ca3e45f WHIRLPOOL fc259d23bb02f76b0ece30aeefcbdedf27051f520a63a8520eb958a0471baa5e4fe780b1029aff0c00a047a9a7588696764dd2c282a74d9727b80a8e1c2c3562
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQyG38AAoJEEdUh39IaPFNDvwIAJfs2ZrqRPo+tznvQ76vfNBn
-OIBR542p7U7ioumKO4TMqrJjw/SYIFPFfYYHidVVPt0fKqOPfYlCqBV+qZJqyRf8
-qqxaCXnUgDRad7uli4RVmfpLbE4l4obJAgLWupRiOJkFCnUNDZOHZogdK6Qxr82G
-PP1i6sauROv21ILmpbVAvEzckK5CU71h+nKG13bTecuqC2+KNIfttMvjNQgyIXJR
-RodjSftxCWHiKV361krx+30/fry3lcYXaSvhkkbZvYNNf/Q9hxYO0cIUZKhoyCTx
-Do9PS81Df876CWTERh9uQH75BctTTx7OJh2/u+mdkgR37x6oLbxMXRTTTT6ntrM=
-=aThs
+iF4EAREIAAYFAlLmviAACgkQ2ugaI38ACPA0IgD/dkXEmqtcxsUCFni0LXNjkLxE
+KACnTQEBZ5G37vTlOvIA/1q9OikTb9OB9YVWmyOA6KmLo8rqaZaJ64Zs6TJKv6u/
+=4ESB
 -----END PGP SIGNATURE-----
diff --git a/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch b/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch
new file mode 100644
index 000000000000..d6a8953cf00a
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch
@@ -0,0 +1,11 @@
+--- a/kino-1.3.4/configure.in	2009-09-08 02:35:23.000000000 -0400
++++ b/kino-1.3.4/configure.in	2014-01-27 14:53:01.366063037 -0500
+@@ -221,7 +221,7 @@
+ 		if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then
+ 			local_legacy_ffmpeg_test
+ 		else
+-			PKG_CHECK_MODULES(AVCODEC, libavformat,
++			PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil],
+ 			[
+ 				AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec])
+ 				AC_SUBST(AVCODEC_LIBS)
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
index 70a79bec37e6..7465bba025e6 100644
--- a/media-video/kino/kino-1.3.4.ebuild
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.9 2012/12/12 11:43:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.10 2014/01/27 20:14:22 axs Exp $
 
 EAPI=5
-inherit eutils udev
+inherit autotools eutils udev
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -86,6 +86,9 @@ src/page_bttv.cc' po/POTFILES.in || die
 	epatch "${FILESDIR}/${P}-v4l1.patch"
 	epatch "${FILESDIR}/${P}-libav-0.7.patch"
 	epatch "${FILESDIR}/${P}-libav-0.8.patch"
+	epatch "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
+
+	eautoreconf
 }
 
 src_configure() {