summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-01-27 20:14:23 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-01-27 20:14:23 +0000
commitb18789a9390825d77dcf8a5202aada632e0f9f57 (patch)
tree58a3718bdcced712cde622441ad9050e1431a04a /media-video
parentVersion bump, requested by maintainer. (diff)
downloadgentoo-2-b18789a9390825d77dcf8a5202aada632e0f9f57.tar.gz
gentoo-2-b18789a9390825d77dcf8a5202aada632e0f9f57.tar.bz2
gentoo-2-b18789a9390825d77dcf8a5202aada632e0f9f57.zip
fixed missing libavcodec and libavutil linker errors, bug 490628
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/kino/ChangeLog8
-rw-r--r--media-video/kino/files/kino-1.3.4-libavcodec-pkg-config.patch11
-rw-r--r--media-video/kino/kino-1.3.4.ebuild9
3 files changed, 23 insertions, 5 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/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() {