From 438b75f7f088d23b5137acc36f594274a31e2744 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 28 Apr 2009 14:43:58 +0000 Subject: Version bump, clean up. (Portage version: 2.1.6.11/cvs/Linux x86_64) --- media-video/ffmpegthumbnailer/ChangeLog | 61 ++++++++++++---------- .../ffmpegthumbnailer-1.2.5.ebuild | 28 ---------- .../ffmpegthumbnailer-1.4.0.ebuild | 36 ------------- .../ffmpegthumbnailer-1.5.0.ebuild | 31 +++++++++++ .../ffmpegthumbnailer-1.4.0-pixelformat.patch | 28 ---------- media-video/ffmpegthumbnailer/metadata.xml | 1 + 6 files changed, 65 insertions(+), 120 deletions(-) delete mode 100644 media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild delete mode 100644 media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.4.0.ebuild create mode 100644 media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild delete mode 100644 media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.4.0-pixelformat.patch (limited to 'media-video/ffmpegthumbnailer') diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog index c27a4d33bbd9..17f172022f21 100644 --- a/media-video/ffmpegthumbnailer/ChangeLog +++ b/media-video/ffmpegthumbnailer/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/ffmpegthumbnailer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.62 2009/03/08 19:53:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.63 2009/04/28 14:43:58 ssuominen Exp $ + +*ffmpegthumbnailer-1.5.0 (28 Apr 2009) + + 28 Apr 2009; Samuli Suominen + -files/ffmpegthumbnailer-1.4.0-pixelformat.patch, + -ffmpegthumbnailer-1.2.5.ebuild, -ffmpegthumbnailer-1.4.0.ebuild, + +ffmpegthumbnailer-1.5.0.ebuild: + Version bump. 08 Mar 2009; Alexis Ballier +files/ffmpegthumbnailer-1.4.0-pixelformat.patch, @@ -11,7 +19,7 @@ 07 Jan 2009; Samuli Suominen +ffmpegthumbnailer-1.4.0.ebuild: - Version bump. This version includes upstream fix for GCC 4.4. + Version bump which includes GCC 4.4 fix. 17 Dec 2008; Steve Dibb ffmpegthumbnailer-1.3.0.ebuild: @@ -32,14 +40,11 @@ ffmpegthumbnailer-1.3.0.ebuild: alpha/arm/ia64/sparc/x86 stable wrt #250597 - 24 Nov 2008; metadata.xml: - Rename my old e-mail drac at gentoo.org to ssuominen at gentoo.org. - *ffmpegthumbnailer-1.3.0 (12 Nov 2008) 12 Nov 2008; Peter Alfredsen +ffmpegthumbnailer-1.3.0.ebuild: - Bump, requested by drac. + Bump, requested by ssuominen. 24 Sep 2008; Alexis Ballier ffmpegthumbnailer-1.2.5.ebuild: @@ -52,7 +57,7 @@ 01 Jun 2008; nixnut ffmpegthumbnailer-1.2.5.ebuild: Stable on ppc wrt bug 224079 - 31 May 2008; Samuli Suominen + 31 May 2008; Samuli Suominen -files/ffmpegthumbnailer-1.1.2-ffmpeg.patch, -ffmpegthumbnailer-1.1.2.ebuild, ffmpegthumbnailer-1.2.5.ebuild: amd64/arm stable, remove old @@ -71,7 +76,7 @@ *ffmpegthumbnailer-1.2.5 (29 Apr 2008) - 29 Apr 2008; Samuli Suominen + 29 Apr 2008; Samuli Suominen +ffmpegthumbnailer-1.2.5.ebuild: Version bump, fixes crash with raw avi files. @@ -88,20 +93,20 @@ *ffmpegthumbnailer-1.2.4 (20 Apr 2008) - 20 Apr 2008; Samuli Suominen + 20 Apr 2008; Samuli Suominen -files/ffmpegthumbnailer-1.2.3-gcc43.patch, -ffmpegthumbnailer-1.2.3.ebuild, +ffmpegthumbnailer-1.2.4.ebuild: Version bump to 1.2.4 which is same as 1.2.3 with gcc 4.3 fix. amd64 stable, only trivial change from previous version. - 15 Apr 2008; Samuli Suominen + 15 Apr 2008; Samuli Suominen +files/ffmpegthumbnailer-1.2.3-gcc43.patch, ffmpegthumbnailer-1.2.3.ebuild: GCC 4.3 fix by me and Sergey Dryabzhinsky wrt #213725. *ffmpegthumbnailer-1.2.3 (09 Apr 2008) - 09 Apr 2008; Samuli Suominen + 09 Apr 2008; Samuli Suominen +ffmpegthumbnailer-1.2.3.ebuild: Version bump. This version includes a patch from Alexis Ballier to build against recent ffmpeg snapshots. @@ -129,13 +134,13 @@ ffmpegthumbnailer-1.2.2.ebuild: Stable on x86 (bug #214130) - 21 Mar 2008; Samuli Suominen + 21 Mar 2008; Samuli Suominen ffmpegthumbnailer-1.2.2.ebuild: amd64 stable *ffmpegthumbnailer-1.2.2 (26 Feb 2008) - 26 Feb 2008; Samuli Suominen + 26 Feb 2008; Samuli Suominen -files/ffmpegthumbnailer-1.2.1-asneeded.patch, -ffmpegthumbnailer-1.1.5.ebuild, -ffmpegthumbnailer-1.2.1.ebuild, +ffmpegthumbnailer-1.2.2.ebuild: @@ -144,18 +149,18 @@ *ffmpegthumbnailer-1.2.1 (26 Feb 2008) - 26 Feb 2008; Samuli Suominen + 26 Feb 2008; Samuli Suominen +files/ffmpegthumbnailer-1.2.1-asneeded.patch, +ffmpegthumbnailer-1.2.1.ebuild: Version bump. *ffmpegthumbnailer-1.1.5 (16 Feb 2008) - 16 Feb 2008; Samuli Suominen + 16 Feb 2008; Samuli Suominen +ffmpegthumbnailer-1.1.5.ebuild: Version bump. - 18 Aug 2007; Samuli Suominen + 18 Aug 2007; Samuli Suominen ffmpegthumbnailer-1.1.2.ebuild: Keyworded ~arm wrt #172867 @@ -183,17 +188,17 @@ ffmpegthumbnailer-1.1.2.ebuild: alpha/ia64/x86 stable wrt #184267 - 27 Jun 2007; Samuli Suominen + 27 Jun 2007; Samuli Suominen -files/ffmpegthumbnailer-1.1.1-ffmpeg.patch, +files/ffmpegthumbnailer-1.1.2-ffmpeg.patch, -files/ffmpegthumbnailer-1.1.2-swscale.patch, -ffmpegthumbnailer-1.1.1-r1.ebuild, ffmpegthumbnailer-1.1.2.ebuild: - Patch to allow building with old and new ffmpeg still supporting asneeded, + Patch to allow building with old and new ffmpeg with asneeded, using autotools and pkgconfig. *ffmpegthumbnailer-1.1.2 (27 Jun 2007) - 27 Jun 2007; Samuli Suominen + 27 Jun 2007; Samuli Suominen +files/ffmpegthumbnailer-1.1.2-swscale.patch, +ffmpegthumbnailer-1.1.2.ebuild: Version bump with swscale patch. @@ -204,14 +209,14 @@ *ffmpegthumbnailer-1.1.1-r1 (01 Jun 2007) - 01 Jun 2007; Samuli Suominen + 01 Jun 2007; Samuli Suominen +files/ffmpegthumbnailer-1.1.1-ffmpeg.patch, +ffmpegthumbnailer-1.1.1-r1.ebuild: - Fix building with media-video/ffmpeg-0.4.9_p20070525. + Fix building with media-video/ffmpeg-0.4.9_p20070525 - 01 Jun 2007; Samuli Suominen + 01 Jun 2007; Samuli Suominen ffmpegthumbnailer-1.1.1.ebuild: - ffmpeg snapshot from 20070525 breaks so force 20070330 for now. + ffmpeg snapshot from 20070525 breaks so force 20070330 for now 31 May 2007; Brent Baude ffmpegthumbnailer-1.1.1.ebuild: @@ -243,7 +248,7 @@ *ffmpegthumbnailer-1.1.1 (08 May 2007) - 08 May 2007; Samuli Suominen + 08 May 2007; Samuli Suominen -files/ffmpegthumbnailer-1.1-int.patch, -files/ffmpegthumbnailer-1.1-inttypes.patch, -ffmpegthumbnailer-1.1.ebuild, -ffmpegthumbnailer-1.1-r1.ebuild, @@ -259,7 +264,7 @@ *ffmpegthumbnailer-1.1-r1 (13 Apr 2007) - 13 Apr 2007; Samuli Suominen + 13 Apr 2007; Samuli Suominen +files/ffmpegthumbnailer-1.1-inttypes.patch, +ffmpegthumbnailer-1.1-r1.ebuild: Fix compilation with new ffmpeg for bug 173692, thanks to ebfe @@ -280,13 +285,13 @@ ffmpegthumbnailer-1.1.ebuild: Add ~ia64 wrt bug 172867 - 31 Mar 2007; Samuli Suominen + 31 Mar 2007; Samuli Suominen +files/ffmpegthumbnailer-1.1-int.patch, ffmpegthumbnailer-1.1.ebuild: - 64bit fix from bug 172875, thanks to Markus Rothe for patch. + 64bit fix from bug 172875, thanks to Markus Rothe for patch *ffmpegthumbnailer-1.1 (31 Mar 2007) - 31 Mar 2007; Samuli Suominen +metadata.xml, + 31 Mar 2007; Samuli Suominen +ffmpegthumbnailer-1.1.ebuild: Initial commit. diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild deleted file mode 100644 index c7faf568023e..000000000000 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild,v 1.8 2008/09/24 08:55:35 aballier Exp $ - -DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" -HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="media-libs/libpng - media-libs/jpeg - >=media-video/ffmpeg-0.4.9_p20070330" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_compile() { - econf --disable-dependency-tracking - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog README TODO -} diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.4.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.4.0.ebuild deleted file mode 100644 index 4043c5709bd3..000000000000 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.4.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.4.0.ebuild,v 1.2 2009/03/08 19:53:14 aballier Exp $ - -EAPI=2 - -inherit multilib eutils - -DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" -HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="media-libs/libpng - media-libs/jpeg - >=media-video/ffmpeg-0.4.9_p20070330" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-pixelformat.patch" -} - -src_configure() { - econf --disable-dependency-tracking --disable-static -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog README TODO - rm -f "${D}"/usr/$(get_libdir)/libffmpegthumbnailer.la -} diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild new file mode 100644 index 000000000000..6f155026836d --- /dev/null +++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild,v 1.1 2009/04/28 14:43:58 ssuominen Exp $ + +EAPI=2 +inherit multilib + +DESCRIPTION="Lightweight video thumbnailer that can be used by file managers" +HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer" +SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="media-libs/libpng + media-libs/jpeg + >=media-video/ffmpeg-0.4.9_p20070330" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_configure() { + econf --disable-dependency-tracking --disable-static +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog README TODO + rm -f "${D}"/usr/$(get_libdir)/libffmpegthumbnailer.la +} diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.4.0-pixelformat.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.4.0-pixelformat.patch deleted file mode 100644 index d747a5860896..000000000000 --- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.4.0-pixelformat.patch +++ /dev/null @@ -1,28 +0,0 @@ -http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=24 - -Index: src/libffmpegthumbnailer/moviedecoder.cpp -=================================================================== ---- src/libffmpegthumbnailer/moviedecoder.cpp (revision 111) -+++ src/libffmpegthumbnailer/moviedecoder.cpp (revision 112) -@@ -300,7 +300,7 @@ - memcpy((&(videoFrame.frameData.front())), m_pFrame->data[0], videoFrame.lineSize * videoFrame.height); - } - --void MovieDecoder::convertAndScaleFrame(int format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight) -+void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight) - { - calculateDimensions(m_pVideoCodecContext->width, m_pVideoCodecContext->height, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight); - SwsContext* scaleContext = sws_getContext(m_pVideoCodecContext->width, m_pVideoCodecContext->height, -Index: src/libffmpegthumbnailer/moviedecoder.h -=================================================================== ---- src/libffmpegthumbnailer/moviedecoder.h (revision 111) -+++ src/libffmpegthumbnailer/moviedecoder.h (revision 112) -@@ -61,7 +61,7 @@ - - bool decodeVideoPacket(); - bool getVideoPacket(); -- void convertAndScaleFrame(int format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight); -+ void convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight); - void createAVFrame(AVFrame** avFrame, int width, int height, int format); - void calculateDimensions(int srcWidth, int srcHeight, int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight); - diff --git a/media-video/ffmpegthumbnailer/metadata.xml b/media-video/ffmpegthumbnailer/metadata.xml index a4e675c0902d..eaf977f8b0df 100644 --- a/media-video/ffmpegthumbnailer/metadata.xml +++ b/media-video/ffmpegthumbnailer/metadata.xml @@ -4,5 +4,6 @@ video ssuominen@gentoo.org + Samuli Suominen -- cgit v1.2.3-65-gdbad