Version bump, bug 290766 thank Adam Marthaler for report. QA fix for suspect RDEPEND, bug 370969 wrt Andrew Savchenko. Fix build without v4l, bug 361705 wrt James and Martin von Gagern. Migrate to virtual/ffmpeg, bug 362151 thank Tomáš Chvátal for report.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 138 insertions, 16 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index b8015099db1c..f018ae6645c1 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/kino
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.121 2011/03/23 08:36:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.122 2011/06/14 10:46:48 pva Exp $
+
+*kino-1.3.4 (14 Jun 2011)
+
+  14 Jun 2011; Peter Volkov <pva@gentoo.org> +kino-1.3.4.ebuild,
+  +files/kino-1.3.4-v4l1.patch:
+  Version bump, bug 290766 thank Adam Marthaler for report. QA fix for suspect
+  RDEPEND, bug 370969 wrt Andrew Savchenko. Fix build without v4l, bug 361705
+  wrt James and Martin von Gagern. Migrate to virtual/ffmpeg, bug 362151 thank
+  Tomáš Chvátal for report.
 
   23 Mar 2011; Tim Harder <radhermit@gentoo.org> -kino-1.3.1.ebuild,
   kino-1.3.3.ebuild:
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index a3de44adb752..34474bcd26c0 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kino-1.3.3-avutil.patch 535 RMD160 09fc35a2b4a2b88d89a46ae96625dd5bdc608745 SHA1 1918a493efd4958246c54247e124a15fc47539b5 SHA256 cde13777792c52ed763a99df44db6273d41eeaf870995d1c76f591bc45805ea8
+AUX kino-1.3.4-v4l1.patch 635 RMD160 827091e417d0732275fdcc97858a5523e0096cb4 SHA1 2e22828f88b657ff372ee519b7e388ead42558e3 SHA256 1987582a359314203a3c56982e640d9f26baf53c7c78655e2f47f510c3f2fb06
 DIST kino-1.3.3.tar.gz 11091807 RMD160 cdd4806bbaf297f81467cb3385d737f35169166b SHA1 22d63f69cf72d9c4b81d2b3d5362f88f4aa23f8f SHA256 bdb79bb9888f13b3f9465c264811632966069bb9b4ddf9092a694d936848748b
+DIST kino-1.3.4.tar.gz 11090771 RMD160 ed335116c2ee4e1749000a64f8e09827a0e56855 SHA1 81ebfee07521307f80f8c04aa0bb515d1c833720 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08
 EBUILD kino-1.3.3.ebuild 3637 RMD160 ecc7f08bfade8cbb6f9d54213c5376d7cd6efd58 SHA1 186b688020dd7b160bcd42a77570c6a1f0c46891 SHA256 6955d36c6deb8d14c73858828306944feda0cdaf59bf991359c68c77cd6101ce
-MISC ChangeLog 14786 RMD160 a4040579d8686b4ec57f2a06f8279852967a69cc SHA1 a55f3c0584f1bc06ebf9b42b22b9c029fa6810f9 SHA256 f2e5115ebd6c31ad7c9f969af673597797c19692ff844535c6d9885923ad5b73
+EBUILD kino-1.3.4.ebuild 3305 RMD160 d4f6f6328442cc55c28ee15b053c3cb111d62387 SHA1 c97b15bed0bf8efe81172c328041bcd66977f306 SHA256 9598fd7adc62e66417fda33125f521ab1f34d1b45bf8c4ae4e7914347682d1f1
+MISC ChangeLog 15172 RMD160 30302aeeb10731bb54ccbacfd3500d089d3cca37 SHA1 64b55b2cf9f51b8d9eff7ab0701110c0f744ac1f SHA256 259d5b01287a8ab7af702330d9f67ddcced013b7e77d2597dcb197d8a24ab0ad
 MISC metadata.xml 357 RMD160 dd1c7bc14c6911c1d29578d5b6046afbb5c07465 SHA1 b25dcc68c187c3712dc29bcf8d423635ffc24beb SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNibElAAoJEEqz6FtPBkyjti8H/0t4nQROAvb8kmhZTjp0njLZ
