From f98e646ed86190d8ff049378e65145005a2478ad Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 4 Nov 2010 00:26:09 +0000 Subject: old (Portage version: 2.2.0_alpha3/cvs/Linux x86_64) --- media-video/cinelerra/Manifest | 9 --- media-video/cinelerra/cinelerra-20100320.ebuild | 90 ---------------------- .../cinelerra/files/cinelerra-20100320-gcc45.patch | 17 ---- .../files/cinelerra-20100320-glibc212.patch | 11 --- .../files/cinelerra-20100320-libpng14.patch | 41 ---------- .../files/cinelerra-20100320-pkgconfig-x264.patch | 16 ---- media-video/cinelerra/files/cinelerra-jpeg-7.patch | 27 ------- .../cinelerra/files/cinelerra-libavutil50.patch | 67 ---------------- media-video/cinelerra/files/cinelerra-x264.patch | 20 ----- 9 files changed, 298 deletions(-) delete mode 100644 media-video/cinelerra/cinelerra-20100320.ebuild delete mode 100644 media-video/cinelerra/files/cinelerra-20100320-gcc45.patch delete mode 100644 media-video/cinelerra/files/cinelerra-20100320-glibc212.patch delete mode 100644 media-video/cinelerra/files/cinelerra-20100320-libpng14.patch delete mode 100644 media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch delete mode 100644 media-video/cinelerra/files/cinelerra-jpeg-7.patch delete mode 100644 media-video/cinelerra/files/cinelerra-libavutil50.patch delete mode 100644 media-video/cinelerra/files/cinelerra-x264.patch (limited to 'media-video/cinelerra') diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest index 3bce22cb49f8..52899d42a4f8 100644 --- a/media-video/cinelerra/Manifest +++ b/media-video/cinelerra/Manifest @@ -1,13 +1,4 @@ -AUX cinelerra-20100320-gcc45.patch 375 RMD160 17cd3088918204ace155774885263cdfe2b2e2ae SHA1 598eb7275439ba3f73fc4cdf083b87e559ad43df SHA256 2cdcceffb7f2ba1909126e99e735cb39b29e45934dbcc386b0cafb6fb4f3df27 -AUX cinelerra-20100320-glibc212.patch 210 RMD160 e49f70b3ce8447405972ebf436ea9b41963536de SHA1 86a5bb649eb4cd62875ebe892b71c0a25e4d262e SHA256 c95b5103a2c8c484df2a944ab60b7d16f88471fd954089d90bbcea1d624ca594 -AUX cinelerra-20100320-libpng14.patch 1082 RMD160 43a09cb00718a4cecbdb175d32b90539703ebc09 SHA1 f57287f451c2e380c0f83b86589f7dc43f5d2bdb SHA256 d214ad3ade6f51fce92db1b0c3889fff1c5c55634d5adfdb05257e5393f34972 -AUX cinelerra-20100320-pkgconfig-x264.patch 480 RMD160 3746b9f0e2b85888e2ffe7e7ccb8a4f2cc53c129 SHA1 643d1568e3a7cb66018e507632e8bc10b5e66aec SHA256 d569d0c6f1bf52a37d3a96d2753c4847aad1c5cf91ea14d2449ec6f527f2110f -AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd SHA1 8803c6d90ac76404d8151f2011eb2982f0d27fda SHA256 e6dfc3c95e8e6a21cc9b23aee2ee967b2a52a0ee208e70af0ed0814a919bb0df -AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda -AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b -DIST cinelerra-20100320.tar.bz2 32670992 RMD160 96c47cf5d9f57b88ad7e3ddee42e61cfe9ccb421 SHA1 ecf4c728e149556e4725a84d460f8a0b8dad6277 SHA256 8b1b057f77283c95d728e9b848d71e938756f6deea0102ca69b618753231c9f3 DIST cinelerra-20101104.tar.xz 22336148 RMD160 143f0f90ce7a815fa99c9e311d21a2d229d619c8 SHA1 9d68107e5d5c009a630d1027cd0f73ff87505206 SHA256 9e708667b05d200779c41f63f678f74a0ff927b4945254e3e9a290a741b818fc -EBUILD cinelerra-20100320.ebuild 2497 RMD160 462c2a50212b812b9c1ac620e61966051c8a88fb SHA1 4f4265da2ecf732eb8da421c61a0484c415bc466 SHA256 8551ba83f98e4795add7a8a7c1dae6df711882cc34421f2babaac24b5ef2bd48 EBUILD cinelerra-20101104.ebuild 2154 RMD160 13c81147e1c17ba6322a21a95ed6bc4785d8468d SHA1 b2d34a9c39878fea08c576d44b482734e389f9d5 SHA256 6f8ac5b44831876ea95f3d2c5a81c499a1511e1267556098febce91d64f00fb1 MISC ChangeLog 11209 RMD160 73893ed1aeb630558da1066cde15a5e867885634 SHA1 6c1790409a60e711ffc88ae271729074d6badb26 SHA256 f1f1a7455055d70e0ffc6ed275a90576007a72d11fe00ef54a7502d37e7ea6b2 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb diff --git a/media-video/cinelerra/cinelerra-20100320.ebuild b/media-video/cinelerra/cinelerra-20100320.ebuild deleted file mode 100644 index 1a5f0b176dbe..000000000000 --- a/media-video/cinelerra/cinelerra-20100320.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.8 2010/09/23 17:38:34 ssuominen Exp $ - -EAPI=2 -inherit autotools eutils multilib flag-o-matic - -DESCRIPTION="Professional Video Editor (Unofficial GIT-snapshot)" -HOMEPAGE="http://www.cinelerra.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss" - -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 - media-video/mjpegtools - >=media-libs/freetype-2.1.10 - >=media-libs/openexr-1.2.2 - >=media-libs/libvorbis-1.2.3 - >=media-libs/libogg-1.1.4 - >=media-libs/libtheora-1.1.1 - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/libXext - x11-libs/libXvMC - x11-libs/libXft - alsa? ( media-libs/alsa-lib ) - ieee1394? ( media-libs/libiec61883 - >=sys-libs/libraw1394-1.2.0 - >=sys-libs/libavc1394-0.5.0 ) - opengl? ( virtual/opengl )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - mmx? ( dev-lang/nasm )" - -src_prepare() { - sed -i -e '/Debian/d' admin/nasm || die #318155 - epatch \ - "${FILESDIR}"/${PN}-libavutil50.patch \ - "${FILESDIR}"/${P}-pkgconfig-x264.patch \ - "${FILESDIR}"/${PN}-x264.patch \ - "${FILESDIR}"/${PN}-jpeg-7.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-gcc45.patch \ - "${FILESDIR}"/${P}-glibc212.patch - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - #bug #321945 (UINT64_C vs ffmpeg headers) - append-flags -D__STDC_CONSTANT_MACROS - econf \ - --disable-dependency-tracking \ - $(use_enable oss) \ - $(use_enable alsa) \ - --disable-esd \ - $(use_enable ieee1394 firewire) \ - $(use_enable css) \ - $(use_enable mmx) \ - $(use_enable 3dnow) \ - $(use_enable altivec) \ - $(use_enable opengl) \ - --with-plugindir=/usr/$(get_libdir)/cinelerra \ - --with-buildinfo=cust/"Gentoo - ${PV}" \ - --with-external-ffmpeg -} - -src_install() { - emake DESTDIR="${D}" install || die - dohtml -a png,html,texi,sdw -r doc/* - # workaround - rm -rf "${D}"/usr/include - mv -v "${D}"/usr/bin/mpeg3cat "${D}"/usr/bin/mpeg3cat.hv - mv -v "${D}"/usr/bin/mpeg3dump "${D}"/usr/bin/mpeg3dump.hv - mv -v "${D}"/usr/bin/mpeg3toc "${D}"/usr/bin/mpeg3toc.hv - dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/cinelerra/mpeg2enc.plugin -} diff --git a/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch b/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch deleted file mode 100644 index 802f26a29e15..000000000000 --- a/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixing build with gcc 4.5 - -http://bugs.gentoo.org/show_bug.cgi?id=317991 - -Patch written by Kacper Kowalik - ---- cinelerra/edits.C -+++ cinelerra/edits.C -@@ -47,7 +47,7 @@ - this->edl = edl; - this->track = track; - -- List::List(); -+ List(); - default_edit->edl = edl; - default_edit->track = track; - default_edit->startproject = 0; diff --git a/media-video/cinelerra/files/cinelerra-20100320-glibc212.patch b/media-video/cinelerra/files/cinelerra-20100320-glibc212.patch deleted file mode 100644 index 5ec79739f62e..000000000000 --- a/media-video/cinelerra/files/cinelerra-20100320-glibc212.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/svg/svg.C -+++ plugins/svg/svg.C -@@ -29,7 +29,7 @@ - #include - #include - #include -- -+#include - - #include - #define _(String) gettext(String) diff --git a/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch b/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch deleted file mode 100644 index f3a0b854f741..000000000000 --- a/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch +++ /dev/null @@ -1,41 +0,0 @@ -http://repos.archlinux.org/wsvn/community/cinelerra-cv/trunk/libpng14.patch - ---- cinelerra/cinelerra/filepng.C -+++ cinelerra/cinelerra/filepng.C -@@ -56,7 +56,7 @@ - fread(test, 16, 1, stream); - fclose(stream); - -- if(png_check_sig((unsigned char*)test, 8)) -+ if(png_sig_cmp((unsigned char*)test, 0, 8) == 0) - { - //printf("FilePNG::check_sig 1\n"); - return 1; ---- cinelerra/plugins/shapewipe/shapewipe.C -+++ cinelerra/plugins/shapewipe/shapewipe.C -@@ -386,7 +386,7 @@ - } - - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL); -+ NULL, NULL, NULL); - - if (!png_ptr) - { -@@ -399,14 +399,14 @@ - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) - { -- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, NULL, NULL); - return 1; - } - - end_info = png_create_info_struct(png_ptr); - if (!end_info) - { -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return 1; - } - diff --git a/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch b/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch deleted file mode 100644 index 4a2a51e1b65f..000000000000 --- a/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.in -+++ configure.in -@@ -269,12 +269,7 @@ - - ############## libx264 - LIBX264_LIBS="" --AC_CHECK_LIB(x264, x264_encoder_close, -- [libx264=yes LIBX264_LIBS=-lx264],,-lpthread -lm) --if test "x$with_pic" = "xyes"; then -- AC_CHECK_LIB(x264_pic, x264_encoder_open, -- [libx264=yes LIBX264_LIBS=-lx264_pic],,-lpthread -lm) --fi -+PKG_CHECK_MODULES([LIBX264], [x264], [libx264=yes], [libx264=no]) - AC_CHECK_HEADER(x264.h, [libx264h=yes]) - AC_SUBST(LIBX264_LIBS) - ############## diff --git a/media-video/cinelerra/files/cinelerra-jpeg-7.patch b/media-video/cinelerra/files/cinelerra-jpeg-7.patch deleted file mode 100644 index f26e6a399997..000000000000 --- a/media-video/cinelerra/files/cinelerra-jpeg-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r -u cinelerra-20090210/quicktime/libmjpeg.c cinelerra-20090210-r1/quicktime/libmjpeg.c ---- cinelerra-20090210/quicktime/libmjpeg.c 2009-02-10 06:19:07.000000000 -0600 -+++ cinelerra-20090210-r1/quicktime/libmjpeg.c 2010-01-23 01:37:31.000000000 -0600 -@@ -653,6 +653,7 @@ - /* Ideally the error handler would be set here but it must be called in a thread */ - jpeg_create_decompress(&(engine->jpeg_decompress)); - engine->jpeg_decompress.raw_data_out = TRUE; -+ engine->jpeg_decompress.do_fancy_upsampling = FALSE; - engine->jpeg_decompress.dct_method = JDCT_IFAST; - } - -@@ -737,6 +738,7 @@ - engine->jpeg_decompress.dc_huff_tbl_ptrs ); - // Reset by jpeg_read_header - engine->jpeg_decompress.raw_data_out = TRUE; -+ engine->jpeg_decompress.do_fancy_upsampling = FALSE; - jpeg_start_decompress(&engine->jpeg_decompress); - - // Generate colormodel from jpeg sampling -@@ -801,6 +803,7 @@ - - - engine->jpeg_compress.raw_data_in = TRUE; -+ engine->jpeg_compress.do_fancy_downsampling = FALSE; - jpeg_start_compress(&engine->jpeg_compress, TRUE); - - while(engine->jpeg_compress.next_scanline < engine->jpeg_compress.image_height) diff --git a/media-video/cinelerra/files/cinelerra-libavutil50.patch b/media-video/cinelerra/files/cinelerra-libavutil50.patch deleted file mode 100644 index f2f4b312755a..000000000000 --- a/media-video/cinelerra/files/cinelerra-libavutil50.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix build with libavutil 50, ie ffmpeg trunk by not using pixel formats that -have been deprecated for years. - - -Index: cinelerra-20090210/cinelerra/ffmpeg.C -=================================================================== ---- cinelerra-20090210.orig/cinelerra/ffmpeg.C -+++ cinelerra-20090210/cinelerra/ffmpeg.C -@@ -70,11 +70,11 @@ PixelFormat FFMPEG::color_model_to_pix_f - switch (color_model) - { - case BC_YUV422: -- return PIX_FMT_YUV422; -+ return PIX_FMT_YUYV422; - case BC_RGB888: - return PIX_FMT_RGB24; - case BC_BGR8888: // NOTE: order flipped -- return PIX_FMT_RGBA32; -+ return PIX_FMT_RGB32; - case BC_BGR888: - return PIX_FMT_BGR24; - case BC_YUV420P: -@@ -95,11 +95,11 @@ PixelFormat FFMPEG::color_model_to_pix_f - int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) { - switch (pix_fmt) - { -- case PIX_FMT_YUV422: -+ case PIX_FMT_YUYV422: - return BC_YUV422; - case PIX_FMT_RGB24: - return BC_RGB888; -- case PIX_FMT_RGBA32: -+ case PIX_FMT_RGB32: - return BC_BGR8888; - case PIX_FMT_BGR24: - return BC_BGR888; -@@ -286,7 +286,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi - // make an intermediate temp frame only if necessary - int cmodel_in = pix_fmt_to_color_model(pix_fmt_in); - if (cmodel_in == BC_TRANSPARENCY) { -- if (pix_fmt_in == PIX_FMT_RGBA32) { -+ if (pix_fmt_in == PIX_FMT_RGB32) { - // avoid infinite recursion if things are broken - printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n"); - return 1; -Index: cinelerra-20090210/quicktime/qtffmpeg.c -=================================================================== ---- cinelerra-20090210.orig/quicktime/qtffmpeg.c -+++ cinelerra-20090210/quicktime/qtffmpeg.c -@@ -225,7 +225,7 @@ static int get_chroma_factor(quicktime_f - case PIX_FMT_YUV420P: - return 4; - break; -- case PIX_FMT_YUV422: -+ case PIX_FMT_YUYV422: - return 2; - break; - case PIX_FMT_YUV422P: -@@ -424,7 +424,7 @@ int quicktime_ffmpeg_decode(quicktime_ff - case PIX_FMT_YUV420P: - input_cmodel = BC_YUV420P; - break; -- case PIX_FMT_YUV422: -+ case PIX_FMT_YUYV422: - input_cmodel = BC_YUV422; - break; - case PIX_FMT_YUV422P: diff --git a/media-video/cinelerra/files/cinelerra-x264.patch b/media-video/cinelerra/files/cinelerra-x264.patch deleted file mode 100644 index 018b964e12d9..000000000000 --- a/media-video/cinelerra/files/cinelerra-x264.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: cinelerra-20090210/quicktime/qth264.c -=================================================================== ---- cinelerra-20090210.orig/quicktime/qth264.c -+++ cinelerra-20090210/quicktime/qth264.c -@@ -239,10 +239,15 @@ static int encode(quicktime_t *file, uns - codec->buffer_size = 0; - for(i = 0; i < nnal; i++) - { -+#if X264_BUILD >= 76 -+ int size = nals[i].i_payload; -+ memcpy(codec->work_buffer + codec->buffer_size, nals[i].p_payload, nals[i].i_payload); -+#else - int size = x264_nal_encode(codec->work_buffer + codec->buffer_size, - &allocation, - 1, - nals + i); -+#endif - unsigned char *ptr = codec->work_buffer + codec->buffer_size; - - if(size > 0) -- cgit v1.2.3-65-gdbad