old

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

4 files changed, 13 insertions, 149 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index f72a8cebcd16..0f8cc739e35f 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,10 @@
 # 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.127 2011/10/16 19:22:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.128 2011/10/16 19:24:27 ssuominen Exp $
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -kino-1.3.3.ebuild,
+  -files/kino-1.3.3-avutil.patch:
+  old
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> kino-1.3.4.ebuild:
   ppc/ppc64 stable wrt #385361
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index d9d6fad6eac2..4873bbdd33f3 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,22 +1,19 @@
 -----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
 EBUILD kino-1.3.4.ebuild 3362 RMD160 2d852078686b4614a618a176f23ed4b0339675d6 SHA1 fc36ff8c0713236e9bf2dbfbbe9f81b8561247ad SHA256 97c9745a31f1c3b680d91cc270c7eaf767f8aba46815c4a0349aeed924f3674e
-MISC ChangeLog 15817 RMD160 138cb593397da84110ca214711e7ffdfd5bf3902 SHA1 84483cc3d0dbec06801926f153ab5e47f564144f SHA256 2fd015ac2dfc8da41c19a344e0a3f637309cb5b5abdc6230576682ec7ba64b80
+MISC ChangeLog 15932 RMD160 fb82ccf37371f2c2a5c211cedec758d6bebefee6 SHA1 ab5ad515a3f87cb43f53e14f08eadcc30642ec5b SHA256 33c75809f5cfcc70e1e6083f6c9b1b4e60f8e9ec1d87ddc39d58e69be0d055fa
 MISC metadata.xml 357 RMD160 dd1c7bc14c6911c1d29578d5b6046afbb5c07465 SHA1 b25dcc68c187c3712dc29bcf8d423635ffc24beb SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmy73AAoJEEdUh39IaPFNsvcH/iFGNr/YF4fBUdS3MV7d6WCA
-MJrDueKfoBpOKldpn68nFmrQs7uHdWJ3GAw+1cdJTxADmj8Ul6zX5lgLqOlO3PMi
-on8t2rFOHOQb7x6gHVfqwD1yFN++0JmpEpTaVGrgmCEn+kFxFsbs5KdEqe9dGFwh
-RxU5Zv47KQfTFYAHvk2haC7a3nC6sEJPWNnSoQhEVAqmmejBwBRum4cD6EVChcID
-DDoF5bICMEKoWYfdQ4wmhrA72fNBKqPJwh38Clqnlg1Uc0/Ja6wxv/K36msNd99G
-i+dDyjSBryovf/8SLGkNwcVaJUiLUH2VC8amCkZZvztDHxXwp6CgGDDU6BpBF7Q=
-=4hmV
+iQEcBAEBAgAGBQJOmy9gAAoJEEdUh39IaPFNTYMH/ih/jy95YJz1/PpWimGlr4/v
+qz14SihEwmlKlIs224icSUNMae7aUTNWiHlvC7XVACXz9bJ9qQCzxxl0voMH+h5X
+gQqY6mbLpOlixQJ+RsMVIWmGErQAEVkoXUU2873T3GFaZH67HKXwlv9FHd2r65Vb
+aubNssBwnjQUpsJ2qQSITv8rf0qPbAYVunDqxZ0E2B8CSDf5S5HpRPzEdViuQL5R
+zXH3Dqps9U+g4mTut6K6g/0neVOQSvEojFZs8UB+KUDOD2orXkTJ67R9wZbDyRUm
+iotS2vywtDQNhyfiIEu745zUDM5lL9e4L9OyQnE30Kgjq8lwYY/nhMK7pTCs93s=
+=SmI/
 -----END PGP SIGNATURE-----
diff --git a/media-video/kino/files/kino-1.3.3-avutil.patch b/media-video/kino/files/kino-1.3.3-avutil.patch
deleted file mode 100644
index ed6df9fb03c1..000000000000
--- a/media-video/kino/files/kino-1.3.3-avutil.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/frame.cc
-===================================================================
-RCS file: /cvsroot/kino/kino/src/frame.cc,v
-retrieving revision 1.74
-retrieving revision 1.75
-diff -u -B -r1.74 -r1.75
---- src/frame.cc	26 Dec 2008 05:39:29 -0000	1.74
-+++ src/frame.cc	11 Apr 2009 03:53:46 -0000	1.75
-@@ -56,6 +56,11 @@
- #include "frame.h"
- #include "preferences.h"
- 
-+#if LIBAVUTIL_VERSION_INT >= (50<<16)
-+#define PIX_FMT_YUV422 PIX_FMT_YUYV422
-+#endif
-+
-+
- VideoInfo::VideoInfo() : width( 0 ), height( 0 ), isPAL( false )
- {}
- 
diff --git a/media-video/kino/kino-1.3.3.ebuild b/media-video/kino/kino-1.3.3.ebuild
deleted file mode 100644
index 4622eac3c1c7..000000000000
--- a/media-video/kino/kino-1.3.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.3.ebuild,v 1.7 2011/03/23 08:36:47 radhermit Exp $
-
-EAPI=1
-
-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.
-
-DEPEND=">=x11-libs/gtk+-2.6.0:2
-	>=gnome-base/libglade-2.5.0
-	>=dev-libs/glib-2
-	x11-libs/libXv
-	dev-libs/libxml2
-	dev-util/intltool
-	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
-	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	>=media-video/ffmpeg-0.4.9_p20080326
-	quicktime? ( >=media-libs/libquicktime-0.9.5 )"
-RDEPEND="${DEPEND}
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix to link with --as-needed
-	sed -i -e 's:LIBS="-lXext:LIBS="-lXext -lX11:' configure || die "sed failed"
-
-	# 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
-	sed -i \
-		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
-		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
-	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in || die "sed failed"
-
-	# Fix bug #172687
-	sed -i \
-		-e 's/^install-exec-local:/install-exec-local: install-binPROGRAMS/' \
-		src/Makefile.in || die "sed failed"
-
-	# 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 failed"
-
-	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
-		src/filehandler.h || die "sed failed"
-
-	# Fix compilation with gcc-4.3, see bug #215160
-	sed -i -e '/C++ includes/ a\
-#include <algorithm>' src/playlist.cc || die "sed failed"
-
-	epatch "${FILESDIR}/${P}-avutil.patch"
-}
-
-src_compile() {
-	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" \
-		|| die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
-	# Fix bug #177378
-	fowners root:root -R /usr/share/kino/help
-}