diff options
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/cinelerra/Manifest | 11 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20080717.ebuild | 95 | ||||
| -rw-r--r-- | media-video/cinelerra/files/cinelerra-ffmpeg.patch | 53 |
4 files changed, 9 insertions, 156 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index a78db422ac0a..cdd6519852a0 100644 --- a/media-video/cinelerra/ChangeLog +++ b/media-video/cinelerra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/cinelerra # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.36 2009/09/09 10:04:48 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.37 2009/09/22 06:02:40 aballier Exp $ + + 22 Sep 2009; Alexis Ballier <aballier@gentoo.org> + -cinelerra-20080717.ebuild, -files/cinelerra-ffmpeg.patch: + remove old 09 Sep 2009; Alexis Ballier <aballier@gentoo.org> +files/cinelerra-pkgconfig-x264.patch, cinelerra-20090210.ebuild: diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest index 19c88bade4e0..90f9c3aef0e4 100644 --- a/media-video/cinelerra/Manifest +++ b/media-video/cinelerra/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX cinelerra-ffmpeg.patch 1813 RMD160 c384407c69f049b1c451fdc8a90307d8c434675a SHA1 097eeb594b7f1cb61fac13aface70b9d2cae9c64 SHA256 cb9a4672f998bba4a960ff200b5750c4586d32878e06cd17a16f8cc9eaa71426 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda AUX cinelerra-pkgconfig-x264.patch 649 RMD160 29d4e37c6ffb11128281a6f49e614e32b7af6510 SHA1 62817baa7a633ec568b79dd5f02bd918eb14ff55 SHA256 eaf8f936b41dd998b6a793ffad37e98c840ea3225adf61419ff7e0610f61e92e -DIST cinelerra-20080717.tar.lzma 21734783 RMD160 2d55e56da3ec963542301e59e9dbadd527a7c88b SHA1 cd51ca3cace68a33d3b6682890b3205352e9616e SHA256 537b154f9045016c17636ce9f200a9fc309920989f163af68a7fb0c2fe81e981 DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea -EBUILD cinelerra-20080717.ebuild 2576 RMD160 c4d08cf26afc694239f3879ab7791b6d16234d75 SHA1 f37d6472cf6463faa485045b0354a38b5ebf62ae SHA256 937f21e4f21ecf094256459c5dea00a87c594b614ba558e03a2889e6f915c22f EBUILD cinelerra-20090210.ebuild 2547 RMD160 3d355b9b37d61bf12160fdab7e1842027c2db878 SHA1 8241cfb96ba3ea03eab8bd4be16dcf515f867446 SHA256 b1edb716743618937a7af30b7acba2a1e95f26be99def7e2bd74bbaeac47d9b7 -MISC ChangeLog 9356 RMD160 1c5288af1d54a37190f278559a34ba5d98cb19d1 SHA1 8f94a2261190cefe0ac0cbb7adcea56a6772b250 SHA256 ea96de232946594166c734a7cdfbb9cee965b87e971f48cf9a9298796a92939b +MISC ChangeLog 9483 RMD160 68b25b4247b9ef715b1edb8ece8c6ed8f53c0f0b SHA1 ad0c46fb37dfab303916ddae8744220e919398e3 SHA256 0949698fd74a60eef80b061516ed42e5d809d8a6b381304fd6a3e4642e6e7e9f MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkqnfcYACgkQvFcC4BYPU0qTCACeKrP8TSIMQnHYtINE7Q9ZzbdB -EusAnAsaykesZGTD2y4gqzkrlHiR/Drs -=awJ2 +iEYEARECAAYFAkq4aIYACgkQvFcC4BYPU0rN5gCgrOHjmT5H8qgPdhoZ9E4h+UFd +ZF8An0LoN8JZEy3tiWsgZHh7Zyapo4Rw +=U1Ld -----END PGP SIGNATURE----- diff --git a/media-video/cinelerra/cinelerra-20080717.ebuild b/media-video/cinelerra/cinelerra-20080717.ebuild deleted file mode 100644 index e8d718692ecb..000000000000 --- a/media-video/cinelerra/cinelerra-20080717.ebuild +++ /dev/null @@ -1,95 +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/cinelerra/cinelerra-20080717.ebuild,v 1.3 2008/10/06 22:25:52 aballier Exp $ - -inherit autotools multilib eutils - -DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version" -HOMEPAGE="http://www.cinelerra.org/" -SRC_URI="mirror://gentoo/${P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="3dnow alsa esd mmx oss static truetype ieee1394 css altivec opengl" -RDEPEND="media-libs/libpng - >=media-libs/libdv-1.0.0 - media-libs/faad2 - media-libs/faac - media-libs/a52dec - media-libs/libsndfile - media-libs/tiff - media-video/ffmpeg - media-sound/lame - >=sci-libs/fftw-3.0.1 - media-libs/x264 - ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \ - >=sys-libs/libavc1394-0.5.0 ) - media-video/mjpegtools - alsa? ( media-libs/alsa-lib ) - esd? ( >=media-sound/esound-0.2.34 ) - truetype? ( >=media-libs/freetype-2.1.10 ) - opengl? ( virtual/opengl ) - >=media-libs/openexr-1.2.2 - >=media-libs/libvorbis-1.1.0 - >=media-libs/libogg-1.1 - >=media-libs/libtheora-1.0_alpha4-r1 - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/libXext - x11-libs/libXvMC - x11-libs/libXft" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - mmx? ( dev-lang/nasm )" - -S="${WORKDIR}/hvirtual" - -pkg_setup() { - if [[ "$(gcc-major-version)" -lt "4" ]]; then - eerror "You need to have gcc 4 or better" - eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml" - eerror "And have a look at bug #128659" - die "You must use gcc 4 or better." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-ffmpeg.patch" - AT_M4DIR="m4" eautoreconf -} - -src_compile() { - econf \ - `use_enable static` \ - `use_enable alsa` \ - `use_enable esd` \ - `use_enable oss` \ - `use_enable mmx` \ - `use_enable 3dnow` \ - --with-plugindir=/usr/$(get_libdir)/cinelerra \ - `use_enable truetype freetype2` \ - `use_enable ieee1394 firewire` \ - `use_enable css` \ - `use_enable opengl` \ - `use_enable altivec` \ - --with-external-ffmpeg \ - --with-buildinfo=cust/"Gentoo - SVN r1055" \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dohtml -a png,html,texi,sdw -r doc/* - # workaround - rm -fR "${D}/usr/include" - mv "${D}/usr/bin/mpeg3cat" "${D}/usr/bin/mpeg3cat.hv" - mv "${D}/usr/bin/mpeg3dump" "${D}/usr/bin/mpeg3dump.hv" - mv "${D}/usr/bin/mpeg3toc" "${D}/usr/bin/mpeg3toc.hv" - ln -s /usr/bin/mpeg2enc "${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin" -} diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg.patch b/media-video/cinelerra/files/cinelerra-ffmpeg.patch deleted file mode 100644 index 2c03c91dceda..000000000000 --- a/media-video/cinelerra/files/cinelerra-ffmpeg.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 51a020685ef40489cdfdd16e7dcb9e7b5dbb64d5 -Author: Frans de Boer <frans@fransdb.nl> -Date: Sun Sep 28 23:38:48 2008 +0200 - - Fix for new FFmpeg API. - - This patch was proposed by Rafael2k and augmented by Nicolas to - cope with FFmpeg version 51 as well as version 52. - -diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c -index d418f66..bab1ac0 100644 ---- a/quicktime/mpeg4.c -+++ b/quicktime/mpeg4.c -@@ -671,7 +671,11 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - - context->b_quant_factor = 1.25; - context->b_quant_offset = 1.25; -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - context->error_resilience = FF_ER_CAREFUL; -+#else -+ context->error_recognition = FF_ER_CAREFUL; -+#endif - context->error_concealment = 3; - context->frame_skip_cmp = FF_CMP_DCTMAX; - context->ildct_cmp = FF_CMP_VSAD; -diff --git a/quicktime/wma.c b/quicktime/wma.c -index 6ceefe5..07348a4 100644 ---- a/quicktime/wma.c -+++ b/quicktime/wma.c -@@ -187,11 +187,21 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk - - // Decode chunk into work buffer. - pthread_mutex_lock(&ffmpeg_lock); -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - result = avcodec_decode_audio(codec->decoder_context, - (int16_t*)(codec->work_buffer + codec->output_size * sample_size), -- &bytes_decoded, -- codec->packet_buffer, -+ &bytes_decoded, -+ codec->packet_buffer, - chunk_size); -+#else -+ bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ result = avcodec_decode_audio2(codec->decoder_context, -+ (int16_t*)(codec->work_buffer + codec->output_size * sample_size), -+ &bytes_decoded, -+ codec->packet_buffer, -+ chunk_size); -+#endif -+ - pthread_mutex_unlock(&ffmpeg_lock); - if(bytes_decoded <= 0) - { |