-Fb1ykk16BVVCxar/SZE9cNibSqzKEcVjNXApg/suosa9KpyWpT32O9owrK7RPffQ
-Jj8XHP24M87O1V5mBRUl2HmaRE4F3qpCKC1/k70o3cB+8yzrbqzhPNSpl8C9f/hX
-mp9El8+tzlxErf9AXwVDnZB8bZth5wc3bWbNCiEy9d/TJrvhYgNBQahLsmCfwiPU
-y3+64SbEdCzzkVVLGA98UZtDpu+jYJnfahRo6Rf/61B7+BySxSWnfALx7OfYh986
-GTvzz8cVtdkoJlmwabplaprIGP/G81pW8q2esnYUYHd5bBsSHACp6ye+PGGhP9g=
-=Oioj
------END PGP SIGNATURE-----
diff --git a/media-video/kino/files/kino-1.3.4-v4l1.patch b/media-video/kino/files/kino-1.3.4-v4l1.patch
new file mode 100644
index 000000000000..c6757743cd7e
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-v4l1.patch
@@ -0,0 +1,22 @@
+--- kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c	2011-05-17 02:20:37.161004916 +0400
++++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c	2011-05-17 02:21:57.302377529 +0400
+@@ -26,7 +26,7 @@ 
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #define _LINUX_TIME_H 1
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <time.h>
+ 
+ typedef struct {
+--- kino-1.3.3.orig/src/v4l.h	2011-05-17 02:20:38.896969666 +0400
++++ kino-1.3.3.orig/src/v4l.h	2011-05-17 02:21:39.922730395 +0400
+@@ -40,7 +40,7 @@ 
+ 
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "displayer.h"
+ 
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
new file mode 100644
index 000000000000..191962728cd4
--- /dev/null
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 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.1 2011/06/14 10:46:48 pva Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
+HOMEPAGE="http://www.kinodv.org/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dvdr gpac lame gstreamer quicktime sox vorbis"
+
+# This ebuild would benefit a lot of USE dependencies but that has to wait for
+# EAPI 2. The usual fix is to issue built_with_use checks but in that particu-
+# lar case it would make the ebuild rather complicated to write and maintain
+# (certain features can be enabled in various different ways). Also it would
+# also force the emerge process to stop a bit too often for users not to comp-
+# lain. Thus, if you need features like theora, x264, xvid and maybe others,
+# make sure you activate the required support where it should be (ffmpeg, mostly).
+
+# Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
+# dropped because kino may run with it but won't build anymore.
+
+CDEPEND=">=x11-libs/gtk+-2.6.0
+	>=gnome-base/libglade-2.5.0
+	>=dev-libs/glib-2
+	x11-libs/libXv
+	dev-libs/libxml2
+	media-libs/audiofile
+	>=sys-libs/libraw1394-1.0.0
+	>=sys-libs/libavc1394-0.4.1
+	>=media-libs/libdv-0.103
+	media-libs/libsamplerate
+	media-libs/libiec61883
+	media-libs/libv4l
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
+	virtual/ffmpeg
+	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	media-video/mjpegtools
+	media-sound/rawrec
+	dvdr? ( media-video/dvdauthor
+		app-cdr/dvd+rw-tools )
+	gpac? ( media-video/gpac )
+	lame? ( media-sound/lame )
+	gstreamer? ( media-libs/gst-plugins-base )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )"
+
+src_prepare() {
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed"
+	fi
+
+	# Fix bug #169590
+	# https://sourceforge.net/tracker/?func=detail&aid=3304495&group_id=14103&atid=314103
+	sed -i \
+		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
+		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
+	\$(LIBQUICKTIME_LIBS) \\' \
+		src/Makefile.in || die "sed failed"
+
+	# Fix test failure discovered in bug #193947
+	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
+	sed -i -e '$a\
+\
+ffmpeg/libavcodec/ps2/idct_mmi.c\
+ffmpeg/libavcodec/sparc/dsputil_vis.c\
+ffmpeg/libavcodec/sparc/vis.h\
+ffmpeg/libavutil/bswap.h\
+ffmpeg/libswscale/yuv2rgb_template.c\
+src/export.h\
+src/message.cc\
+src/page_bttv.cc' po/POTFILES.in || die "sed failed"
+
+	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
+		src/filehandler.h || die "sed failed"
+	epatch "${FILESDIR}/${P}-v4l1.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-local-ffmpeg \
+		$(use_enable quicktime) \
+		$(use_with sparc dv1394) \
+		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
+	fowners root:root -R /usr/share/kino/help #177378
+}