old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

6 files changed, 9 insertions, 112 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 1ba863046643..3bd208769e7c 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.130 2012/01/26 13:19:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.131 2012/01/26 13:19:53 ssuominen Exp $
+
+  26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -ffmpegthumbnailer-2.0.6.ebuild,
+  -files/ffmpegthumbnailer-2.0.6-asneeded.patch,
+  -files/ffmpegthumbnailer-2.0.6-flags.patch,
+  -files/ffmpegthumbnailer-2.0.6-gcc46.patch,
+  -files/ffmpegthumbnailer-2.0.6-libpng15.patch:
+  old
 
   26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   ffmpegthumbnailer-2.0.7.ebuild:
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
deleted file mode 100644
index 93c0c8c2c909..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
+++ /dev/null
@@ -1,43 +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/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.11 2011/05/20 20:08:11 xarthisius Exp $
-
-EAPI=2
-inherit autotools 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="gtk jpeg png"
-
-COMMON_DEPEND="virtual/ffmpeg
-	png? ( >=media-libs/libpng-1.4 )
-	jpeg? ( virtual/jpeg )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( >=dev-libs/glib-2.14:2 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{asneeded,flags,gcc46,libpng15}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable png) \
-		$(use_enable jpeg) \
-		$(use_enable gtk gio)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-asneeded.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-asneeded.patch
deleted file mode 100644
index d48c18709624..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-asneeded.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=75
-
---- Makefile.am
-+++ Makefile.am
-@@ -39,12 +39,12 @@
- libffmpegthumbnailer_includedir         = $(includedir)/libffmpegthumbnailer
- libffmpegthumbnailer_la_CXXFLAGS        = $(AM_CXXFLAGS) $(FFMPEG_CFLAGS) $(PNG_CFLAGS)
- libffmpegthumbnailer_la_LDFLAGS         = -version-info 4:6:0
--libffmpegthumbnailer_la_LIBADD          = $(DL_LIBS) $(FFMPEG_LIBS) $(PNG_LIBS) $(JPEG_LIBS)
-+libffmpegthumbnailer_la_LIBADD          = $(FFMPEG_LIBS) $(PNG_LIBS) $(JPEG_LIBS)
- 
- bin_PROGRAMS = ffmpegthumbnailer
- 
- ffmpegthumbnailer_SOURCES = main.cpp
--ffmpegthumbnailer_LDADD = libffmpegthumbnailer.la
-+ffmpegthumbnailer_LDADD = $(DL_LIBS) libffmpegthumbnailer.la
- 
- if ENABLE_UNITTEST
- check_PROGRAMS = testrunner
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch
deleted file mode 100644
index 2262faedfc73..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=76
-
---- configure.ac
-+++ configure.ac
-@@ -104,9 +104,9 @@
- fi
- 
- ########################################################################
--# Compiler flags
-+# Preprocessor flags
- ########################################################################
--CXXFLAGS=-D__STDC_CONSTANT_MACROS
-+CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"
- 
- ########################################################################
- # Check debug mode
-@@ -118,7 +118,7 @@
- AM_CONDITIONAL(DEBUG, test "$enable_debug" = "yes")
- if test "$DEBUG" = "yes"; then
-     AC_DEFINE(ENABLE_DEBUG, [], "Enable debug mode")
--    CXXFLAGS+=" -g -O1 -Wall -Werror -Wfatal-errors"
-+    CXXFLAGS="$CXXFLAGS -g -O1 -Wall -Werror -Wfatal-errors"
- fi
- 
- AC_ARG_ENABLE(unittests,
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch
deleted file mode 100644
index 71f0fd9acd63..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/357305
-http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=83&can=1
-
---- a/libffmpegthumbnailer/filmstripfilter.cpp
-+++ b/libffmpegthumbnailer/filmstripfilter.cpp
-@@ -14,6 +14,7 @@
- //    along with this program; if not, write to the Free Software
- //    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-+#include <cstddef>
- #include "filmstripfilter.h"
- #include "filmstrip.h"
- 
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch
deleted file mode 100644
index 893f2277951b..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libffmpegthumbnailer/pngwriter.cpp
-+++ libffmpegthumbnailer/pngwriter.cpp
-@@ -49,7 +49,7 @@
- , m_InfoPtr(NULL)
- {
-     init();
--    png_set_write_fn(m_PngPtr, (voidp) &outputBuffer, writeDataCallback, NULL);
-+    png_set_write_fn(m_PngPtr, (png_voidp) &outputBuffer, writeDataCallback, NULL);
- }
- 
- PngWriter::~PngWriter()