commit: c80ede34a2d8b00b2c280b5f15ec2775bf4a0a31 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Dec 16 08:38:26 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Dec 16 10:09:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80ede34
media-video/cinelerra: Remove last-rited pkg Closes: https://bugs.gentoo.org/721990 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-video/cinelerra/Manifest | 2 - media-video/cinelerra/cinelerra-2.3-r1.ebuild | 121 -------------------------- media-video/cinelerra/files/ffmpeg4.patch | 83 ------------------ media-video/cinelerra/metadata.xml | 8 -- profiles/package.mask | 6 -- 5 files changed, 220 deletions(-) diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest deleted file mode 100644 index abe3037e726..00000000000 --- a/media-video/cinelerra/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e -DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122 diff --git a/media-video/cinelerra/cinelerra-2.3-r1.ebuild b/media-video/cinelerra/cinelerra-2.3-r1.ebuild deleted file mode 100644 index d75728d066f..00000000000 --- a/media-video/cinelerra/cinelerra-2.3-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils ltprune multilib flag-o-matic - -DESCRIPTION="The most advanced non-linear video editor and compositor" -HOMEPAGE="http://www.cinelerra.org/"; -SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz - https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="cpu_flags_x86_3dnow alsa altivec css debug ieee1394 cpu_flags_x86_mmx opengl oss" - -RDEPEND="media-libs/a52dec:= - media-libs/faac:= - media-libs/faad2:= - >=media-libs/freetype-2 - media-libs/fontconfig - media-libs/libdv:= - >=media-libs/libogg-1.2:= - media-libs/libpng:0= - media-libs/libsndfile:= - >=media-libs/libtheora-1.1:= - >=media-libs/libvorbis-1.3:= - >=media-libs/openexr-1.5:= - media-libs/tiff:0= - media-libs/x264:= - media-sound/lame:= - >=media-video/mjpegtools-2 - >=sci-libs/fftw-3 - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXft:= - x11-libs/libXv:= - x11-libs/libXvMC:= - x11-libs/libXxf86vm:= - media-video/ffmpeg - || ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc ) - virtual/jpeg:0 - alsa? ( media-libs/alsa-lib:= ) - ieee1394? ( - media-libs/libiec61883:= - >=sys-libs/libraw1394-1.2.0:= - >=sys-libs/libavc1394-0.5.0:= - ) - opengl? ( - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - cpu_flags_x86_mmx? ( dev-lang/nasm )" - -S="${WORKDIR}/CinelerraCV-${PV}" - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-patchset/${PN}-20140710-validate_desktop_entry.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-20140710-underlinking.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-20140710-ffmpeg-0.11.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-libav9.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-pngtoh.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-putbits-gcc52.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-implicit_decls.patch \ - "${WORKDIR}"/${P}-patchset/${PN}-includes.patch - - if has_version '>=media-video/ffmpeg-2' ; then - epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg2.patch - fi - - if has_version '>=media-video/ffmpeg-2.9' ; then - epatch "${WORKDIR}"/${P}-patchset/${PN}-ffmpeg29.patch - fi - - if has_version '>=media-video/ffmpeg-3.5' ; then - epatch "${FILESDIR}/ffmpeg4.patch" - fi - - eautoreconf -} - -src_configure() { - append-cppflags -D__STDC_CONSTANT_MACROS #321945 - append-ldflags -Wl,-z,noexecstack #212959 - - local myconf - use debug && myconf='--enable-x-error-output' - - econf \ - $(use_enable oss) \ - $(use_enable alsa) \ - --disable-esd \ - $(use_enable ieee1394 firewire) \ - $(use_enable css) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_3dnow 3dnow) \ - $(use_enable altivec) \ - $(use_enable opengl) \ - --with-plugindir=/usr/$(get_libdir)/${PN} \ - --with-buildinfo=cust/"Gentoo - ${PV}" \ - --with-external-ffmpeg \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dohtml -a png,html,texi,sdw -r doc/* - - rm -rf "${D}"/usr/include - mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die - mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die - mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die - dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin - - prune_libtool_files --all -} diff --git a/media-video/cinelerra/files/ffmpeg4.patch b/media-video/cinelerra/files/ffmpeg4.patch deleted file mode 100644 index 982073e138b..00000000000 --- a/media-video/cinelerra/files/ffmpeg4.patch +++ /dev/null @@ -1,83 +0,0 @@ -Index: CinelerraCV-2.3/quicktime/mpeg4.c -=================================================================== ---- CinelerraCV-2.3.orig/quicktime/mpeg4.c -+++ CinelerraCV-2.3/quicktime/mpeg4.c -@@ -625,7 +625,6 @@ static int encode(quicktime_t *file, uns - // ffmpeg section - { - AVDictionary ** opts = NULL; -- static char *video_rc_eq="tex^qComp"; - codec->encode_initialized[current_field] = 1; - if(!ffmpeg_initialized) - { -@@ -650,7 +649,6 @@ static int encode(quicktime_t *file, uns - context->pix_fmt = AV_PIX_FMT_YUV420P; - context->bit_rate = codec->bitrate / codec->total_fields; - context->bit_rate_tolerance = codec->bitrate_tolerance; -- context->rc_eq = video_rc_eq; - context->rc_max_rate = 0; - context->rc_min_rate = 0; - context->rc_buffer_size = 0; -@@ -658,8 +656,6 @@ static int encode(quicktime_t *file, uns - (!codec->fix_bitrate ? codec->quantizer : 2); - context->qmax = - (!codec->fix_bitrate ? codec->quantizer : 31); -- context->lmin = 2 * FF_QP2LAMBDA; -- context->lmax = 31 * FF_QP2LAMBDA; - context->mb_lmin = 2 * FF_QP2LAMBDA; - context->mb_lmax = 31 * FF_QP2LAMBDA; - context->max_qdiff = 3; -@@ -680,8 +676,6 @@ static int encode(quicktime_t *file, uns - context->frame_skip_cmp = FF_CMP_DCTMAX; - context->ildct_cmp = FF_CMP_VSAD; - context->intra_dc_precision = 0; -- context->intra_quant_bias = FF_DEFAULT_QUANT_BIAS; -- context->inter_quant_bias = FF_DEFAULT_QUANT_BIAS; - context->i_quant_factor = -0.8; - context->i_quant_offset = 0.0; - context->mb_decision = FF_MB_DECISION_SIMPLE; -@@ -689,18 +683,14 @@ static int encode(quicktime_t *file, uns - context->me_sub_cmp = FF_CMP_SAD; - context->me_cmp = FF_CMP_SAD; - context->me_pre_cmp = FF_CMP_SAD; -- context->me_method = ME_EPZS; - context->me_subpel_quality = 8; - context->me_penalty_compensation = 256; - context->me_range = 0; -- context->me_threshold = 0; -- context->mb_threshold = 0; - context->nsse_weight= 8; - context->profile= FF_PROFILE_UNKNOWN; -- context->rc_buffer_aggressivity = 1.0; - context->level= FF_LEVEL_UNKNOWN; - av_dict_set(opts, "umv", "1", 0); -- context->flags |= CODEC_FLAG_AC_PRED; -+ context->flags |= AV_CODEC_FLAG_AC_PRED; - - // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... - -@@ -709,7 +699,7 @@ static int encode(quicktime_t *file, uns - codec->ffmpeg_id == AV_CODEC_ID_H263 || - codec->ffmpeg_id == AV_CODEC_ID_H263P || - codec->ffmpeg_id == AV_CODEC_ID_FLV1) -- context->flags |= CODEC_FLAG_4MV; -+ context->flags |= AV_CODEC_FLAG_4MV; - // Not compatible with Win - // context->flags |= CODEC_FLAG_QPEL; - -@@ -723,12 +713,12 @@ static int encode(quicktime_t *file, uns - } - - if(!codec->fix_bitrate) -- context->flags |= CODEC_FLAG_QSCALE; -+ context->flags |= AV_CODEC_FLAG_QSCALE; - - if(codec->interlaced) - { -- context->flags |= CODEC_FLAG_INTERLACED_DCT; -- context->flags |= CODEC_FLAG_INTERLACED_ME; -+ context->flags |= AV_CODEC_FLAG_INTERLACED_DCT; -+ context->flags |= AV_CODEC_FLAG_INTERLACED_ME; - } - - diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml deleted file mode 100644 index 17f11a20c01..00000000000 --- a/media-video/cinelerra/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Video project</name> - </maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index e6ef9622eef..d66b034146d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -375,12 +375,6 @@ net-news/quiterss # (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days. app-text/goldendict -# Michał Górny <[email protected]> (2020-11-15) -# Fails to build. Lots of bugs filed. Not touched by maintainer -# since 2018. -# Removal in 30 days. Bug #721990. -media-video/cinelerra - # Jonas Stein <[email protected]> (2020-11-12) # Adobe will stop distributing Flash Player after 2020-12-31. # Masked for removal after 2020-12-31
