summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-02-25 09:49:51 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-02-25 10:54:48 +0100
commit4b8f855962967b92a1a283bd5b184e3c3d1dd9c3 (patch)
tree58890237c4b918c896b3a7a69e17ce35b1afb235 /media-video
parentnet-im/openfire: bump up to 4.1.3 (diff)
downloadgentoo-4b8f855962967b92a1a283bd5b184e3c3d1dd9c3.tar.gz
gentoo-4b8f855962967b92a1a283bd5b184e3c3d1dd9c3.tar.bz2
gentoo-4b8f855962967b92a1a283bd5b184e3c3d1dd9c3.zip
media-video/ffmpeg2theora: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg2theora/Manifest1
-rw-r--r--media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild51
-rw-r--r--media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild53
-rw-r--r--media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg2.patch40
-rw-r--r--media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg29.patch204
5 files changed, 0 insertions, 349 deletions
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index 292a6958040..0575661c58b 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,2 +1 @@
-DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea
DIST ffmpeg2theora-0.30.tar.bz2 91269 SHA256 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1 WHIRLPOOL d048027e57903252fcb0c7358fc13b2242c6a6429b3d6adbebe1ad07e00fb0a922d6b0fcf193300a88ecd9539dffeb66e0516c0acb311b203a16bf5d9ea099bc
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild
deleted file mode 100644
index 0296d485629..00000000000
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs scons-utils
-
-DESCRIPTION="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="kate"
-
-RDEPEND="
- || ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 )
- >=virtual/ffmpeg-0.10
- >=media-libs/libvorbis-1.1
- >=media-libs/libogg-1.1
- >=media-libs/libtheora-1.1[encode]
- kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-swr.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch \
- "${FILESDIR}"/${P}-underlinking.patch
-}
-
-src_configure() {
- myesconsargs=(
- APPEND_CCFLAGS="${CFLAGS}"
- APPEND_LINKFLAGS="${LDFLAGS}"
- prefix=/usr
- mandir=PREFIX/share/man
- libkate=$(usex kate 1 0)
- )
-}
-
-src_compile() {
- escons
-}
-
-src_install() {
- escons destdir="${D}" install
- dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild
deleted file mode 100644
index 22490ef51dd..00000000000
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs scons-utils
-
-DESCRIPTION="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kate libav"
-
-RDEPEND="
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-libs/libpostproc:0=
- media-video/libav:0= )
- >=media-libs/libvorbis-1.1
- >=media-libs/libogg-1.1
- >=media-libs/libtheora-1.1[encode]
- kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-swr.patch \
- "${FILESDIR}"/${P}-ffmpeg2.patch \
- "${FILESDIR}"/${P}-underlinking.patch
- has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/${P}-ffmpeg29.patch"
-}
-
-src_configure() {
- myesconsargs=(
- APPEND_CCFLAGS="${CFLAGS}"
- APPEND_LINKFLAGS="${LDFLAGS}"
- prefix=/usr
- mandir=PREFIX/share/man
- libkate=$(usex kate 1 0)
- )
-}
-
-src_compile() {
- escons
-}
-
-src_install() {
- escons destdir="${D}" install
- dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg2.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg2.patch
deleted file mode 100644
index a9ca9042d2f..00000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit d3435a6a83dc656379de9e6523ecf8d565da6ca6
-Author: Jan Gerber <j@xiph.org>
-Date: Sun May 26 15:25:42 2013 +0200
-
- don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
-
-diff --git a/src/ffmpeg2theora.c b/src/ffmpeg2theora.c
-index cde63b9..8bebf28 100644
---- a/src/ffmpeg2theora.c
-+++ b/src/ffmpeg2theora.c
-@@ -47,6 +47,9 @@
- #include "ffmpeg2theora.h"
- #include "avinfo.h"
-
-+#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+
-+
- #define LENGTH(x) (sizeof(x) / sizeof(*x))
-
- enum {
-@@ -1069,8 +1072,8 @@ void ff2theora_output(ff2theora this) {
- int first = 1;
- int audio_eos = 0, video_eos = 0, audio_done = 0, video_done = 0;
- int ret;
-- int16_t *audio_buf=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
-- int16_t *resampled=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+ int16_t *audio_buf=av_malloc(4*MAX_AUDIO_FRAME_SIZE);
-+ int16_t *resampled=av_malloc(4*MAX_AUDIO_FRAME_SIZE);
- int16_t *audio_p=NULL;
- int no_frames;
- int no_samples;
-@@ -1531,7 +1534,7 @@ void ff2theora_output(ff2theora this) {
- while((audio_eos && !audio_done) || avpkt.size > 0 ) {
- int samples=0;
- int samples_out=0;
-- int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ int data_size = 4*MAX_AUDIO_FRAME_SIZE;
- int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt);
-
- if (avpkt.size > 0) {
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg29.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg29.patch
deleted file mode 100644
index 9687196945a..00000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-ffmpeg29.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Index: ffmpeg2theora-0.29/src/avinfo.c
-===================================================================
---- ffmpeg2theora-0.29.orig/src/avinfo.c
-+++ ffmpeg2theora-0.29/src/avinfo.c
-@@ -174,7 +174,7 @@ void json_codec_info(FILE *output, AVCod
-
- if (p) {
- codec_name = p->name;
-- } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
-+ } else if (enc->codec_id == AV_CODEC_ID_MPEG2TS) {
- /* fake mpeg2 transport stream codec (currently not
- registered) */
- codec_name = "mpeg2ts";
-@@ -200,7 +200,7 @@ void json_codec_info(FILE *output, AVCod
- case AVMEDIA_TYPE_VIDEO:
- codec_name = fix_codec_name(codec_name);
- json_add_key_value(output, "codec", (void *)codec_name, JSON_STRING, 0, indent);
-- if (enc->pix_fmt != PIX_FMT_NONE) {
-+ if (enc->pix_fmt != AV_PIX_FMT_NONE) {
- json_add_key_value(output, "pixel_format", (void *)av_get_pix_fmt_name(enc->pix_fmt), JSON_STRING, 0, indent);
- }
- if (enc->width) {
-@@ -235,37 +235,37 @@ void json_codec_info(FILE *output, AVCod
-
- /* for PCM codecs, compute bitrate directly */
- switch(enc->codec_id) {
-- case CODEC_ID_PCM_F64BE:
-- case CODEC_ID_PCM_F64LE:
-+ case AV_CODEC_ID_PCM_F64BE:
-+ case AV_CODEC_ID_PCM_F64LE:
- bitrate = enc->sample_rate * enc->channels * 64;
- break;
-- case CODEC_ID_PCM_S32LE:
-- case CODEC_ID_PCM_S32BE:
-- case CODEC_ID_PCM_U32LE:
-- case CODEC_ID_PCM_U32BE:
-- case CODEC_ID_PCM_F32BE:
-- case CODEC_ID_PCM_F32LE:
-+ case AV_CODEC_ID_PCM_S32LE:
-+ case AV_CODEC_ID_PCM_S32BE:
-+ case AV_CODEC_ID_PCM_U32LE:
-+ case AV_CODEC_ID_PCM_U32BE:
-+ case AV_CODEC_ID_PCM_F32BE:
-+ case AV_CODEC_ID_PCM_F32LE:
- bitrate = enc->sample_rate * enc->channels * 32;
- break;
-- case CODEC_ID_PCM_S24LE:
-- case CODEC_ID_PCM_S24BE:
-- case CODEC_ID_PCM_U24LE:
-- case CODEC_ID_PCM_U24BE:
-- case CODEC_ID_PCM_S24DAUD:
-+ case AV_CODEC_ID_PCM_S24LE:
-+ case AV_CODEC_ID_PCM_S24BE:
-+ case AV_CODEC_ID_PCM_U24LE:
-+ case AV_CODEC_ID_PCM_U24BE:
-+ case AV_CODEC_ID_PCM_S24DAUD:
- bitrate = enc->sample_rate * enc->channels * 24;
- break;
-- case CODEC_ID_PCM_S16LE:
-- case CODEC_ID_PCM_S16BE:
-- case CODEC_ID_PCM_S16LE_PLANAR:
-- case CODEC_ID_PCM_U16LE:
-- case CODEC_ID_PCM_U16BE:
-+ case AV_CODEC_ID_PCM_S16LE:
-+ case AV_CODEC_ID_PCM_S16BE:
-+ case AV_CODEC_ID_PCM_S16LE_PLANAR:
-+ case AV_CODEC_ID_PCM_U16LE:
-+ case AV_CODEC_ID_PCM_U16BE:
- bitrate = enc->sample_rate * enc->channels * 16;
- break;
-- case CODEC_ID_PCM_S8:
-- case CODEC_ID_PCM_U8:
-- case CODEC_ID_PCM_ALAW:
-- case CODEC_ID_PCM_MULAW:
-- case CODEC_ID_PCM_ZORK:
-+ case AV_CODEC_ID_PCM_S8:
-+ case AV_CODEC_ID_PCM_U8:
-+ case AV_CODEC_ID_PCM_ALAW:
-+ case AV_CODEC_ID_PCM_MULAW:
-+ case AV_CODEC_ID_PCM_ZORK:
- bitrate = enc->sample_rate * enc->channels * 8;
- break;
- default:
-Index: ffmpeg2theora-0.29/src/ffmpeg2theora.c
-===================================================================
---- ffmpeg2theora-0.29.orig/src/ffmpeg2theora.c
-+++ ffmpeg2theora-0.29/src/ffmpeg2theora.c
-@@ -143,7 +143,7 @@ static AVFrame *frame_alloc(int pix_fmt,
- uint8_t *picture_buf;
- int size;
-
-- picture = avcodec_alloc_frame();
-+ picture = av_frame_alloc();
- if (!picture)
- return NULL;
- size = avpicture_get_size (pix_fmt, width, height);
-@@ -226,7 +226,7 @@ static ff2theora ff2theora_init() {
- this->kate_streams=NULL;
- this->ignore_non_utf8 = 0;
-
-- this->pix_fmt = PIX_FMT_YUV420P;
-+ this->pix_fmt = AV_PIX_FMT_YUV420P;
-
- // ffmpeg2theora --nosound -f dv -H 32000 -S 0 -v 8 -x 384 -y 288 -G 1.5 input.dv
- this->video_gamma = 0.0;
-@@ -350,14 +350,14 @@ static const char *find_category_for_sub
- AVCodecContext *enc = this->context->streams[idx]->codec;
- if (enc->codec_type != AVMEDIA_TYPE_SUBTITLE) return 0;
- switch (enc->codec_id) {
-- case CODEC_ID_TEXT:
-- case CODEC_ID_SSA:
-- case CODEC_ID_MOV_TEXT:
-+ case AV_CODEC_ID_TEXT:
-+ case AV_CODEC_ID_SSA:
-+ case AV_CODEC_ID_MOV_TEXT:
- if (included_subtitles & INCSUB_TEXT)
- return "SUB";
- else
- return NULL;
-- case CODEC_ID_DVD_SUBTITLE:
-+ case AV_CODEC_ID_DVD_SUBTITLE:
- if (included_subtitles & INCSUB_SPU)
- return "K-SPU";
- else
-@@ -1434,18 +1434,9 @@ void ff2theora_output(ff2theora this) {
- av_picture_copy((AVPicture *)output_tmp, (AVPicture *)frame, this->pix_fmt,
- display_width, display_height);
- output_tmp_p=NULL;
-- }
-- if ((this->deinterlace==0 && frame->interlaced_frame) ||
-- this->deinterlace==1) {
-- if (avpicture_deinterlace((AVPicture *)output,(AVPicture *)output_tmp,this->pix_fmt,display_width,display_height)<0) {
-- fprintf(stderr, "Deinterlace failed.\n");
-- exit(1);
-- }
-- }
-- else{
-- av_picture_copy((AVPicture *)output, (AVPicture *)output_tmp, this->pix_fmt,
-- display_width, display_height);
-- }
-+ }
-+ av_picture_copy((AVPicture *)output, (AVPicture *)output_tmp, this->pix_fmt,
-+ display_width, display_height);
- // now output
-
- if (ppMode)
-@@ -1537,11 +1528,37 @@ void ff2theora_output(ff2theora this) {
- int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt);
-
- if (avpkt.size > 0) {
-- len1 = avcodec_decode_audio3(astream->codec, audio_buf, &data_size, &avpkt);
-+ AVFrame *frame = av_frame_alloc();
-+ int got_frame = 0;
-+
-+ if(!frame) break;
-+
-+ len1 = avcodec_decode_audio4(astream->codec, frame, &got_frame, &avpkt);
- if (len1 < 0) {
- /* if error, we skip the frame */
- break;
- }
-+
-+ if (len1 >= 0 && got_frame) {
-+ int ch, plane_size;
-+ int planar = av_sample_fmt_is_planar(astream->codec->sample_fmt);
-+ data_size = av_samples_get_buffer_size(&plane_size, astream->codec->channels,
-+ frame->nb_samples,
-+ astream->codec->sample_fmt, 1);
-+ memcpy(audio_buf, frame->extended_data[0], plane_size);
-+
-+ if (planar && astream->codec->channels > 1) {
-+ uint8_t *out = ((uint8_t *)audio_buf) + plane_size;
-+ for (ch = 1; ch < astream->codec->channels; ch++) {
-+ memcpy(out, frame->extended_data[ch], plane_size);
-+ out += plane_size;
-+ }
-+ }
-+ } else {
-+ data_size = 0;
-+ }
-+ av_frame_free(&frame);
-+
- avpkt.size -= len1;
- avpkt.data += len1;
- if (data_size >0) {
-@@ -1642,15 +1659,15 @@ void ff2theora_output(ff2theora this) {
- }
- }
- }
-- else if (enc->codec_id == CODEC_ID_TEXT) {
-+ else if (enc->codec_id == AV_CODEC_ID_TEXT) {
- utf8 = pkt.data;
- utf8len = pkt.size;
- }
-- else if (enc->codec_id == CODEC_ID_SSA) {
-+ else if (enc->codec_id == AV_CODEC_ID_SSA) {
- // SSA has control stuff in there, extract raw text
- extra_info_from_ssa(&pkt,&utf8,&utf8len,&allocated_utf8,&duration);
- }
-- else if (enc->codec_id == CODEC_ID_MOV_TEXT) {
-+ else if (enc->codec_id == AV_CODEC_ID_MOV_TEXT) {
- utf8 = pkt.data;
- utf8len = pkt.size;
- if (utf8len >= 2) {