gentoo resync : 28.04.2021

3 files changed, 120 insertions, 0 deletions

diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index e9907869776b..3d459d052f9d 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,3 +1,4 @@
+AUX kino-1.3.4-desktop.patch 407 BLAKE2B 9fb95f11dabad418b2006db47c0cfd4a29bec37c896b84fc78f3ff4d9070364e62517f35454408eec9a3d0cfb53969561ec7851a437cbfe78afa80ddc099cd34 SHA512 573ecb979dda675a6b9a82258bd854468289e2551c6a8a4e6b33144f51daf4d4a3a6fd52b1ac17eaefa19d6c033ca3b22d47ab515b0f3d121b5a767680c7ee63
 AUX kino-1.3.4-ffmpeg3.patch 6804 BLAKE2B 7517c00374bb48ec7677a749296a91c4e5d242496b14d0a38c1e262772cbdadb89c527a44a46db42fa7cad8460138e1d2b11e56ead5bc320a12f5a005363ad17 SHA512 d6ba42d70a907887a866c195946a130fcfff63c8caacf68e8de13fe4d43d4e1898df38fbea5afdb498aade03d14822f0c6f1a9b8308729041e1319acd8c2a0bf
 AUX kino-1.3.4-ffmpeg4.patch 687 BLAKE2B 904e34afbc0707cc8b12de5ec4b733e78a6db91bd9af07a071ae623f82bb57b249acf0b49151a9a597985824c7b402fe8191616fd99ead50a6df7e8f79a1ef93 SHA512 55646377cfacf3a60d240845656e0f01060fb520cf51cac03a6d72941447a5ac05abe1086f84810d684ffe913bd04b3073c951a0efb5891bae44f3eb8c65a858
 AUX kino-1.3.4-libav-0.7.patch 2001 BLAKE2B 75060268985ffbf0cb19e6b96acde037b7b86522e03661becf0fde1b8e114212a033150bb69cf4bdfcd4783cb149f2864c7cceb8d6cfbf778b26cca96108febb SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a
@@ -6,4 +7,5 @@ AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60
 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77
 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32
 EBUILD kino-1.3.4-r1.ebuild 2710 BLAKE2B 63c28374516dfd5c8876d32150b597f185ac13741352d6a78d1007ce073fb4ef0771f88b1ee4e39bc4720faf93b6601a612278968de6af3bdae7b59a5e57712f SHA512 abcb7d0270832572b4bebe8a3ea0b963ad98ab403dad266a30ec501792b19243f1ed038f8c8f7629609062a7ab4172a4d72afdd92cb832b33f6faa039bfb91a6
+EBUILD kino-1.3.4-r2.ebuild 2755 BLAKE2B c2829db734029e1bc4c4663bc88478dcc1f2cc18b6404a1bfdd8de8d9d3db59dfcb5d4de7780a475503814cd987af79a2d78355f020c0cc25e5fbd389c33056a SHA512 5fa09a993078b29d5f0162ee5b4307dbfc304f3bd8e0a0307c03c7785044834df25caa9e5b6dde70a263e594e8a4794f2e49c1360d0607973604541dc96d08bc
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/files/kino-1.3.4-desktop.patch b/media-video/kino/files/kino-1.3.4-desktop.patch
new file mode 100644
index 000000000000..03267e35b48f
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-desktop.patch
@@ -0,0 +1,14 @@
+--- kino-1.3.4/Kino.desktop_orig	2021-04-10 11:55:07.696950138 +0200
++++ kino-1.3.4/Kino.desktop	2021-04-10 11:55:19.621863615 +0200
+@@ -41,9 +41,9 @@
+ Encoding=UTF-8
+ TryExec=kino
+ Exec=kino %F
+-Icon=kino.png
++Icon=kino
+ Terminal=false
+ StartupNotify=true
+ Type=Application
+-Categories=Application;AudioVideo;AudioVideoEditing;
++Categories=AudioVideo;AudioVideoEditing;
+ MimeType=video/dv;application/smil
diff --git a/media-video/kino/kino-1.3.4-r2.ebuild b/media-video/kino/kino-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..da4e9f6edd09
--- /dev/null
+++ b/media-video/kino/kino-1.3.4-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune udev xdg
+
+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 ~x86"
+IUSE="alsa dvdr gpac lame quicktime sox vorbis"
+
+# 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:2
+	>=gnome-base/libglade-2.5.0
+	>=dev-libs/glib-2:2
+	x11-libs/libXv
+	dev-libs/libxml2:2
+	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:0=
+	alsa? ( >=media-libs/alsa-lib-1.0.9 )
+	>=media-video/ffmpeg-3:0=
+	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 )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )
+"
+
+src_prepare() {
+	default
+
+	# Deactivating automagic alsa configuration, bug #134725
+	if ! use alsa ; then
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
+	fi
+
+	# Fix bug #169590
+	sed -i \
+		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
+		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
+	\$(LIBQUICKTIME_LIBS) \\' \
+		src/Makefile.in || die
+
+	# Fix test failure discovered in bug #193947
+	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 -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
+	eapply "${FILESDIR}/${P}-v4l1.patch"
+	eapply "${FILESDIR}/${P}-libav-0.7.patch"
+	eapply "${FILESDIR}/${P}-libav-0.8.patch"
+	eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
+	eapply "${FILESDIR}/${P}-ffmpeg3.patch"
+	eapply "${FILESDIR}/${P}-ffmpeg4.patch"
+	eapply "${FILESDIR}/${P}-desktop.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-local-ffmpeg \
+		$(use_enable quicktime) \
+		$(use_with sparc dv1394) \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
+}
+
+src_install() {
+	default
+	mv "${ED}/$(get_udevdir)"/rules.d/{,99-}kino.rules
+	fowners root:root -R /usr/share/kino/help #177378
+	prune_libtool_files --all #385361
+}