summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-12-03 19:07:37 +0000
committerMichał Górny <mgorny@gentoo.org>2011-12-03 19:07:37 +0000
commit3ae1148982fe7d32d5ac53a026870feca19e760a (patch)
tree07343062e8d4624887b5ce61dc9803a24f9413bf /media-libs
parentsys-apps/apparmor: Explicitly state printf format. Thanks to mgorny for the r... (diff)
downloadsunrise-reviewed-3ae1148982fe7d32d5ac53a026870feca19e760a.tar.gz
sunrise-reviewed-3ae1148982fe7d32d5ac53a026870feca19e760a.tar.bz2
sunrise-reviewed-3ae1148982fe7d32d5ac53a026870feca19e760a.zip
dev-python/repoze-tm2, media-libs/libinstrudeo, net-zope/datagridfield, net-zope/diyplonestyle, net-zope/friendlyalbum, net-zope/imagerepository, net-zope/ploneontology, net-zope/plones5, net-zope/relations, net-zope/richdocument, net-zope/simpleportlet: Remove masked Zope packages and libdc1394 dep.
svn path=/sunrise/; revision=12554
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libinstrudeo/ChangeLog50
-rw-r--r--media-libs/libinstrudeo/Manifest5
-rw-r--r--media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch84
-rw-r--r--media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild40
-rw-r--r--media-libs/libinstrudeo/metadata.xml5
5 files changed, 0 insertions, 184 deletions
diff --git a/media-libs/libinstrudeo/ChangeLog b/media-libs/libinstrudeo/ChangeLog
deleted file mode 100644
index 9e921b676..000000000
--- a/media-libs/libinstrudeo/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-# ChangeLog for media-libs/libinstrudeo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 07 Oct 2011; Markos Chandras <hwoarang@gentoo.org>
- libinstrudeo-0.1.4.ebuild:
- Fix SLOT for media-libs/libdc1394 dependency
-
- 22 Oct 2010; Dane Smith <c1pher@gentoo.org> libinstrudeo-0.1.4.ebuild:
- Change dependency from virtual/glut to media-libs/freeglut as virtual/glut
- has been removed
-
- 13 Jun 2010; Markus Ullmann <jokey@gentoo.org> libinstrudeo-0.1.4.ebuild:
- Fix up depspec
-
- 09 Nov 2009; Andrés Becerra Sandoval (bec) <andres.becerra@gmail.com>
- files/img_convert_to_sws_scale.patch:
- Fixing paths in patch.
-
- 12 Apr 2008; Charles Clément <caratorn@gmail.com>
- -libinstrudeo-0.1.3.ebuild, +libinstrudeo-0.1.4.ebuild,
- +files/img_convert_to_sws_scale.patch:
- Version bump, fix ffmpeg export
-
- 16 Oct 2007; Jakub Moc <jakub@gentoo.org> libinstrudeo-0.1.3.ebuild:
- libdts is deprecated, use libdca by default
-
- 13 Jul 2007; David Shakaryan <omp@gentoo.org> libinstrudeo-0.1.3.ebuild:
- Fix whitespace.
-
- 14 May 2007; Santiago M. Mola <gentoo@coldwind.org>
- libinstrudeo-0.1.3.ebuild:
- Fixed compilation with recent ffmpeg versions. Thanks to ebfe on #173692.
-
- 21 Dec 2006; Santiago M. Mola <cooldwind@gmail.com>
- libinstrudeo-0.1.3.ebuild:
- Remove inherit eutils
-
- 20 Oct 2006; Christian Faulhammer (opfer) <gentoo@faulhammer.org>
- libinstrudeo-0.1.2.ebuild:
- added trailing slash to HOMEPAGE URL
-
- 03 Sep 2006; Tiziano Müller <gentoo@dev-zero.ch>
- files/0.1.2-font_commentboxes_path.patch, libinstrudeo-0.1.2.ebuild:
- Patching Makefile.in's directly now since running autoconf doesn't work
- anymore. Thanks to verus for reporting the bug
-
- 16 Jul 2006; Tiziano Müller <gentoo@dev-zero.ch> ChangeLog:
- New ebuild for bug 139855
-
diff --git a/media-libs/libinstrudeo/Manifest b/media-libs/libinstrudeo/Manifest
deleted file mode 100644
index e21d28460..000000000
--- a/media-libs/libinstrudeo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.1.4-img_convert_to_sws_scale.patch 4131 RMD160 1163370c255954b32ffc9e9483bba93fa2111768 SHA1 0d9e42f9b58e778863ccb1431c5caff5161003ff SHA256 36c1d728b6ed2ac35cc518baf59c76d57564e6c4c2b7c168d495cb4deb73787e
-DIST libinstrudeo-0.1.4.tar.gz 791506 RMD160 43503ba0e4164abddbd8291cd7381cb6216c6d37 SHA1 49ca4a084edc61d84c04899dde26206ed6f0def7 SHA256 6e9fd562ce138d3e27d06ebadc2200afee6ac5c00e9f13793cb18af7ea24671e
-EBUILD libinstrudeo-0.1.4.ebuild 854 RMD160 17e8e96fb3aade43764647c860d51e55ff715f83 SHA1 b4928e569af8317149e5f82ef7e8d65b72f85de1 SHA256 592280e637a42cfe257d3d19980ce29765526952a6dc7b084e72e4bb028265f7
-MISC ChangeLog 1800 RMD160 cdb0c2abfa454dfc8fe7cebd835a504e34775b9e SHA1 032da44415886f9e1f05e14e561fc0173fee94d4 SHA256 2c947ab06becb131c4c326013cc6caf02160095afaf4cd0955977d2d0ed5b8aa
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch b/media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch
deleted file mode 100644
index 562105d81..000000000
--- a/media-libs/libinstrudeo/files/0.1.4-img_convert_to_sws_scale.patch
+++ /dev/null
@@ -1,84 +0,0 @@
- configure.ac | 3 ++-
- src/libinstrudeo/isdffmpegexporter.cpp | 17 +++++++++++------
- src/libinstrudeo/isdffmpegexporter.h | 7 +++++--
- 3 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2549623..002f4f4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -92,6 +92,7 @@ AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], , AC_MSG_ERROR([*** vorbisenc mi
- AC_CHECK_LIB([theora], [theora_info_init], , AC_MSG_ERROR([*** theora missing - please install libtheora development package ***]))
- AC_CHECK_LIB([avcodec], [avcodec_init], , AC_MSG_ERROR([*** avcodec missing - please install avcodec development package ***]), [-lavutil])
- AC_CHECK_LIB([avformat], [av_open_input_stream], , AC_MSG_ERROR([*** avformat missing - please install avformat development package ***]), [-lavutil])
-+AC_CHECK_LIB([swscale], [sws_scale], , AC_MSG_ERROR([*** swscale missing - please install swscale development package ***]), [-lswscale])
- dnl This should pass, since we successfully linked in the two previous checks
- dnl This step add the necessary -lavutil to the LIBS variable
- dnl Note: specifying a method caused troubles, so I switched to main
-@@ -144,4 +145,4 @@ AC_FUNC_STRTOD
- AC_CHECK_FUNCS([ftime gethostbyname gettimeofday localtime_r memset munmap select setlocale socket sqrt strchr strdup strerror strrchr strstr strtoull])
-
- AC_CONFIG_FILES(Makefile src/Makefile src/libinstrudeo/webservice/Makefile src/libinstrudeo/Makefile src/isdexport/Makefile data/Makefile data/commentboxes/Makefile data/fonts/Makefile)
--AC_OUTPUT
-\ No newline at end of file
-+AC_OUTPUT
-diff --git a/src/libinstrudeo/isdffmpegexporter.cpp b/src/libinstrudeo/isdffmpegexporter.cpp
-index 3bf38f5..62836c2 100644
---- a/src/libinstrudeo/isdffmpegexporter.cpp
-+++ b/src/libinstrudeo/isdffmpegexporter.cpp
-@@ -79,6 +79,7 @@ ISDFFmpegExporter::~ISDFFmpegExporter()
- ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
- {
- char* grabBuffer;
-+ struct SwsContext *toYUV_convert_ctx;
-
- if (!initOK) {
- LOG_WARNING("Export routine called without initializing the encoder.");
-@@ -95,6 +96,9 @@ ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
- int bufSize = videoProperties->getHeight()*videoProperties->getWidth()*videoProperties->getBytesPerPixel();
- grabBuffer = (char*)malloc(bufSize);
- }
-+ toYUV_convert_ctx = sws_getContext(codecContext->width, codecContext->height, inputPixFmt,
-+ outputContext->streams[0]->codec->width, outputContext->streams[0]->codec->height,
-+ FFMPEG_STREAM_PIX_FMT, SWS_BICUBIC, NULL, NULL, NULL);
-
- /*
- * Note: video time is in milliseconds, so if we have a framerate
-@@ -126,12 +130,13 @@ ISDObject::ISDErrorCode ISDFFmpegExporter::doExport(char* pixelBuffer)
- }
-
- //convert input pic to yuv420p
-- if (img_convert(&yuvInputPicture, FFMPEG_STREAM_PIX_FMT, &inputPicture,
-- inputPixFmt, codecContext->width, codecContext->height) < 0)
-- {
-- LOG_WARNING("Pixel format conversion not handled while exporting.");
-- RETURN_ERROR(ISD_EXPORT_FORMAT_ERROR);
-- }
-+ if (sws_scale(toYUV_convert_ctx, inputPicture.data, inputPicture.linesize, 0, codecContext->height,
-+ yuvInputPicture.data, yuvInputPicture.linesize) < 0)
-+ {
-+ LOG_WARNING("Pixel format conversion not handled while exporting.");
-+ RETURN_ERROR(ISD_EXPORT_FORMAT_ERROR);
-+ }
-+
-
- outSize = avcodec_encode_video(codecContext, outputBuf, outputBufSize, inputFrame);
- //if zero size, it means the image was buffered
-diff --git a/src/libinstrudeo/isdffmpegexporter.h b/src/libinstrudeo/isdffmpegexporter.h
-index 06082ec..b69f317 100644
---- a/src/libinstrudeo/isdffmpegexporter.h
-+++ b/src/libinstrudeo/isdffmpegexporter.h
-@@ -47,8 +47,11 @@
-
- #include <libinstrudeo/isdexporter.h>
-
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+extern "C" {
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+}
-
- using namespace std;
-
diff --git a/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild b/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild
deleted file mode 100644
index 4a09bcd08..000000000
--- a/media-libs/libinstrudeo/libinstrudeo-0.1.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Provides the necessary logic to capture screen recordings and to process them"
-HOMEPAGE="http://libinstrudeo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="
- dev-cpp/libxmlpp:2.6
- media-libs/freetype
- dev-libs/glib:2
- dev-cpp/glibmm:2
- media-libs/freeglut
- media-libs/libvorbis
- media-libs/libdc1394:2
- media-libs/libdca
- media-libs/libtheora
- media-libs/ftgl
- virtual/ffmpeg
- media-sound/gsm
- net-misc/curl
- dev-libs/openssl
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- epatch "${FILESDIR}/${PV}-img_convert_to_sws_scale.patch"
- eautoreconf
- append-cxxflags -D__STDC_CONSTANT_MACROS
-}
diff --git a/media-libs/libinstrudeo/metadata.xml b/media-libs/libinstrudeo/metadata.xml
deleted file mode 100644
index 31dc017fa..000000000
--- a/media-libs/libinstrudeo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>