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.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 134 insertions, 1 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/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
+}